summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 93b598c..71525e1 100644
--- a/Makefile
+++ b/Makefile
@@ -243,9 +243,8 @@ endif # ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
# depending on it.
DIRS_UPPER:=$(shell echo $(DIRS) | $(SED) 'h;y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/')
-# First populate the variables ..._OBJ-y ...OBJ-m et al
+# First populate the variables ..._OBJ-y et al
$(foreach d,$(DIRS_UPPER),$(eval $(notdir $(d))-y:=))
-$(foreach d,$(DIRS_UPPER),$(eval $(notdir $(d))-m:=))
include $(patsubst %,%/Makefile.in,$(SRC_DIRS))
diff --git a/coreutils/Makefile.in b/coreutils/Makefile.in
index eee64a9..5f8a0ac 100644
--- a/coreutils/Makefile.in
+++ b/coreutils/Makefile.in
@@ -78,7 +78,6 @@ COREUTILS-$(CONFIG_WHOAMI) += whoami.o
COREUTILS-$(CONFIG_YES) += yes.o
COREUTILS-y:=$(sort $(COREUTILS-y))
-COREUTILS-m:=$(sort $(COREUTILS-m))
COREUTILS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(COREUTILS-y))
COREUTILS_SRC-a:=$(wildcard $(srcdir)/*.c)
diff --git a/libbb/Makefile.in b/libbb/Makefile.in
index 3828a42..d4cc764 100644
--- a/libbb/Makefile.in
+++ b/libbb/Makefile.in
@@ -45,7 +45,7 @@ LIBBB-$(CONFIG_SU)+= correct_password.c
LIBBB-$(CONFIG_LOGIN)+= correct_password.c
-LIBBB-y:=$(patsubst %,$(srcdir)/%,$(LIBBB-y) $(LIBBB-m))
+LIBBB-y:=$(patsubst %,$(srcdir)/%,$(LIBBB-y))
# 1:N objects
LIBBB_MSRC0:=$(srcdir)/messages.c
diff --git a/loginutils/Makefile.in b/loginutils/Makefile.in
index f09b6d2..dfbba50 100644
--- a/loginutils/Makefile.in
+++ b/loginutils/Makefile.in
@@ -30,9 +30,6 @@ needcrypt-$(CONFIG_PASSWD) := y
needcrypt-$(CONFIG_SU) := y
needcrypt-$(CONFIG_SULOGIN) := y
needcrypt-$(CONFIG_VLOCK) := y
-ifeq ($(needcrypt-m),y)
-needcrypt-y:=y
-endif
ifeq ($(needcrypt-y),y)
LIBRARIES := -lcrypt $(filter-out -lcrypt,$(LIBRARIES))
endif
diff --git a/miscutils/Makefile.in b/miscutils/Makefile.in
index e431f48..12b4f05 100644
--- a/miscutils/Makefile.in
+++ b/miscutils/Makefile.in
@@ -29,9 +29,6 @@ MISCUTILS-$(CONFIG_WATCHDOG) += watchdog.o
needlibm-y:=
needlibm-$(CONFIG_DC) := y
-ifeq ($(needlibm-m),y)
-needlibm-y:=y
-endif
ifeq ($(needlibm-y),y)
LIBRARIES := $(filter-out -lm,$(LIBRARIES)) -lm
endif
diff --git a/networking/Makefile.in b/networking/Makefile.in
index 0f607eb..efad050 100644
--- a/networking/Makefile.in
+++ b/networking/Makefile.in
@@ -40,13 +40,9 @@ NETWORKING-$(CONFIG_WGET) += wget.o
NETWORKING-$(CONFIG_ZCIP) += zcip.o
NETWORKING-y:=$(sort $(NETWORKING-y))
-NETWORKING-m:=$(sort $(NETWORKING-m))
needcrypt-y:=
needcrypt-$(CONFIG_FEATURE_HTTPD_AUTH_MD5) := y
-ifeq ($(needcrypt-m),y)
-needcrypt-y:=y
-endif
ifeq ($(needcrypt-y),y)
LIBRARIES := -lcrypt $(filter-out -lcrypt,$(LIBRARIES))
endif