aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-03-02 18:23:13 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-03-02 18:23:13 +0000
commite3ec99de828dfdb2396b50c472ef381321e9f008 (patch)
treee74cf48565d01a03640d0be94df53cb4f2f36a62
parentc8e278f54ba7ec0d2f5626eef15057b684d7a2df (diff)
downloadbusybox-w32-e3ec99de828dfdb2396b50c472ef381321e9f008.tar.gz
busybox-w32-e3ec99de828dfdb2396b50c472ef381321e9f008.tar.bz2
busybox-w32-e3ec99de828dfdb2396b50c472ef381321e9f008.zip
- remove unused lists *-m
-rw-r--r--Makefile3
-rw-r--r--coreutils/Makefile.in1
-rw-r--r--libbb/Makefile.in2
-rw-r--r--loginutils/Makefile.in3
-rw-r--r--miscutils/Makefile.in3
-rw-r--r--networking/Makefile.in4
6 files changed, 2 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index 93b598c1a..71525e1f0 100644
--- a/Makefile
+++ b/Makefile
@@ -243,9 +243,8 @@ endif # ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
243# depending on it. 243# depending on it.
244DIRS_UPPER:=$(shell echo $(DIRS) | $(SED) 'h;y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/') 244DIRS_UPPER:=$(shell echo $(DIRS) | $(SED) 'h;y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/')
245 245
246# First populate the variables ..._OBJ-y ...OBJ-m et al 246# First populate the variables ..._OBJ-y et al
247$(foreach d,$(DIRS_UPPER),$(eval $(notdir $(d))-y:=)) 247$(foreach d,$(DIRS_UPPER),$(eval $(notdir $(d))-y:=))
248$(foreach d,$(DIRS_UPPER),$(eval $(notdir $(d))-m:=))
249 248
250include $(patsubst %,%/Makefile.in,$(SRC_DIRS)) 249include $(patsubst %,%/Makefile.in,$(SRC_DIRS))
251 250
diff --git a/coreutils/Makefile.in b/coreutils/Makefile.in
index eee64a995..5f8a0ac52 100644
--- a/coreutils/Makefile.in
+++ b/coreutils/Makefile.in
@@ -78,7 +78,6 @@ COREUTILS-$(CONFIG_WHOAMI) += whoami.o
78COREUTILS-$(CONFIG_YES) += yes.o 78COREUTILS-$(CONFIG_YES) += yes.o
79 79
80COREUTILS-y:=$(sort $(COREUTILS-y)) 80COREUTILS-y:=$(sort $(COREUTILS-y))
81COREUTILS-m:=$(sort $(COREUTILS-m))
82 81
83COREUTILS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(COREUTILS-y)) 82COREUTILS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(COREUTILS-y))
84COREUTILS_SRC-a:=$(wildcard $(srcdir)/*.c) 83COREUTILS_SRC-a:=$(wildcard $(srcdir)/*.c)
diff --git a/libbb/Makefile.in b/libbb/Makefile.in
index 3828a42db..d4cc7646a 100644
--- a/libbb/Makefile.in
+++ b/libbb/Makefile.in
@@ -45,7 +45,7 @@ LIBBB-$(CONFIG_SU)+= correct_password.c
45LIBBB-$(CONFIG_LOGIN)+= correct_password.c 45LIBBB-$(CONFIG_LOGIN)+= correct_password.c
46 46
47 47
48LIBBB-y:=$(patsubst %,$(srcdir)/%,$(LIBBB-y) $(LIBBB-m)) 48LIBBB-y:=$(patsubst %,$(srcdir)/%,$(LIBBB-y))
49 49
50# 1:N objects 50# 1:N objects
51LIBBB_MSRC0:=$(srcdir)/messages.c 51LIBBB_MSRC0:=$(srcdir)/messages.c
diff --git a/loginutils/Makefile.in b/loginutils/Makefile.in
index f09b6d2a6..dfbba5019 100644
--- a/loginutils/Makefile.in
+++ b/loginutils/Makefile.in
@@ -30,9 +30,6 @@ needcrypt-$(CONFIG_PASSWD) := y
30needcrypt-$(CONFIG_SU) := y 30needcrypt-$(CONFIG_SU) := y
31needcrypt-$(CONFIG_SULOGIN) := y 31needcrypt-$(CONFIG_SULOGIN) := y
32needcrypt-$(CONFIG_VLOCK) := y 32needcrypt-$(CONFIG_VLOCK) := y
33ifeq ($(needcrypt-m),y)
34needcrypt-y:=y
35endif
36ifeq ($(needcrypt-y),y) 33ifeq ($(needcrypt-y),y)
37 LIBRARIES := -lcrypt $(filter-out -lcrypt,$(LIBRARIES)) 34 LIBRARIES := -lcrypt $(filter-out -lcrypt,$(LIBRARIES))
38endif 35endif
diff --git a/miscutils/Makefile.in b/miscutils/Makefile.in
index e431f48ef..12b4f05a4 100644
--- a/miscutils/Makefile.in
+++ b/miscutils/Makefile.in
@@ -29,9 +29,6 @@ MISCUTILS-$(CONFIG_WATCHDOG) += watchdog.o
29 29
30needlibm-y:= 30needlibm-y:=
31needlibm-$(CONFIG_DC) := y 31needlibm-$(CONFIG_DC) := y
32ifeq ($(needlibm-m),y)
33needlibm-y:=y
34endif
35ifeq ($(needlibm-y),y) 32ifeq ($(needlibm-y),y)
36 LIBRARIES := $(filter-out -lm,$(LIBRARIES)) -lm 33 LIBRARIES := $(filter-out -lm,$(LIBRARIES)) -lm
37endif 34endif
diff --git a/networking/Makefile.in b/networking/Makefile.in
index 0f607eb80..efad05053 100644
--- a/networking/Makefile.in
+++ b/networking/Makefile.in
@@ -40,13 +40,9 @@ NETWORKING-$(CONFIG_WGET) += wget.o
40NETWORKING-$(CONFIG_ZCIP) += zcip.o 40NETWORKING-$(CONFIG_ZCIP) += zcip.o
41 41
42NETWORKING-y:=$(sort $(NETWORKING-y)) 42NETWORKING-y:=$(sort $(NETWORKING-y))
43NETWORKING-m:=$(sort $(NETWORKING-m))
44 43
45needcrypt-y:= 44needcrypt-y:=
46needcrypt-$(CONFIG_FEATURE_HTTPD_AUTH_MD5) := y 45needcrypt-$(CONFIG_FEATURE_HTTPD_AUTH_MD5) := y
47ifeq ($(needcrypt-m),y)
48needcrypt-y:=y
49endif
50ifeq ($(needcrypt-y),y) 46ifeq ($(needcrypt-y),y)
51 LIBRARIES := -lcrypt $(filter-out -lcrypt,$(LIBRARIES)) 47 LIBRARIES := -lcrypt $(filter-out -lcrypt,$(LIBRARIES))
52endif 48endif