From fe6015e8aac57bedd05407fc956727c993070adf Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Tue, 4 Nov 2003 09:00:56 +0000 Subject: minor cleanup --- libc/Makefile | 2 +- libintl/Makefile | 4 ++-- libm/Makefile | 4 ++-- libnsl/Makefile | 4 ++-- libpthread/Makefile | 8 ++++---- libresolv/Makefile | 4 ++-- libutil/Makefile | 4 ++-- 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 -- cgit v1.2.3