Changeset 876ff87 in freewrt for tools

Timestamp:

Jun 4, 2007, 2:32:55 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

e0357f8

Parents:

c70c383

Message:

improve

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

Location:

tools

Files:

• lzma/Makefile (modified) (2 diffs)
• squashfs/Makefile (modified) (1 diff)

tools/lzma/Makefile

@@ -8 +8 @@
 PKG_VERSION:=           432
 PKG_MD5SUM:=            155c1ebce5bc6710ae7ecc926226d9d7
-MASTER_SITES:=          ${MASTER_SITE_SOURCEFORGE:=sevenzip/}
+MASTER_SITES=           ${MASTER_SITE_SOURCEFORGE:=sevenzip/}
 DISTFILES:=             $(PKG_NAME)$(PKG_VERSION).tar.bz2
 WRKDIST=                ${WRKDIR}
@@ -16 +16 @@
 LZMA_ALONE_DIR=         $(WRKBUILD)/C/7zip/Compress/LZMA_Alone
 
-TARGETS=                $(LZMA_LIB_DIR)/liblzma.a $(LZMA_ALONE_DIR)/lzma
-
 include $(TOPDIR)/rules.mk
 include ../rules.mk
-include ${TOPDIR}/mk/fetch.mk
+#include ${TOPDIR}/mk/fetch.mk
 
-$(LZMA_ALONE_DIR)/lzma $(LZMA_LIB_DIR)/liblzma.a: $(WRKBUILD)/.built
-$(WRKBUILD)/.built: ${WRKBUILD}/.prepared
+$(WRKBUILD)/.configured: ${WRKBUILD}/.prepared
+        touch $@
+
+$(LZMA_ALONE_DIR)/lzma: ${WRKBUILD}/.prepared
         $(MAKE) -C $(LZMA_LIB_DIR) $(MAKE_TRACE)
         $(MAKE) -f makefile.gcc -C $(LZMA_ALONE_DIR) $(MAKE_TRACE)
-        touch $@
-
-lzma: $(TARGETS)
-        $(CP) $^ $(WRKBUILD)
-
-lzma-clean:
-        -$(MAKE) -C $(LZMA_LIB_DIR) clean $(MAKE_TRACE)
-        -$(MAKE) -C $(LZMA_ALONE_DIR) clean $(MAKE_TRACE)
-        rm -f $(WRKBUILD)/liblzma.a $(WRKBUILD)/lzma
-
-lzma-dirclean:
-        rm -rf $(WRKBUILD)
-
-#############################################################
 
 source: ${_CHECKSUM_COOKIE}
 prepare: ${WRKBUILD}/.prepared
-compile: prepare ${TARGETS}
-install: lzma
-        $(CP) $(WRKBUILD)/lzma $(STAGING_TOOLS)/bin/
-clean: lzma-dirclean
+compile: $(LZMA_ALONE_DIR)/lzma
+install:
+        $(CP) $(LZMA_ALONE_DIR)/lzma $(STAGING_TOOLS)/bin/
+clean:
+        rm -rf $(WRKBUILD)

tools/squashfs/Makefile

@@ -9 +9 @@
 PKG_MD5SUM:=            9fd05d0bfbb712f5fb95edafea5bc733
 DISTFILES:=             $(PKG_NAME)$(PKG_VERSION).tar.gz
-MASTER_SITES:=          ${MASTER_SITE_SOURCEFORGE:=squashfs/}
+MASTER_SITES=           ${MASTER_SITE_SOURCEFORGE:=squashfs/}
 WRKDIST=                ${WRKDIR}/${PKG_NAME}${PKG_VERSION}