Changeset a85b5ba in freewrt

Timestamp:

Jan 22, 2007, 6:37:52 PM (19 years ago)

Author:

Phil Sutter <n0-1@…>

Children:

83e28e9

Parents:

b9413cf

Message:

convert to new style

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@1718 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• package/lua/Makefile (modified) (2 diffs)

package/lua/Makefile

@@ -5 +5 @@
 # or at http://www.freewrt.org/licence for details.
 
-include $(TOPDIR)/rules.mk
+include ${TOPDIR}/rules.mk
 
 PKG_NAME:=              lua
@@ -11 +11 @@
 PKG_RELEASE:=           1
 PKG_MD5SUM:=            dea74646b7e5c621fef7174df83c34b1
-
 PKG_SOURCE_URL:=        http://www.lua.org/ftp/ \
                         http://ftp.gwdg.de/pub/languages/lua/ \
                         http://mirrors.dotsrc.org/lua/ \
                         http://www.tecgraf.puc-rio.br/lua/ftp/
-PKG_SOURCE:=            $(PKG_NAME)-$(PKG_VERSION).tar.gz
 
-include $(TOPDIR)/mk/package.mk
+include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBLUA,liblua,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,LUA,lua,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,LUAC,luac,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,LUA_EXAMPLES,lua-examples,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LIBLUA,liblua,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LUA,lua,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LUAC,luac,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LUA_EXAMPLES,lua-examples,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
 
-$(WRKBUILD)/.configured:
-        touch $@
-
-$(WRKBUILD)/.built: $(WRKBUILD)/.configured
-        $(MAKE) -C $(WRKBUILD) \
-                CC="$(TARGET_CROSS)gcc" \
-                LD="$(TARGET_CROSS)ld" \
-                AR="$(TARGET_CROSS)ar rcu" \
-                RANLIB="$(TARGET_CROSS)ranlib" \
+do-build:
+        ${MAKE} -C ${WRKBUILD} \
+                CC="${TARGET_CC}" \
+                LD="${TARGET_CROSS}ld" \
+                AR="${TARGET_CROSS}ar rcu" \
+                RANLIB="${TARGET_CROSS}ranlib" \
                 INSTALL_ROOT=/usr \
-                MYCFLAGS="-I$(STAGING_DIR)/usr/include $(TARGET_CFLAGS)" \
-                MYLDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+                MYCFLAGS="${TCFLAGS} ${TCPPFLAGS}" \
+                MYLDFLAGS="${TLDFLAGS}" \
                 all so
         # remove statically linked binaries, so that they will get linked against shlib this time
-        rm -f $(WRKBUILD)/bin/lua{,c}
-        $(MAKE) -C $(WRKBUILD) \
-                CC="$(TARGET_CROSS)gcc" \
-                LD="$(TARGET_CROSS)ld" \
-                AR="$(TARGET_CROSS)ar rcu" \
-                RANLIB="$(TARGET_CROSS)ranlib" \
+        rm -f ${WRKBUILD}/bin/lua{,c}
+        ${MAKE} -C ${WRKBUILD} \
+                CC="${TARGET_CC}" \
+                LD="${TARGET_CROSS}ld" \
+                AR="${TARGET_CROSS}ar rcu" \
+                RANLIB="${TARGET_CROSS}ranlib" \
                 INSTALL_ROOT=/usr \
-                MYCFLAGS="-I$(STAGING_DIR)/usr/include $(TARGET_CFLAGS)" \
-                MYLDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+                MYCFLAGS="${TCFLAGS} ${TCPPFLAGS}" \
+                MYLDFLAGS="${TLDFLAGS}" \
                 all
-        rm -rf $(WRKINST)
-        mkdir -p $(WRKINST)
-        $(MAKE) -C $(WRKBUILD) \
-                INSTALL_ROOT="$(WRKINST)/usr" \
+        rm -rf ${WRKINST}
+        mkdir -p ${WRKINST}
+        ${MAKE} -C ${WRKBUILD} \
+                INSTALL_ROOT="${WRKINST}/usr" \
                 install soinstall
-        touch $@
 
-$(IPKG_LIBLUA):
-        install -d -m0755 $(IDIR_LIBLUA)/usr/lib
-        $(CP) $(WRKINST)/usr/lib/liblua{,lib}.so.* $(IDIR_LIBLUA)/usr/lib/
-        $(RSTRIP) $(IDIR_LIBLUA)
-        $(IPKG_BUILD) $(IDIR_LIBLUA) $(PACKAGE_DIR)
-
-$(IPKG_LUA):
-        install -d -m0755 $(IDIR_LUA)/usr/bin
-        $(CP) $(WRKINST)/usr/bin/lua $(IDIR_LUA)/usr/bin/
-        $(RSTRIP) $(IDIR_LUA)
-        $(IPKG_BUILD) $(IDIR_LUA) $(PACKAGE_DIR)
-
-$(IPKG_LUAC):
-        install -d -m0755 $(IDIR_LUAC)/usr/bin
-        $(CP) $(WRKINST)/usr/bin/luac $(IDIR_LUAC)/usr/bin/
-        $(RSTRIP) $(IDIR_LUAC)
-        $(IPKG_BUILD) $(IDIR_LUAC) $(PACKAGE_DIR)
-
-$(IPKG_LUA_EXAMPLES):
-        install -d -m0755 $(IDIR_LUA_EXAMPLES)/usr/share/lua/examples
-        install -m0644 $(WRKBUILD)/test/*.lua \
-                $(IDIR_LUA_EXAMPLES)/usr/share/lua/examples/
-        $(RSTRIP) $(IDIR_LUA_EXAMPLES)
-        $(IPKG_BUILD) $(IDIR_LUA_EXAMPLES) $(PACKAGE_DIR)
-
-$(STAGING_DIR)/usr/lib/liblua.so: $(WRKBUILD)/.built
-        mkdir -p $(STAGING_DIR)/usr/include
-        $(CP) $(WRKINST)/usr/include/lua{,lib}.h $(STAGING_DIR)/usr/include/
-        $(CP) $(WRKINST)/usr/include/lauxlib.h $(STAGING_DIR)/usr/include/
-        mkdir -p $(STAGING_DIR)/usr/lib
-        $(CP) $(WRKINST)/usr/lib/liblua{,lib}.{a,so*} $(STAGING_DIR)/usr/lib/
-        touch $@
-
-install-dev: $(STAGING_DIR)/usr/lib/liblua.so
-
-uninstall-dev:
-        rm -rf \
-                $(STAGING_DIR)/usr/include/lua{,lib}.h \
-                $(STAGING_DIR)/usr/include/lauxlib.h \
-                $(STAGING_DIR)/usr/lib/liblua{,lib}.{a,so*} \
-
-compile-targets: install-dev
-clean-targets: uninstall-dev
+do-install:
+        ${INSTALL_DIR} ${IDIR_LIBLUA}/usr/lib
+        ${CP} ${WRKINST}/usr/lib/liblua{,lib}.so.* ${IDIR_LIBLUA}/usr/lib/
+        ${INSTALL_DIR} ${IDIR_LUA}/usr/bin
+        ${INSTALL_BIN} ${WRKINST}/usr/bin/lua ${IDIR_LUA}/usr/bin/
+        ${INSTALL_DIR} ${IDIR_LUAC}/usr/bin
+        ${INSTALL_BIN} ${WRKINST}/usr/bin/luac ${IDIR_LUAC}/usr/bin/
+        ${INSTALL_DIR} ${IDIR_LUA_EXAMPLES}/usr/share/lua/examples
+        ${INSTALL_DATA} ${WRKBUILD}/test/*.lua \
+                ${IDIR_LUA_EXAMPLES}/usr/share/lua/examples/
 
 include ${TOPDIR}/mk/pkg-bottom.mk