summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-02-19 07:40:42 +0000
committerwbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-02-19 07:40:42 +0000
commit96e152f98fef95d1f1768c7a8334f03375a436e8 (patch)
treebc97aa1d9e154d01dc441fd3a6486e6ad5b939d3
parent3a54ea191df5025de432575640b3b21c4d9be902 (diff)
sync with buildroot2 from uclibc
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@262 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/busybox/Makefile.in3
-rw-r--r--package/busybox/busybox.mk9
-rw-r--r--package/dnsmasq/Makefile.in3
-rw-r--r--package/dnsmasq/dnsmasq.mk4
-rw-r--r--package/dropbear_sshd/Makefile.in3
-rw-r--r--package/dropbear_sshd/dropbear_sshd.mk3
-rw-r--r--package/ebtables/Makefile.in3
-rw-r--r--package/ebtables/ebtables.mk8
-rw-r--r--package/iptables/Makefile.in3
-rw-r--r--package/iptables/iptables.mk6
-rw-r--r--package/sed/Makefile.in3
-rw-r--r--package/sed/sed.mk4
12 files changed, 30 insertions, 22 deletions
diff --git a/package/busybox/Makefile.in b/package/busybox/Makefile.in
deleted file mode 100644
index a8efafb8b..000000000
--- 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 84c4a1cd7..e19aa7bc4 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 36548bd2b..000000000
--- 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 b1848c6aa..e6b50a261 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 87247fcee..000000000
--- 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 26c9b1783..4031e218f 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 20a734f30..000000000
--- 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 b28e86c28..e7982ca1f 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 5be894b9a..000000000
--- 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 99cf14f27..e343a6122 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 6738e4f24..000000000
--- 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 5154c1f79..637768920 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