Split up the .o and .os rules, so all the sources are created if DOPIC is disabled.

3 files changed, 16 insertions, 4 deletions

diff --git a/Makerules b/Makerules
index b50b8a594..da3a98e3f 100644
--- a/Makerules
+++ b/Makerules
@@ -25,13 +25,19 @@ compile-m=$(CC) $^ -c -o $@ $(CPPFLAGS) $(CFLAGS) $(ARCH_CFLAGS) $(CFLAGS-$(suff
 CFLAGS-.os+=$(PICFLAG)
 CFLAGS-.oS+=$(PICFLAG) -DSHARED
 
-%.o %.os: %.c
+%.o: %.c
+	$(compile.c)
+
+%.os: %.c
 	$(compile.c)
 
 %.oS: %.c
 	$(compile.c)
 
-%.o %.os: %.S
+%.o: %.S
+	$(compile.S)
+
+%.os: %.S
 	$(compile.S)
 
 #ifeq ($(HAVE_ELF),y)
diff --git a/libintl/Makefile.in b/libintl/Makefile.in
index 5b309fc39..8c77262a0 100644
--- a/libintl/Makefile.in
+++ b/libintl/Makefile.in
@@ -22,7 +22,10 @@ libintl_MOBJ:=$(patsubst %.o,$(libintl_OUT)/%.o,$(MOBJ))
 
 libintl_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(libintl_MOBJ))))
 
-$(libintl_MOBJ) $(libintl_MOBJ:.o=.os): $(libintl_MSRC)
+$(libintl_MOBJ): $(libintl_MSRC)
+	$(compile.m)
+
+$(libintl_MOBJ:.o=.os): $(libintl_MSRC)
 	$(compile.m)
 
 libintl-a-$(UCLIBC_HAS_GETTEXT_AWARENESS):=$(libintl_MOBJ)
diff --git a/libm/Makefile.in b/libm/Makefile.in
index 541b6fb91..b026644b0 100644
--- a/libm/Makefile.in
+++ b/libm/Makefile.in
@@ -116,7 +116,10 @@ libm_OBJS+=$(patsubst %.c,$(libm_OUT)/%.o,$(LIBM_NO_MULTI))
 endif
 endif
 
-$(libm_MOBJ) $(libm_MOBJ:.o=.os): $(libm_MSRC)
+$(libm_MOBJ): $(libm_MSRC)
+	$(compile.m)
+
+$(libm_MOBJ:.o=.os): $(libm_MSRC)
 	$(compile.m)
 
 libm-a-$(UCLIBC_HAS_FLOATS)+=$(libm_OBJS)