summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2003-11-04 09:00:56 +0000
committerEric Andersen <andersen@codepoet.org>2003-11-04 09:00:56 +0000
commitfe6015e8aac57bedd05407fc956727c993070adf (patch)
tree85150bde02f17833ac3eeb1eb51e15972daa95f4
parent36be007b2671b0f2dc27943dc41cba09f45284b7 (diff)
minor cleanup
-rw-r--r--libc/Makefile2
-rw-r--r--libintl/Makefile4
-rw-r--r--libm/Makefile4
-rw-r--r--libnsl/Makefile4
-rw-r--r--libpthread/Makefile8
-rw-r--r--libresolv/Makefile4
-rw-r--r--libutil/Makefile4
7 files changed, 15 insertions, 15 deletions
diff --git a/libc/Makefile b/libc/Makefile
index 0e3f2ead6..e46b633b7 100644
--- a/libc/Makefile
+++ b/libc/Makefile
@@ -57,7 +57,7 @@ $(LIBNAME): subdirs ar-target
shared: $(TOPDIR)lib/$(LIBNAME)
$(LD) $(LDFLAGS) $(VERSION_SCRIPT) -soname=$(SHARED_MAJORNAME) -o $(SHARED_FULLNAME) \
--whole-archive $(LIBNAME) \
- $(TOPDIR)/libc/misc/internals/interp.o --no-whole-archive \
+ $(TOPDIR)libc/misc/internals/interp.o --no-whole-archive \
-init __uClibc_init
@true #$(RM) -r tmp
$(INSTALL) -d $(TOPDIR)lib
diff --git a/libintl/Makefile b/libintl/Makefile
index 1036fbf64..8083897bd 100644
--- a/libintl/Makefile
+++ b/libintl/Makefile
@@ -53,8 +53,8 @@ $(MOBJ): $(MSRC)
shared: all
$(LD) $(LDFLAGS) -soname=$(LIBINTL_SHARED).$(MAJOR_VERSION) \
-o $(LIBINTL_SHARED_FULLNAME) --whole-archive $(LIBINTL) \
- --no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
- -L$(TOPDIR)/lib -lc;
+ --no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
+ -L$(TOPDIR)lib -lc;
$(INSTALL) -d $(TOPDIR)lib
$(RM) $(TOPDIR)lib/$(LIBINTL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBINTL_SHARED).$(MAJOR_VERSION)
$(INSTALL) -m 644 $(LIBINTL_SHARED_FULLNAME) $(TOPDIR)lib
diff --git a/libm/Makefile b/libm/Makefile
index dad2286d2..b7ddb9d36 100644
--- a/libm/Makefile
+++ b/libm/Makefile
@@ -98,8 +98,8 @@ shared: all
set -x -e; \
$(LD) $(LDFLAGS) -soname=$(LIBM_SHARED).$(MAJOR_VERSION) \
-o $(LIBM_SHARED_FULLNAME) --whole-archive $(LIBM) \
- --no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
- -L$(TOPDIR)/lib -lc; \
+ --no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
+ -L$(TOPDIR)lib -lc; \
$(INSTALL) -d $(TOPDIR)lib; \
$(RM) $(TOPDIR)lib/$(LIBM_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBM_SHARED).$(MAJOR_VERSION); \
$(INSTALL) -m 644 $(LIBM_SHARED_FULLNAME) $(TOPDIR)lib; \
diff --git a/libnsl/Makefile b/libnsl/Makefile
index 7566c2dfd..e7ff6e018 100644
--- a/libnsl/Makefile
+++ b/libnsl/Makefile
@@ -45,8 +45,8 @@ $(OBJ): Makefile
shared: all
$(LD) $(LDFLAGS) -soname=$(LIBNSL_SHARED).$(MAJOR_VERSION) \
-o $(LIBNSL_SHARED_FULLNAME) --whole-archive $(LIBNSL) \
- --no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
- -L$(TOPDIR)/lib -lc;
+ --no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
+ -L$(TOPDIR)lib -lc;
$(INSTALL) -d $(TOPDIR)lib
$(RM) $(TOPDIR)lib/$(LIBNSL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBNSL_SHARED).$(MAJOR_VERSION)
$(INSTALL) -m 644 $(LIBNSL_SHARED_FULLNAME) $(TOPDIR)lib
diff --git a/libpthread/Makefile b/libpthread/Makefile
index 5558a2360..189cdffc2 100644
--- a/libpthread/Makefile
+++ b/libpthread/Makefile
@@ -80,8 +80,8 @@ shared: all
set -e; \
$(LD) $(LDFLAGS_PTHREADS) -soname=$(LIBPTHREAD_SHARED).$(MAJOR_VERSION) \
-o $(LIBPTHREAD_SHARED_FULLNAME) $(START_FILES) --whole-archive $(LIBPTHREAD) \
- --no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
- -L$(TOPDIR)/lib -lc $(END_FILES); \
+ --no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
+ -L$(TOPDIR)lib -lc $(END_FILES); \
$(INSTALL) -d $(TOPDIR)lib; \
$(RM) $(TOPDIR)lib/$(LIBPTHREAD_SHARED_FULLNAME) \
$(TOPDIR)lib/$(LIBPTHREAD_SHARED).$(MAJOR_VERSION); \
@@ -95,8 +95,8 @@ shared: all
set -e; \
$(LD) $(LDFLAGS) -soname=$(LIBTHREAD_DB_SHARED).1 \
-o $(LIBTHREAD_DB_SHARED_FULLNAME) $(START_FILES) --whole-archive $(LIBTHREAD_DB) \
- --no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
- -L$(TOPDIR)/lib -lc $(END_FILES); \
+ --no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
+ -L$(TOPDIR)lib -lc $(END_FILES); \
$(INSTALL) -d $(TOPDIR)lib; \
$(RM) $(TOPDIR)lib/$(LIBTHREAD_DB_SHARED_FULLNAME) \
$(TOPDIR)lib/$(LIBTHREAD_DB_SHARED).$(MAJOR_VERSION); \
diff --git a/libresolv/Makefile b/libresolv/Makefile
index deb375f23..180b632fa 100644
--- a/libresolv/Makefile
+++ b/libresolv/Makefile
@@ -51,8 +51,8 @@ $(OBJ): Makefile
shared: all
$(LD) $(LDFLAGS) -soname=$(LIBRESOLV_SHARED).$(MAJOR_VERSION) \
-o $(LIBRESOLV_SHARED_FULLNAME) --whole-archive $(LIBRESOLV) \
- --no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
- -L$(TOPDIR)/lib -lc;
+ --no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
+ -L$(TOPDIR)lib -lc;
$(INSTALL) -d $(TOPDIR)lib
$(RM) $(TOPDIR)lib/$(LIBRESOLV_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBRESOLV_SHARED).$(MAJOR_VERSION)
$(INSTALL) -m 644 $(LIBRESOLV_SHARED_FULLNAME) $(TOPDIR)lib
diff --git a/libutil/Makefile b/libutil/Makefile
index 5698fc6ef..7ae00f53c 100644
--- a/libutil/Makefile
+++ b/libutil/Makefile
@@ -52,8 +52,8 @@ $(OBJS): %.o : %.c
shared: all
$(LD) $(LDFLAGS) -soname=$(LIBUTIL_SHARED).$(MAJOR_VERSION) \
-o $(LIBUTIL_SHARED_FULLNAME) --whole-archive $(LIBUTIL) \
- --no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
- -L$(TOPDIR)/lib -lc;
+ --no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
+ -L$(TOPDIR)lib -lc;
$(INSTALL) -d $(TOPDIR)lib
$(RM) $(TOPDIR)lib/$(LIBUTIL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBUTIL_SHARED).$(MAJOR_VERSION)
$(INSTALL) -m 644 $(LIBUTIL_SHARED_FULLNAME) $(TOPDIR)lib