summaryrefslogtreecommitdiff
path: root/Makerules
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2005-11-22 22:03:52 +0000
committerPeter S. Mazinger <ps.m@gmx.net>2005-11-22 22:03:52 +0000
commitec80cbc14c76ae55f1c8dc2bedde9ca7f94e35fe (patch)
tree50c17b8ee5f9b76ecc5bd3828eaddcb3ff718033 /Makerules
parent646ed9e564f1f789c1a0843f289d9789e55f3d6b (diff)
Make objs target work again
Diffstat (limited to 'Makerules')
-rw-r--r--Makerules14
1 files changed, 11 insertions, 3 deletions
diff --git a/Makerules b/Makerules
index 48831b937..235d38f9b 100644
--- a/Makerules
+++ b/Makerules
@@ -8,18 +8,26 @@
ifeq ($(HAVE_SHARED),y)
.LIBPATTERNS: "lib%.so"
libs: $(lib-so-y) $(lib-a-y)
-objs: $(sort $(shared_objs) $(ar_objs))
else
.LIBPATTERNS: "lib%.a"
libs: $(lib-a-y)
-objs: $(ar_objs)
endif
+objs: all_objs
-shared_objs = $(lduClibc-so-y) $(libc-so-y) $(libc-nonshared-y) $(libdl-so-y)
+shared_objs = $(ld-uClibc-so-y) $(libc-so-y) $(libc-nonshared-y) $(libdl-so-y)
shared_objs += $(libcrypt-so-y) $(libintl-so-y) $(libm-so-y) $(libnsl-so-y) $(libpthread-so-y)
shared_objs += $(libresolv-so-y) $(librt-so-y) $(libutil-so-y)
ar_objs = $(libc-a-y) $(libcrypt-a-y) $(libintl-a-y) $(libm-a-y) $(libnsl-a-y)
ar_objs += $(libpthread-a-y) $(libresolv-a-y) $(librt-a-y) $(libutil-a-y)
+ifeq ($(DOPIC),y)
+ar_objs := $(ar_objs:.o=.os)
+endif
+
+ifeq ($(HAVE_SHARED),y)
+all_objs: $(sort $(shared_objs) $(ar_objs))
+else
+all_objs: $(ar_objs)
+endif
headers-y: $(headers-y)