Makefile cleanup (lang section)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@5353 3c298f89-4303-0410-b956-a3cf2f4a3e73

lang/jamvm/Makefile

@@ -11,14 +11,13 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=jamvm
 PKG_VERSION:=1.4.1
 PKG_RELEASE:=1
-PKG_MD5SUM:=ed79d6b60e50b007614831f8c28321ac
-
-PKG_SOURCE_URL:=@SF/jamvm
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/jamvm
+PKG_MD5SUM:=ed79d6b60e50b007614831f8c28321ac
 PKG_CAT:=zcat
+
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -27,37 +26,33 @@ define Package/jamvm
   CATEGORY:=Languages
   DEPENDS:=+libffi-sable
   TITLE:=A compact Java Virtual Machine
-  DESCRIPTION:=JamVM is a new Java Virtual Machine which conforms to the JVM\\\
+  DESCRIPTION:=\
-specification version (blue book). In comparison to most other VM's\\\
+	JamVM is a new Java Virtual Machine which conforms to the JVM \\\
-(free and commercial) it is extremely small.However, unlike other\\\
+	specification version (blue book). In comparison to most other VM's \\\
-small VMs (e.g. KVM) it is designed to support the full\\\
+	(free and commercial) it is extremely small.However, unlike other \\\
-specification, and includes support for object finalisation,\\\
+	small VMs (e.g. KVM) it is designed to support the full \\\
-Soft/Weak/Phantom References, the Java Native Interface (JNI) and the\\\
+	specification, and includes support for object finalisation, \\\
-Reflection API.\\\
+	Soft/Weak/Phantom References, the Java Native Interface (JNI) and the \\\
+	Reflection API.
   URL:=http://sourceforge.net/projects/jamvm
 endef
 
 define Build/Configure
-$(call Build/Configure/Default,--enable-ffi)
+	$(call Build/Configure/Default, \
+		--enable-ffi \
+	)
 endef
 
 define Build/Compile	
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)/usr/bin
-	mkdir -p $(PKG_INSTALL_DIR)/usr/share/jamvm
 	$(MAKE) -C $(PKG_BUILD_DIR)/src \
               $(TARGET_CONFIGURE_OPTS)
-	$(CP) $(PKG_BUILD_DIR)/src/jamvm $(PKG_INSTALL_DIR)/usr/bin
-	$(MAKE) -C $(PKG_BUILD_DIR)/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/classes.zip $(PKG_INSTALL_DIR)/usr/share/jamvm
 endef
 
-
 define Package/jamvm/install	
 	install -d -m0755 $(1)/usr/bin
+	install -m0755 $(PKG_BUILD_DIR)/src/jamvm $(1)/usr/bin/
 	install -d -m0755 $(1)/usr/share/jamvm
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/jamvm $(1)/usr/bin
+	install -m0644 $(PKG_BUILD_DIR)/lib/classes.zip $(1)/usr/share/jamvm/
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/jamvm/classes.zip $(1)/usr/share/jamvm
 endef
 
 $(eval $(call BuildPackage,jamvm))

lang/lua/Makefile

@@ -12,7 +12,6 @@ PKG_NAME:=lua
 PKG_VERSION:=5.0.2
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.lua.org/ftp/ \
 	http://ftp.gwdg.de/pub/languages/lua/ \
@@ -21,63 +20,57 @@ PKG_SOURCE_URL:=http://www.lua.org/ftp/ \
 PKG_MD5SUM:= dea74646b7e5c621fef7174df83c34b1
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
+define Package/lua/Default
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=LUA programming language
+  DESCRIPTION:=\
+	Lua is a powerful light-weight programming language designed for extending \\\
+	applications. Lua is also frequently used as a general-purpose, stand-alone \\\
+	language. Lua is free software.
+  URL:=http://www.lua.org/
+endef
+
 define Package/liblua
+  $(call Package/lua/Default)
   SECTION:=libs
   CATEGORY:=Libraries
-  TITLE:=LUA programming language (libraries)
+  TITLE+= (libraries)
-  DESCRIPTION:=LUA programming language (libraries).\\\
+  DESCRIPTION+=\\\
-    Lua is a powerful light-weight programming language designed for extending \\\
+	\\\
-    applications. Lua is also frequently used as a general-purpose, stand-alone \\\
+	This package contains the LUA shared libraries, needed by other programs.
-    language. Lua is free software.\\\
-    \\\
-    This package contains the LUA shared libraries, needed by other programs.
-  URL:=http://www.lua.org/
 endef
 
 define Package/lua
-  SECTION:=utils
+  $(call Package/lua/Default)
-  CATEGORY:=Utilities
   DEPENDS:=+liblua
-  TITLE:=LUA programming language (interpreter)
+  TITLE+= (interpreter)
-  DESCRIPTION:=LUA programming language (interpreter).\\\
+  DESCRIPTION+=\\\
-    Lua is a powerful light-weight programming language designed for extending \\\
+	\\\
-    applications. Lua is also frequently used as a general-purpose, stand-alone \\\
+	This package contains the LUA language interpreter.
-    language. Lua is free software.\\\
-    \\\
-    This package contains the LUA language interpreter.
-  URL:=http://www.lua.org/
-endef
-
-define Package/lua-examples
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=lua
-  TITLE:=LUA programming language (examples)
-  DESCRIPTION:=LUA programming language (examples).\\\
-    Lua is a powerful light-weight programming language designed for extending \\\
-    applications. Lua is also frequently used as a general-purpose, stand-alone \\\
-    language. Lua is free software.\\\
-    \\\
-    This package contains LUA language examples.
-  URL:=http://www.lua.org/
 endef
 
 define Package/luac
-  SECTION:=utils
+  $(call Package/lua/Default)
-  CATEGORY:=Utilities
   DEPENDS:=+liblua
-  TITLE:=LUA programming language (compiler)
+  TITLE+= (compiler)
-  DESCRIPTION:=LUA programming language (compiler).\\\
+  DESCRIPTION+=\\\
-    Lua is a powerful light-weight programming language designed for extending \\\
+	\\\
-    applications. Lua is also frequently used as a general-purpose, stand-alone \\\
+	This package contains the LUA language compiler.
-    language. Lua is free software.\\\
+endef
-    \\\
+
-    This package contains the LUA language compiler.
+define Package/lua-examples
-  URL:=http://www.lua.org/
+  $(call Package/lua/Default)
+  DEPENDS:=lua
+  TITLE+= (examples)
+  DESCRIPTION+=\\\
+	\\\
+	This package contains LUA language examples.
 endef
 
 define Build/Configure
@@ -111,6 +104,21 @@ define Build/Compile
 		install soinstall
 endef
 
+define Build/InstallDev
+	mkdir -p $(STAGING_DIR)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/lua{,lib}.h $(STAGING_DIR)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/lauxlib.h $(STAGING_DIR)/usr/include/
+	mkdir -p $(STAGING_DIR)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua{,lib}.{a,so*} $(STAGING_DIR)/usr/lib/
+endef
+
+define Build/UninstallDev
+	rm -rf \
+		$(STAGING_DIR)/usr/include/lua{,lib}.h \
+		$(STAGING_DIR)/usr/include/lauxlib.h \
+		$(STAGING_DIR)/usr/lib/liblua{,lib}.{a,so*}
+endef
+
 define Package/liblua/install
 	install -d -m0755 $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua{,lib}.so.* $(1)/usr/lib/
@@ -132,22 +140,7 @@ define Package/lua-examples/install
 		$(1)/usr/share/lua/examples/
 endef
 
-define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/lua{,lib}.h $(STAGING_DIR)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/lauxlib.h $(STAGING_DIR)/usr/include/
-	mkdir -p $(STAGING_DIR)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua{,lib}.{a,so*} $(STAGING_DIR)/usr/lib/
-endef
-
-define Build/UninstallDev
-	rm -rf \
-		$(STAGING_DIR)/usr/include/lua{,lib}.h \
-		$(STAGING_DIR)/usr/include/lauxlib.h \
-		$(STAGING_DIR)/usr/lib/liblua{,lib}.{a,so*}
-endef
-
 $(eval $(call BuildPackage,liblua))
 $(eval $(call BuildPackage,lua))
-$(eval $(call BuildPackage,lua-examples))
 $(eval $(call BuildPackage,luac))
+$(eval $(call BuildPackage,lua-examples))

lang/perl/Makefile

@@ -12,7 +12,6 @@ PKG_NAME:=perl
 PKG_VERSION:=5.8.6
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.cpan.org/pub/CPAN/src/5.0 \
 	        ftp://ftp.mpi-sb.mpg.de/pub/perl/CPAN/src/5.0 \
@@ -21,14 +20,16 @@ PKG_SOURCE_URL:=ftp://ftp.cpan.org/pub/CPAN/src/5.0 \
 PKG_MD5SUM:=8d4aa4e061fd5bc0c39e4f0a63267880
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/microperl
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=A really minimal perl
-  DESCRIPTION:=A really minimal perl.\\\
+  DESCRIPTION:=\
-    A perl package without operating-specific functions such as readdir.
+	A perl package without operating-specific functions such as readdir.
   URL:=http://www.perl.com/
 endef
 

lang/php4/Makefile

@@ -321,24 +321,24 @@ define Build/Compile
 endef
 
 define Package/php4/install
-	install -m0755 -d $(1)/etc
+	install -d -m0755 $(1)/etc
 	install -m0644 ./files/php.ini $(1)/etc/
 endef
 
 define Package/php4-cli/install
-	install -m0755 -d $(1)/usr/bin
+	install -d -m0755 $(1)/usr/bin
 	$(CP) $(PKG_BUILD_DIR)/php-cli $(1)/usr/bin/php
 endef
 
 define Package/php4-cgi/install
-	install -m0755 -d $(1)/usr/bin
+	install -d -m0755 $(1)/usr/bin
 	$(CP) $(PKG_BUILD_DIR)/php-cgi $(1)/usr/bin/php
 endef
 
 define Package/php4-fastcgi/install
-	install -m0755 -d $(1)/usr/sbin
+	install -d -m0755 $(1)/usr/sbin
 	$(CP) $(PKG_BUILD_DIR)/php-fastcgi $(1)/usr/sbin/php
-	install -m0755 -d $(1)/etc/init.d
+	install -d -m0755 $(1)/etc/init.d
 	install -m0755 ./files/php.init $(1)/etc/init.d/php
 endef
 

lang/php5/Makefile

@@ -325,24 +325,24 @@ define Build/Compile
 endef
 
 define Package/php5/install
-	install -m0755 -d $(1)/etc
+	install -d -m0755 $(1)/etc
 	install -m0644 ./files/php.ini $(1)/etc/
 endef
 
 define Package/php5-cli/install
-	install -m0755 -d $(1)/usr/bin
+	install -d -m0755 $(1)/usr/bin
 	$(CP) $(PKG_BUILD_DIR)/php-cli $(1)/usr/bin/php
 endef
 
 define Package/php5-cgi/install
-	install -m0755 -d $(1)/usr/bin
+	install -d -m0755 $(1)/usr/bin
 	$(CP) $(PKG_BUILD_DIR)/php-cgi $(1)/usr/bin/php
 endef
 
 define Package/php5-fastcgi/install
-	install -m0755 -d $(1)/usr/sbin
+	install -d -m0755 $(1)/usr/sbin
 	$(CP) $(PKG_BUILD_DIR)/php-fastcgi $(1)/usr/sbin/php
-	install -m0755 -d $(1)/etc/init.d
+	install -d -m0755 $(1)/etc/init.d
 	install -m0755 ./files/php.init $(1)/etc/init.d/php
 endef
 

lang/python/Makefile

@@ -1,3 +1,11 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id$
+ 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python

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
-  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\\\
-	the java programming language.\\\
-	This is a modified version for use with SableVM.\\\
   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 \\\
+	the java programming language.\\\
+	This is a modified version for use with SableVM.
+endef
+
 define Package/sablevm-classpath-full
-  SECTION:=lang
+  $(call Package/sablevm-classpath/Default)
-  CATEGORY:=Languages
+  DEPENDS:=+libsablevm-classpath
-  DEPENDS:=libsablevm-classpath
+  TITLE+= (full)
-  TITLE:=Full set
 endef
 
 define Package/sablevm-classpath-mini
-  SECTION:=lang
+  $(call Package/sablevm-classpath/Default)
-  CATEGORY:=Languages
+  DEPENDS:=+libsablevm-classpath
-  DEPENDS:=libsablevm-classpath
+  TITLE+= (minimal)
-  TITLE:=Minimal set
 endef
 
 define Build/Configure
-$(call Build/Configure/Default,--enable-shared \
+	$(call Build/Configure/Default, \
-		  --disable-static \
 		  --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

lang/sablevm/Makefile

@@ -12,12 +12,12 @@ PKG_NAME:=sablevm
 PKG_VERSION:=1.13
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://sablevm.org/download/release/$(PKG_VERSION)/
 PKG_MD5SUM:=d5828200032bfe921dd43e450931e38c
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -27,35 +27,33 @@ define Package/sablevm
   CATEGORY:=Languages
   DEPENDS:=+libffi-sable +libltdl +libpopt +libpthread +zlib
   TITLE:=A Java Virtual Machine (JVM) implementation
-  DESCRIPTION:=SableVM is a robust, extremely portable, efficient, and specifications-\\\
+  DESCRIPTION:=\
-    -compliant Java virtual machine that aims to be easy to maintain and to \\\
+	SableVM is a robust, extremely portable, efficient, and specifications-\\\
-    extend. It features a state-of-the-art and efficient interpreter engine.\\\
+	-compliant Java virtual machine that aims to be easy to maintain and to \\\
-    Its source code is very accessible and easy to understand. It also has \\\
+	extend. It features a state-of-the-art and efficient interpreter engine.\\\
-    many robustness features that have been the object of careful design.
+	Its source code is very accessible and easy to understand. It also has \\\
+	many robustness features that have been the object of careful design.
   URL:=http://sablevm.org/
 endef
 
 
 define Build/Configure
-  $(call Build/Configure/Default, \
+	$(call Build/Configure/Default, \
-	--enable-shared \
+		, \
-	--disable-static, \
+		LIBS="-lffi -lltdl -lpopt -lz" \
-	LIBS="-lffi -lltdl -lpopt -lz" \
+	)
-  )
 endef
 
 define Build/Compile	
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
 define Package/sablevm/install
-	install -m0755 -d $(1)/usr/bin
+	install -d -m0755 $(1)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/{java-,}sablevm $(1)/usr/bin/
-	install -m0755 -d $(1)/usr/lib
+	install -d -m0755 $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsablevm-*.so $(1)/usr/lib/
 endef