From: Eric Andersen Date: Wed, 12 Nov 2003 09:31:12 +0000 (-0000) Subject: Thomas Cameron writes: X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0fee9e90c2ea3accfaa521a303c6568ebf7baccc;p=buildroot.git Thomas Cameron writes: this patch fixes the source file downloads when executing a "make source", and a few cut-and-paste (tm) errors in the *.mk files. Again, this is a patch against the current CVS sources, and includes my previous patch. --- diff --git a/make/binutils.mk b/make/binutils.mk index fa754085e4..85c9eea32d 100644 --- a/make/binutils.mk +++ b/make/binutils.mk @@ -9,6 +9,7 @@ BINUTILS_DIR:=$(TOOL_BUILD_DIR)/binutils-2.14.90.0.6 BINUTILS_CAT:=bzcat BINUTILS_DIR1:=$(TOOL_BUILD_DIR)/binutils-build + $(DL_DIR)/$(BINUTILS_SOURCE): $(WGET) -P $(DL_DIR) $(BINUTILS_SITE)/$(BINUTILS_SOURCE) @@ -98,6 +99,8 @@ $(STAGING_DIR)/lib/libg.a: binutils: $(STAGING_DIR)/$(GNU_TARGET_NAME)/bin/ld $(STAGING_DIR)/lib/libg.a +binutils-source: $(DL_DIR)/$(BINUTILS_SOURCE) + binutils-clean: rm -f $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)* -$(MAKE) -C $(BINUTILS_DIR1) clean @@ -198,7 +201,3 @@ binutils_target-clean: binutils_target-dirclean: rm -rf $(BINUTILS_DIR2) - - - - diff --git a/make/boa.mk b/make/boa.mk index 09e2c019be..1eb233fbc6 100644 --- a/make/boa.mk +++ b/make/boa.mk @@ -45,6 +45,8 @@ $(BOA_WORKDIR)/.installed: $(BOA_WORKDIR)/boa $(BOA_WORKDIR)/boa_indexer boa: uclibc $(BOA_WORKDIR)/.installed +boa-source: $(DL_DIR)/$(BOA_SOURCE) + boa-clean: @if [ -d $(BOA_WORKDIR)/Makefile ] ; then \ $(MAKE) -C $(BOA_WORKDIR) clean ; \ diff --git a/make/bridge.mk b/make/bridge.mk index fca571ec16..0ceec7ca7a 100644 --- a/make/bridge.mk +++ b/make/bridge.mk @@ -48,6 +48,8 @@ $(TARGET_DIR)/sbin/brctl: $(BRIDGE_BUILD_DIR)/brctl/brctl bridge: $(TARGET_DIR)/sbin/brctl +bridge-source: $(DL_DIR)/$(BRIDGE_SOURCE) + bridge-clean: $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BRIDGE_BUILD_DIR) uninstall -$(MAKE) -C $(BRIDGE_BUILD_DIR) clean diff --git a/make/ccache.mk b/make/ccache.mk index 65e88e1aaa..9ee98db65f 100644 --- a/make/ccache.mk +++ b/make/ccache.mk @@ -61,6 +61,8 @@ $(TARGET_DIR)/$(CCACHE_TARGET_BINARY): $(CCACHE_DIR2)/$(CCACHE_BINARY) ccache_target: uclibc $(TARGET_DIR)/$(CCACHE_TARGET_BINARY) +ccache_target-sources: $(DL_DIR)/$(CCACHE_SOURCE) + ccache_target-clean: $(MAKE) DESTDIR=$(TARGET_DIR) -C $(CCACHE_DIR2) uninstall -$(MAKE) -C $(CCACHE_DIR2) clean diff --git a/make/cramfsroot.mk b/make/cramfsroot.mk index 7c43111612..3ebf9582b2 100644 --- a/make/cramfsroot.mk +++ b/make/cramfsroot.mk @@ -42,12 +42,11 @@ cramfsroot: cramfs @rm -rf $(TARGET_DIR)/usr/info $(CRAMFS_DIR)/mkcramfs -q -D $(SOURCE_DIR)/device_table.txt $(TARGET_DIR) $(IMAGE) -cramfsroot-source: $(DL_DIR)/$(GENEXT2_SOURCE) +cramfsroot-source: cramfs-source cramfsroot-clean: - -$(MAKE) -C $(GENEXT2_DIR) clean + -$(MAKE) -C $(CRAMFS_DIR) clean cramfsroot-dirclean: - rm -rf $(GENEXT2_DIR) - + rm -rf $(CRAMFS_DIR) diff --git a/make/flex.mk b/make/flex.mk index 2dc944902c..31ed8161f2 100644 --- a/make/flex.mk +++ b/make/flex.mk @@ -17,7 +17,7 @@ $(DL_DIR)/$(FLEX_SOURCE): $(DL_DIR)/$(FLEX_PATCH): $(WGET) -P $(DL_DIR) $(FLEX_SITE)/$(FLEX_PATCH) -ed-source: $(DL_DIR)/$(FLEX_SOURCE) $(DL_DIR)/$(FLEX_PATCH) +flex-source: $(DL_DIR)/$(FLEX_SOURCE) $(DL_DIR)/$(FLEX_PATCH) $(FLEX_DIR)/.unpacked: $(DL_DIR)/$(FLEX_SOURCE) $(DL_DIR)/$(FLEX_PATCH) $(FLEX_CAT) $(DL_DIR)/$(FLEX_SOURCE) | tar -C $(BUILD_DIR) -xvf - diff --git a/make/gcc-2.95.mk b/make/gcc-2.95.mk index 83289107ed..9c7d13c063 100644 --- a/make/gcc-2.95.mk +++ b/make/gcc-2.95.mk @@ -48,6 +48,7 @@ endif # ############################################################# GCC_BUILD_DIR1:=$(TOOL_BUILD_DIR)/gcc-2.95-initial + $(DL_DIR)/$(GCC_SOURCE): $(WGET) -P $(DL_DIR) $(GCC_SITE)/$(GCC_SOURCE) @@ -170,6 +171,7 @@ gcc2_95_initial-dirclean: # ############################################################# STLPORT_PATCH=$(SOURCE_DIR)/STLport-4.5.3.patch + $(DL_DIR)/$(STLPORT_SOURCE): $(WGET) -P $(DL_DIR) $(STLPORT_SITE)/$(STLPORT_SOURCE) @@ -188,6 +190,8 @@ endif stlport: $(STAGING_DIR)/lib/libstdc++.a +stlport-source: $(DL_DIR)/$(STLPORT_SOURCE) + stlport-clean: rm -f $(STAGING_DIR)/lib/libstdc++* rm -f $(STAGING_DIR)/include/c++* @@ -280,6 +284,8 @@ $(STAGING_DIR)/bin/$(ARCH)-uclibc-g++: $(GCC_BUILD_DIR2)/.compiled gcc2_95: binutils uclibc-configured gcc2_95_initial uclibc \ $(STAGING_DIR)/bin/$(ARCH)-uclibc-g++ $(STLPORT_TARGET) +gcc2_95-source: $(DL_DIR)/$(GCC_SOURCE) + gcc2_95-clean: rm -rf $(GCC_BUILD_DIR2) rm -f $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)* diff --git a/make/gcc-3.3.mk b/make/gcc-3.3.mk index 65fe4f9d95..d145bdd3fd 100644 --- a/make/gcc-3.3.mk +++ b/make/gcc-3.3.mk @@ -56,6 +56,7 @@ endif # ############################################################# GCC_BUILD_DIR1:=$(TOOL_BUILD_DIR)/gcc-3.3-initial + $(DL_DIR)/$(GCC_SOURCE): $(WGET) -P $(DL_DIR) $(GCC_SITE)/$(GCC_SOURCE) @@ -305,6 +306,8 @@ endif gcc3_3: binutils uclibc-configured gcc3_3_initial $(LIBFLOAT_TARGET) uclibc \ $(GCC_BUILD_DIR2)/.installed $(GCC_TARGETS) +gcc3_3-source: $(DL_DIR)/$(GCC_SOURCE) + gcc3_3-clean: rm -rf $(GCC_BUILD_DIR2) rm -f $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)* diff --git a/make/gdb.mk b/make/gdb.mk index 4c017db1e9..bc2b25484e 100644 --- a/make/gdb.mk +++ b/make/gdb.mk @@ -60,6 +60,8 @@ $(TARGET_DIR)/usr/bin/gdb: $(GDB_DIR)/gdb/gdb gdb: $(TARGET_DIR)/usr/bin/gdb +gdb-source: $(DL_DIR)/$(GDB_SOURCE) + gdb-clean: $(MAKE) -C $(GDB_DIR) clean diff --git a/make/gettext.mk b/make/gettext.mk index e7cc874358..84c7a25bc2 100644 --- a/make/gettext.mk +++ b/make/gettext.mk @@ -13,7 +13,7 @@ GETTEXT_TARGET_BINARY:=usr/bin/gettext $(DL_DIR)/$(GETTEXT_SOURCE): $(WGET) -P $(DL_DIR) $(GETTEXT_SITE)/$(GETTEXT_SOURCE) -ed-source: $(DL_DIR)/$(GETTEXT_SOURCE) +gettext-source: $(DL_DIR)/$(GETTEXT_SOURCE) $(GETTEXT_DIR)/.unpacked: $(DL_DIR)/$(GETTEXT_SOURCE) $(GETTEXT_CAT) $(DL_DIR)/$(GETTEXT_SOURCE) | tar -C $(BUILD_DIR) -xvf - diff --git a/make/hostap.mk b/make/hostap.mk index 100d0ce102..f06f15cead 100644 --- a/make/hostap.mk +++ b/make/hostap.mk @@ -9,7 +9,7 @@ HOSTAP_DIR=$(BUILD_DIR)/hostap-snapshot HOSTAP_TARGET_MODULE_DIR=$(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/hostap $(DL_DIR)/$(HOSTAP_SOURCE): - $(WGET) -P $(DL_DIR) $(HOSTAP_SOURCE_URL) -O $(DL_DIR)/$(HOSTAP_SOURCE) + $(WGET) -P $(DL_DIR) $(HOSTAP_SOURCE_URL) -O $(DL_DIR)/$(HOSTAP_SOURCE) hostap-source: $(DL_DIR)/$(HOSTAP_SOURCE) diff --git a/make/hotplug.mk b/make/hotplug.mk index 7f02fe0526..e13a6025dd 100644 --- a/make/hotplug.mk +++ b/make/hotplug.mk @@ -28,7 +28,7 @@ $(TARGET_DIR)/sbin/hotplug: $(HOTPLUG_DIR)/hotplug hotplug: uclibc $(TARGET_DIR)/sbin/hotplug -ext2root-source: $(DL_DIR)/$(HOTPLUG_SOURCE) +hotplug-source: $(DL_DIR)/$(HOTPLUG_SOURCE) hotplug-clean: rm -f $(TARGET_DIR)/sbin/hotplug diff --git a/make/iptables.mk b/make/iptables.mk index a441d79e47..fab2a1040f 100644 --- a/make/iptables.mk +++ b/make/iptables.mk @@ -34,6 +34,8 @@ $(TARGET_DIR)/sbin/iptables: $(IPTABLES_BUILD_DIR)/iptables iptables: $(TARGET_DIR)/sbin/iptables +iptables-source: $(DL_DIR)/$(IPTABLES_SOURCE) + iptables-clean: $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(IPTABLES_BUILD_DIR) uninstall -$(MAKE) -C $(IPTABLES_BUILD_DIR) clean diff --git a/make/kernel-headers.mk b/make/kernel-headers.mk index 1c9483ba5f..183823e478 100644 --- a/make/kernel-headers.mk +++ b/make/kernel-headers.mk @@ -50,13 +50,15 @@ $(LINUX_DIR)/.configured: $(LINUX_DIR)/.unpacked $(LINUX_KERNEL): $(LINUX_DIR)/.configured -system-linux: $(LINUX_DIR)/.configured +kernel-headers: $(LINUX_DIR)/.configured -system-linux-clean: clean +kernel-headers-source: $(DL_DIR)/$(LINUX_SOURCE) + +kernel-headers-clean: clean rm -f $(LINUX_KERNEL) rm -rf $(LINUX_DIR) -system-linux-dirclean: +kernel-headers-dirclean: rm -rf $(LINUX_DIR) endif diff --git a/make/linux.mk b/make/linux.mk index 479ca9e848..14ace8f86f 100644 --- a/make/linux.mk +++ b/make/linux.mk @@ -95,6 +95,8 @@ $(STAGING_DIR)/include/linux/version.h: $(LINUX_DIR)/.configured linux: $(STAGING_DIR)/include/linux/version.h $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep +linux-source: $(DL_DIR)/$(LINUX_SOURCE) + # This has been renamed so we do _NOT_ by default run this on 'make clean' linuxclean: clean rm -f $(LINUX_KERNEL) diff --git a/make/ncurses.mk b/make/ncurses.mk index d7b917e1ce..c0a5550860 100644 --- a/make/ncurses.mk +++ b/make/ncurses.mk @@ -5,7 +5,7 @@ # ############################################################# # Copyright (C) 2002 by Ken Restivo -# $Id: ncurses.mk,v 1.28 2003/11/01 05:34:39 mjn3 Exp $ +# $Id: ncurses.mk,v 1.29 2003/11/12 09:31:12 andersen Exp $ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Library General Public License as @@ -118,6 +118,8 @@ $(TARGET_DIR)/usr/lib/libncurses.a: $(STAGING_DIR)/lib/libncurses.a ncurses-headers: $(TARGET_DIR)/usr/lib/libncurses.a +ncurses-source: $(DL_DIR)/$(NCURSES_SOURCE) + ncurses-clean: rm -f $(STAGING_DIR)/lib/libncurses.so* $(TARGET_DIR)/lib/libncurses.so* rm -f $(STAGING_DIR)/usr/share/tabset $(TARGET_DIR)/usr/share/tabset diff --git a/make/netsnmp.mk b/make/netsnmp.mk index d8670ec2ef..697f3c6086 100644 --- a/make/netsnmp.mk +++ b/make/netsnmp.mk @@ -95,6 +95,8 @@ netsnmp-headers: $(TARGET_DIR)/usr/include/net-snmp/net-snmp-config.h cp -a $(STAGING_DIR)/include/net-snmp $(TARGET_DIR)/usr/include/net-snmp cp -a $(STAGING_DIR)/include/ucd-snmp $(TARGET_DIR)/usr/include/net-snmp +netsnmp-source: $(DL_DIR)/$(NETSNMP_SOURCE) + netsnmp-clean: $(MAKE) -C $(NETSNMP_DIR) clean diff --git a/make/newt.mk b/make/newt.mk index 9812007d93..cc2359e70d 100644 --- a/make/newt.mk +++ b/make/newt.mk @@ -61,6 +61,8 @@ $(TARGET_DIR)/lib/libnewt.so.$(NEWT_VERSION): $(STAGING_DIR)/lib/libnewt.a newt: uclibc slang $(TARGET_DIR)/lib/libnewt.so.$(NEWT_VERSION) +newt-source: $(DL_DIR)/$(NEWT_SOURCE) + newt-clean: rm -f $(TARGET_DIR)/lib/libnewt.so* -$(MAKE) -C $(NEWT_DIR) clean diff --git a/make/openssh.mk b/make/openssh.mk index 415835269d..98ba9d280e 100644 --- a/make/openssh.mk +++ b/make/openssh.mk @@ -66,6 +66,8 @@ $(TARGET_DIR)/usr/bin/ssh: $(OPENSSH_DIR)/ssh openssh: $(TARGET_DIR)/usr/bin/ssh +openssh-source: $(DL_DIR)/$(OPENSSH_SOURCE) + openssh-clean: $(MAKE) -C $(OPENSSH_DIR) clean diff --git a/make/openssl.mk b/make/openssl.mk index 729ce06d44..073d0f7d88 100644 --- a/make/openssl.mk +++ b/make/openssl.mk @@ -63,6 +63,10 @@ $(TARGET_DIR)/usr/lib/libssl.a: $(STAGING_DIR)/lib/libcrypto.a openssl-headers: $(TARGET_DIR)/usr/lib/libssl.a +openssl: uclibc $(TARGET_DIR)/usr/lib/libcrypto.so.0.9.7 + +openssl-source: $(DL_DIR)/$(OPENSSL_SOURCE) + openssl-clean: rm -f $(STAGING_DIR)/bin/openssl $(TARGET_DIR)/bin/openssl rm -f $(STAGING_DIR)/lib/libcrypto.so* $(TARGET_DIR)/lib/libcrypto.so* @@ -72,5 +76,3 @@ openssl-clean: openssl-dirclean: rm -rf $(OPENSSL_DIR) -openssl: uclibc $(TARGET_DIR)/usr/lib/libcrypto.so.0.9.7 - diff --git a/make/sfdisk.mk b/make/sfdisk.mk index a53e2071d7..c6b5e632b0 100644 --- a/make/sfdisk.mk +++ b/make/sfdisk.mk @@ -25,6 +25,8 @@ $(TARGET_DIR)/sbin/sfdisk: $(SFDISK_DIR)/sfdisk sfdisk: uclibc $(TARGET_DIR)/sbin/sfdisk +sfdisk-source: $(DL_DIR)/$(SFDISK_SOURCE) + sfdisk-clean: rm -f $(TARGET_DIR)/sbin/sfdisk -$(MAKE) -C $(SFDISK_DIR) clean diff --git a/make/socat.mk b/make/socat.mk index ed44803e20..010326d640 100644 --- a/make/socat.mk +++ b/make/socat.mk @@ -55,6 +55,8 @@ $(SOCAT_WORKDIR)/.installed: $(SOCAT_WORKDIR)/socat socat: uclibc $(SOCAT_WORKDIR)/.installed +socat-source: $(DL_DIR)/$(SOCAT_SOURCE) + socat-clean: @if [ -d $(SOCAT_WORKDIR)/Makefile ] ; then \ $(MAKE) -C $(SOCAT_WORKDIR) clean ; \ diff --git a/make/tinyx.mk b/make/tinyx.mk index 372ce84873..9f79d2f95b 100644 --- a/make/tinyx.mk +++ b/make/tinyx.mk @@ -116,6 +116,8 @@ $(TINYX_LIBX)/libX11.so.6.2: $(TINYX_XFBDEV) tinyx: zlib $(TINYX_LIBX)/libX11.so.6.2 $(TINYX_BINX)/Xfbdev +tinyx-source: $(DL_DIR)/$(TINYX_SOURCE) + tinyx-clean: -rm -rf $(TARGET_DIR)/usr/X11R6 -$(MAKE) -C $(TINYX_DIR) clean diff --git a/make/tn5250.mk b/make/tn5250.mk index 083630f6f9..6fcc160d6c 100644 --- a/make/tn5250.mk +++ b/make/tn5250.mk @@ -39,6 +39,8 @@ $(TARGET_DIR)/usr/bin/tn5250: $(TN5250_DIR)/tn5250 tn5250: uclibc slang $(TARGET_DIR)/usr/bin/tn5250 +tn5250-source: $(DL_DIR)/$(TN5250_SOURCE) + tn5250-clean: $(MAKE) -C $(TN5250_DIR) clean diff --git a/make/ttcp.mk b/make/ttcp.mk index 519f7bc4b5..7ff5f63158 100644 --- a/make/ttcp.mk +++ b/make/ttcp.mk @@ -27,6 +27,8 @@ $(TARGET_DIR)/usr/bin/ttcp: $(TTCP_BUILD_DIR)/ttcp ttcp: $(TARGET_DIR)/usr/bin/ttcp +ttcp-source: $(DL_DIR)/$(TTCP_SOURCE) + ttcp-clean: rm -f $(TTCP_BUILD_DIR)/*.o $(TTCP_BUILD_DIR)/ttcp diff --git a/make/uclibc.mk b/make/uclibc.mk index dcb285ae0d..03899b6a80 100644 --- a/make/uclibc.mk +++ b/make/uclibc.mk @@ -32,8 +32,6 @@ UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \ $(DL_DIR)/$(UCLIBC_SOURCE): $(WGET) -P $(DL_DIR) $(UCLIBC_SITE)/$(UCLIBC_SOURCE) -uclibc-source: $(DL_DIR)/$(UCLIBC_SOURCE) #$(UCLIBC_PATCH) - $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE) bzcat $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(BUILD_DIR) -xvf - touch $(UCLIBC_DIR)/.unpacked @@ -97,6 +95,10 @@ uclibc-configured: $(UCLIBC_DIR)/.configured uclibc: $(STAGING_DIR)/bin/$(ARCH)-linux-gcc $(STAGING_DIR)/lib/libc.a \ $(UCLIBC_TARGETS) +uclibc-source: $(DL_DIR)/$(UCLIBC_SOURCE) + +uclibc-configured-source: uclibc-source + uclibc-clean: -$(MAKE) -C $(UCLIBC_DIR) clean rm -f $(UCLIBC_DIR)/.config diff --git a/make/util-linux.mk b/make/util-linux.mk index 90d854a0b1..9c7faef47a 100644 --- a/make/util-linux.mk +++ b/make/util-linux.mk @@ -49,6 +49,8 @@ $(UTIL-LINUX_TARGET_BINARY): $(UTIL-LINUX_BINARY) util-linux: uclibc $(UTIL-LINUX_TARGET_BINARY) +util-linux-source: $(DL_DIR)/$(UTIL-LINUX_SOURCE) + util-linux-clean: #There is no working 'uninstall' target. Just skip it... #$(MAKE) DESTDIR=$(TARGET_DIR) -C $(UTIL-LINUX_DIR) uninstall diff --git a/make/valgrind.mk b/make/valgrind.mk index 924d211621..c375065109 100644 --- a/make/valgrind.mk +++ b/make/valgrind.mk @@ -78,6 +78,8 @@ else valgrind: endif +valgrind-source: $(DL_DIR)/$(VALGRIND_SOURCE) + valgrind-clean: $(MAKE) -C $(VALGRIND_DIR) clean diff --git a/make/wtools.mk b/make/wtools.mk index 5e27721af0..4289c962c4 100644 --- a/make/wtools.mk +++ b/make/wtools.mk @@ -32,6 +32,8 @@ $(TARGET_DIR)/sbin/iwconfig: $(WTOOLS_BUILD_DIR)/iwconfig wtools: $(TARGET_DIR)/sbin/iwconfig +wtools-source: $(DL_DIR)/$(WTOOLS_SOURCE) + wtools-clean: $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(WTOOLS_BUILD_DIR) uninstall -$(MAKE) -C $(WTOOLS_BUILD_DIR) clean diff --git a/make/zlib.mk b/make/zlib.mk index 901723e020..90c6915aa1 100644 --- a/make/zlib.mk +++ b/make/zlib.mk @@ -61,6 +61,8 @@ zlib-headers: $(TARGET_DIR)/usr/lib/libz.a zlib: uclibc $(TARGET_DIR)/lib/libz.so.1.1.4 +zlib-source: $(DL_DIR)/$(ZLIB_SOURCE) + zlib-clean: rm -f $(TARGET_DIR)/lib/libz.so* -$(MAKE) -C $(ZLIB_DIR) clean