fix some misuses of the recently added EXTRA_{CFLAGS,CPPFLAGS,LDFLAGS} variables

[openwrt/svn-archive/archive.git] / lang / sablevm-classpath / Makefile

diff --git a/lang/sablevm-classpath/Makefile b/lang/sablevm-classpath/Makefile
index ba344ecac214286eb2a65870b1c751f5c139d21e..2b1f291c646bf5fb7bc61c2a796c062235899402 100644 (file)
--- a/lang/sablevm-classpath/Makefile
+++ b/lang/sablevm-classpath/Makefile
@@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=sablevm-classpath
 PKG_VERSION:=1.13
 PKG_RELEASE:=1
-PKG_MD5SUM:=9476bb7a0ad67c6cfa353d06f094cdce
 
-PKG_SOURCE_URL:=http://sablevm.org/download/release/$(PKG_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://sablevm.org/download/release/$(PKG_VERSION)/
+PKG_MD5SUM:=9476bb7a0ad67c6cfa353d06f094cdce
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -22,43 +22,45 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/libsablevm-classpath
+define Package/sablevm-classpath/Default
   SECTION:=lang
   CATEGORY:=Languages
+  URL:=http://www.gnu.org/software/classpath/
+endef
+
+define Package/libsablevm-classpath
+  $(call Package/sablevm-classpath/Default)
   TITLE:=Essential native libraries for Java
-  DESCRIPTION:=GNU Classpath, Essential Libraries for Java, is a GNU project to create\\\
-       free core class libraries for use with virtual machines and compilers for\\\
+  DESCRIPTION:=\
+       GNU Classpath, Essential Libraries for Java, is a GNU project to create \\\
+       free core class libraries for use with virtual machines and compilers for \\\
        the java programming language.\\\
-       This is a modified version for use with SableVM.\\\
-  URL:=http://www.gnu.org/software/classpath/
+       This is a modified version for use with SableVM.
 endef
 
 define Package/sablevm-classpath-full
-  SECTION:=lang
-  CATEGORY:=Languages
-  DEPENDS:=libsablevm-classpath
-  TITLE:=Full set
+  $(call Package/sablevm-classpath/Default)
+  DEPENDS:=+libsablevm-classpath
+  TITLE+= (full)
 endef
 
 define Package/sablevm-classpath-mini
-  SECTION:=lang
-  CATEGORY:=Languages
-  DEPENDS:=libsablevm-classpath
-  TITLE:=Minimal set
+  $(call Package/sablevm-classpath/Default)
+  DEPENDS:=+libsablevm-classpath
+  TITLE+= (minimal)
 endef
 
 define Build/Configure
-$(call Build/Configure/Default,--enable-shared \
-                 --disable-static \
+       $(call Build/Configure/Default, \
                  --disable-gtk-peer \
                  --disable-gtk-cairo \
-                 --without-x)
+                 --with-jikes \
+                 --without-x \
+       )
 endef
 
 
 define Build/Compile   
-       rm -rf $(PKG_INSTAL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
@@ -67,21 +69,21 @@ define Build/Compile
 endef
 
 define Package/libsablevm-classpath/install    
-       install -d -m0755 $(1)/usr/lib/sablevm-classpath
+       $(INSTALL_DIR) $(1)/usr/lib/sablevm-classpath
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/sablevm-classpath/libjava*.so $(1)/usr/lib/sablevm-classpath/
-       install -d -m0755 $(1)/usr/lib/security
+       $(INSTALL_DIR) $(1)/usr/lib/security
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/security/classpath.security $(1)/usr/lib/security/
 endef
 
 define Package/sablevm-classpath-full/install  
-       install -d -m0755 $(1)/usr/share/sablevm-classpath
+       $(INSTALL_DIR) $(1)/usr/share/sablevm-classpath
        $(CP) $(PKG_INSTALL_DIR)/usr/share/sablevm-classpath/{libclasspath,resources}.jar \
                $(1)/usr/share/sablevm-classpath/
 endef
        
 define Package/sablevm-classpath-mini/install  
-       install -d -m0755 $(1)/usr/share/sablevm-classpath
-       install -m0755 $(PKG_BUILD_DIR)/lib/mini.jar \
+       $(INSTALL_DIR) $(1)/usr/share/sablevm-classpath
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/mini.jar \
                $(1)/usr/share/sablevm-classpath/libclasspath.jar
 endef
 
@@ -89,8 +91,8 @@ $(eval $(call BuildPackage,libsablevm-classpath))
 $(eval $(call BuildPackage,sablevm-classpath-full))
 $(eval $(call BuildPackage,sablevm-classpath-mini))
 
-$(foreach command, jikes jikes-sablevm sablevm fastjar, \
-  $(eval $(RequireCommand,$(command), \
-   libsablevm-classpath requires $(command) to compile. \
+$(foreach command, jikes fastjar, \
+  $(eval $(call RequireCommand,$(command), \
+   $(PKG_NAME) requires $(command). \
   )) \
 )