From 3d5a4b036c3ad035450aa7fdac8c39d2f0bc6fa2 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb <wbx@openwrt.org> Date: Sat, 19 Feb 2005 07:40:42 +0000 Subject: sync with buildroot2 from uclibc git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@262 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/busybox/Makefile.in | 3 --- package/busybox/busybox.mk | 9 +++++++++ package/dnsmasq/Makefile.in | 3 --- package/dnsmasq/dnsmasq.mk | 4 ++++ package/dropbear_sshd/Makefile.in | 3 --- package/dropbear_sshd/dropbear_sshd.mk | 3 +++ package/ebtables/Makefile.in | 3 --- package/ebtables/ebtables.mk | 8 ++++++-- package/iptables/Makefile.in | 3 --- package/iptables/iptables.mk | 6 +++++- package/sed/Makefile.in | 3 --- package/sed/sed.mk | 4 +++- 12 files changed, 30 insertions(+), 22 deletions(-) delete mode 100644 package/busybox/Makefile.in delete mode 100644 package/dnsmasq/Makefile.in delete mode 100644 package/dropbear_sshd/Makefile.in delete mode 100644 package/ebtables/Makefile.in delete mode 100644 package/iptables/Makefile.in delete mode 100644 package/sed/Makefile.in diff --git a/package/busybox/Makefile.in b/package/busybox/Makefile.in deleted file mode 100644 index a8efafb8b4..0000000000 --- a/package/busybox/Makefile.in +++ /dev/null @@ -1,3 +0,0 @@ -ifeq ($(strip $(BR2_PACKAGE_BUSYBOX)),y) -TARGETS+=busybox -endif diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 84c4a1cd7f..e19aa7bc4f 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -60,3 +60,12 @@ busybox-clean: busybox-dirclean: rm -rf $(BUSYBOX_DIR) + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_BUSYBOX)),y) +TARGETS+=busybox +endif diff --git a/package/dnsmasq/Makefile.in b/package/dnsmasq/Makefile.in deleted file mode 100644 index 36548bd2b1..0000000000 --- a/package/dnsmasq/Makefile.in +++ /dev/null @@ -1,3 +0,0 @@ -ifeq ($(strip $(BR2_PACKAGE_DNSMASQ)),y) -TARGETS+=dnsmasq -endif diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index b1848c6aa8..e6b50a2613 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -48,3 +48,7 @@ dnsmasq-clean: dnsmasq-dirclean: rm -rf $(DNSMASQ_DIR) + +ifeq ($(strip $(BR2_PACKAGE_DNSMASQ)),y) +TARGETS+=dnsmasq +endif diff --git a/package/dropbear_sshd/Makefile.in b/package/dropbear_sshd/Makefile.in deleted file mode 100644 index 87247fcee5..0000000000 --- a/package/dropbear_sshd/Makefile.in +++ /dev/null @@ -1,3 +0,0 @@ -ifeq ($(strip $(BR2_PACKAGE_DROPBEAR_SSHD)),y) -TARGETS+=dropbear_sshd -endif diff --git a/package/dropbear_sshd/dropbear_sshd.mk b/package/dropbear_sshd/dropbear_sshd.mk index 26c9b17830..4031e218fb 100644 --- a/package/dropbear_sshd/dropbear_sshd.mk +++ b/package/dropbear_sshd/dropbear_sshd.mk @@ -77,3 +77,6 @@ dropbear_sshd-clean: dropbear_sshd-dirclean: rm -rf $(DROPBEAR_SSHD_DIR) +ifeq ($(strip $(BR2_PACKAGE_DROPBEAR_SSHD)),y) +TARGETS+=dropbear_sshd +endif diff --git a/package/ebtables/Makefile.in b/package/ebtables/Makefile.in deleted file mode 100644 index 20a734f300..0000000000 --- a/package/ebtables/Makefile.in +++ /dev/null @@ -1,3 +0,0 @@ -ifeq ($(strip $(BR2_PACKAGE_EBTABLES)),y) -TARGETS+=ebtables -endif diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk index b28e86c28b..e7982ca1f4 100644 --- a/package/ebtables/ebtables.mk +++ b/package/ebtables/ebtables.mk @@ -3,7 +3,7 @@ # ebtables # ############################################################# -# + EBTABLES_SOURCE_URL=http://umn.dl.sourceforge.net/sourceforge/ebtables/ EBTABLES_SOURCE=ebtables-v2.0.6.tar.gz EBTABLES_BUILD_DIR=$(BUILD_DIR)/ebtables-v2.0.6 @@ -25,7 +25,7 @@ $(TARGET_DIR)/$(EBTABLES_TARGET_BINARY): $(EBTABLES_BUILD_DIR)/ebtables cp -af $(EBTABLES_BUILD_DIR)/ebtables $(TARGET_DIR)/$(EBTABLES_TARGET_BINARY) $(STRIP) $(TARGET_DIR)/$(EBTABLES_TARGET_BINARY) -ebtables: linux $(TARGET_DIR)/$(EBTABLES_TARGET_BINARY) +ebtables: $(TARGET_DIR)/$(EBTABLES_TARGET_BINARY) ebtables-source: $(DL_DIR)/$(EBTABLES_SOURCE) @@ -35,3 +35,7 @@ ebtables-clean: ebtables-dirclean: rm -rf $(EBTABLES_BUILD_DIR) + +ifeq ($(strip $(BR2_PACKAGE_EBTABLES)),y) +TARGETS+=ebtables +endif diff --git a/package/iptables/Makefile.in b/package/iptables/Makefile.in deleted file mode 100644 index 5be894b9a6..0000000000 --- a/package/iptables/Makefile.in +++ /dev/null @@ -1,3 +0,0 @@ -ifeq ($(strip $(BR2_PACKAGE_IPTABLES)),y) -TARGETS+=iptables -endif diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk index 99cf14f275..e343a6122e 100644 --- a/package/iptables/iptables.mk +++ b/package/iptables/iptables.mk @@ -39,7 +39,7 @@ $(TARGET_DIR)/usr/sbin/iptables: $(IPTABLES_BUILD_DIR)/iptables $(STRIP) $(TARGET_DIR)/usr/lib/iptables/*.so rm -rf $(TARGET_DIR)/usr/man -iptables: $(TARGET_DIR)/usr/sbin/iptables +iptables: kernel-headers $(TARGET_DIR)/usr/sbin/iptables iptables-source: $(DL_DIR)/$(IPTABLES_SOURCE) @@ -49,3 +49,7 @@ iptables-clean: iptables-dirclean: rm -rf $(IPTABLES_BUILD_DIR) + +ifeq ($(strip $(BR2_PACKAGE_IPTABLES)),y) +TARGETS+=iptables +endif diff --git a/package/sed/Makefile.in b/package/sed/Makefile.in deleted file mode 100644 index 6738e4f246..0000000000 --- a/package/sed/Makefile.in +++ /dev/null @@ -1,3 +0,0 @@ -ifeq ($(strip $(BR2_PACKAGE_SED)),y) -TARGETS+=sed -endif diff --git a/package/sed/sed.mk b/package/sed/sed.mk index 5154c1f795..637768920c 100644 --- a/package/sed/sed.mk +++ b/package/sed/sed.mk @@ -133,4 +133,6 @@ sed-clean: sed-dirclean: rm -rf $(SED_DIR2) - +ifeq ($(strip $(BR2_PACKAGE_SED)),y) +TARGETS+=sed +endif -- cgit v1.2.3