diff options
-rw-r--r-- | Rules.mak | 1 | ||||
-rw-r--r-- | ldso/libdl/Makefile.in | 2 | ||||
-rw-r--r-- | libc/Makefile.in | 6 | ||||
-rw-r--r-- | libcrypt/Makefile.in | 6 | ||||
-rw-r--r-- | libm/Makefile.in | 6 | ||||
-rw-r--r-- | libnsl/Makefile.in | 4 | ||||
-rw-r--r-- | libpthread/linuxthreads.old/Makefile.in | 4 | ||||
-rw-r--r-- | libpthread/linuxthreads.old_db/Makefile.in | 6 | ||||
-rw-r--r-- | libpthread/linuxthreads/Makefile.in | 4 | ||||
-rw-r--r-- | libpthread/linuxthreads_db/Makefile.in | 6 | ||||
-rw-r--r-- | libresolv/Makefile.in | 4 | ||||
-rw-r--r-- | librt/Makefile.in | 4 | ||||
-rw-r--r-- | libutil/Makefile.in | 6 |
13 files changed, 30 insertions, 29 deletions
@@ -98,6 +98,7 @@ endif UCLIBC_LDSO := $(UCLIBC_LDSO_NAME).so.$(MAJOR_VERSION) NONSHARED_LIBNAME := uclibc_nonshared.a libc := $(top_builddir)lib/$(SHARED_MAJORNAME) +libc.depend := $(top_builddir)lib/$(SHARED_MAJORNAME:.$(MAJOR_VERSION)=) interp := $(top_builddir)lib/interp.os ldso := $(top_builddir)lib/$(UCLIBC_LDSO) headers_dep := $(top_builddir)include/bits/sysnum.h diff --git a/ldso/libdl/Makefile.in b/ldso/libdl/Makefile.in index baacf7654..82afb67b9 100644 --- a/ldso/libdl/Makefile.in +++ b/ldso/libdl/Makefile.in @@ -41,7 +41,7 @@ lib-a-$(HAVE_SHARED) += $(top_builddir)lib/libdl.a lib-so-y += $(top_builddir)lib/libdl.so objclean-y += libdl_clean -$(top_builddir)lib/libdl.so: $(libdl_OUT)/libdl_so.a $(libc) +$(top_builddir)lib/libdl.so: $(libdl_OUT)/libdl_so.a $(libc.depend) $(call link.so,$(libdl_FULL_NAME),$(MAJOR_VERSION)) $(libdl_OUT)/libdl_so.a: $(libdl-so-y) diff --git a/libc/Makefile.in b/libc/Makefile.in index 136d2dfaa..11224bbe0 100644 --- a/libc/Makefile.in +++ b/libc/Makefile.in @@ -51,16 +51,16 @@ endif lib-a-y += $(top_builddir)lib/libc.a lib-gdb-y += $(top_builddir)lib/libc.gdb -lib-so-y += $(libc:.$(MAJOR_VERSION)=) +lib-so-y += $(libc.depend) objclean-y += libc_clean OUTPUT_FORMAT = $(CC) $(CFLAGS) -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/OUTPUT_FORMAT ( \1 )/p' ifeq ($(DOMULTI),n) -$(libc:.$(MAJOR_VERSION)=): $(libc_OUT)/libc_so.a $(LIBS-libc.so) +$(libc.depend): $(libc_OUT)/libc_so.a $(LIBS-libc.so) $(call link.so,$(libc_FULL_NAME),$(MAJOR_VERSION)) else -$(libc:.$(MAJOR_VERSION)=): $(libc_OUT)/libc.oS $(libc-nomulti-y:.o=.oS) | $(LIBS-libc.so) +$(libc.depend): $(libc_OUT)/libc.oS $(libc-nomulti-y:.o=.oS) | $(LIBS-libc.so) $(do_strip) $(call linkm.so,$(libc_FULL_NAME),$(MAJOR_VERSION)) endif diff --git a/libcrypt/Makefile.in b/libcrypt/Makefile.in index 7364d3e71..40bb55cd0 100644 --- a/libcrypt/Makefile.in +++ b/libcrypt/Makefile.in @@ -32,13 +32,13 @@ objclean-y += libcrypt_clean ifeq ($(DOMULTI),n) ifeq ($(DOPIC),y) -$(top_builddir)lib/libcrypt.so: $(top_builddir)lib/libcrypt.a $(libc) +$(top_builddir)lib/libcrypt.so: $(top_builddir)lib/libcrypt.a $(libc.depend) else -$(top_builddir)lib/libcrypt.so: $(libcrypt_OUT)/libcrypt_so.a $(libc) +$(top_builddir)lib/libcrypt.so: $(libcrypt_OUT)/libcrypt_so.a $(libc.depend) endif $(call link.so,$(libcrypt_FULL_NAME),$(MAJOR_VERSION)) else -$(top_builddir)lib/libcrypt.so: $(libcrypt_OUT)/libcrypt.oS | $(libc) +$(top_builddir)lib/libcrypt.so: $(libcrypt_OUT)/libcrypt.oS | $(libc.depend) $(call linkm.so,$(libcrypt_FULL_NAME),$(MAJOR_VERSION)) endif diff --git a/libm/Makefile.in b/libm/Makefile.in index 1a8f82710..0e76408ab 100644 --- a/libm/Makefile.in +++ b/libm/Makefile.in @@ -152,13 +152,13 @@ objclean-y += libm_clean ifeq ($(DOMULTI),n) ifeq ($(DOPIC),y) -$(top_builddir)lib/libm.so: $(top_builddir)lib/libm.a $(libc) +$(top_builddir)lib/libm.so: $(top_builddir)lib/libm.a $(libc.depend) else -$(top_builddir)lib/libm.so: $(libm_OUT)/libm_so.a $(libc) +$(top_builddir)lib/libm.so: $(libm_OUT)/libm_so.a $(libc.depend) endif $(call link.so,$(libm_FULL_NAME),$(MAJOR_VERSION)) else -$(top_builddir)lib/libm.so: $(libm_OUT)/libm.oS | $(libc) +$(top_builddir)lib/libm.so: $(libm_OUT)/libm.oS | $(libc.depend) $(call linkm.so,$(libm_FULL_NAME),$(MAJOR_VERSION)) endif diff --git a/libnsl/Makefile.in b/libnsl/Makefile.in index 15b07ee7b..4bc6162f8 100644 --- a/libnsl/Makefile.in +++ b/libnsl/Makefile.in @@ -31,9 +31,9 @@ lib-so-y += $(top_builddir)lib/libnsl.so objclean-y += libnsl_clean ifeq ($(DOPIC),y) -$(top_builddir)lib/libnsl.so: $(top_builddir)lib/libnsl.a $(libc) +$(top_builddir)lib/libnsl.so: $(top_builddir)lib/libnsl.a $(libc.depend) else -$(top_builddir)lib/libnsl.so: $(libnsl_OUT)/libnsl_so.a $(libc) +$(top_builddir)lib/libnsl.so: $(libnsl_OUT)/libnsl_so.a $(libc.depend) endif $(call link.so,$(libnsl_FULL_NAME),$(MAJOR_VERSION)) diff --git a/libpthread/linuxthreads.old/Makefile.in b/libpthread/linuxthreads.old/Makefile.in index 6b1232c32..9d05383d3 100644 --- a/libpthread/linuxthreads.old/Makefile.in +++ b/libpthread/linuxthreads.old/Makefile.in @@ -76,10 +76,10 @@ headers-$(UCLIBC_HAS_THREADS) += linuxthreads_headers headers_clean-y += linuxthreads_headers_clean #ifeq ($(DOMULTI),n) -$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc) +$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc.depend) $(call link.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION)) #else -#$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread.oS | $(libc) +#$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread.oS | $(libc.depend) # $(call linkm.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION)) #endif diff --git a/libpthread/linuxthreads.old_db/Makefile.in b/libpthread/linuxthreads.old_db/Makefile.in index f0aa61f13..b259b631b 100644 --- a/libpthread/linuxthreads.old_db/Makefile.in +++ b/libpthread/linuxthreads.old_db/Makefile.in @@ -39,13 +39,13 @@ headers_clean-y += linuxthreads_db_headers_clean #ifeq ($(DOMULTI),n) ifeq ($(DOPIC),y) -$(top_builddir)lib/libthread_db.so: $(top_builddir)lib/libthread_db.a $(libc) +$(top_builddir)lib/libthread_db.so: $(top_builddir)lib/libthread_db.a $(libc.depend) else -$(top_builddir)lib/libthread_db.so: $(libthread_db_OUT)/libthread_db_so.a $(libc) +$(top_builddir)lib/libthread_db.so: $(libthread_db_OUT)/libthread_db_so.a $(libc.depend) endif $(call link.so,$(libthread_db_FULL_NAME),1) #else -#$(top_builddir)lib/libthread_db.so: $(libthread_db_OUT)/libthread_db.oS | $(libc) +#$(top_builddir)lib/libthread_db.so: $(libthread_db_OUT)/libthread_db.oS | $(libc.depend) # $(call linkm.so,$(libthread_db_FULL_NAME),1) #endif diff --git a/libpthread/linuxthreads/Makefile.in b/libpthread/linuxthreads/Makefile.in index 459be19c5..e786e176e 100644 --- a/libpthread/linuxthreads/Makefile.in +++ b/libpthread/linuxthreads/Makefile.in @@ -86,10 +86,10 @@ headers-$(UCLIBC_HAS_THREADS) += linuxthreads_headers headers_clean-y += linuxthreads_headers_clean #ifeq ($(DOMULTI),n) -$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc) $(top_builddir)lib/libpthread_nonshared.a +$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc.depend) $(top_builddir)lib/libpthread_nonshared.a $(call link.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION)) #else -#$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread.oS | $(libc) $(top_builddir)lib/libpthread_nonshared.a +#$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread.oS | $(libc.depend) $(top_builddir)lib/libpthread_nonshared.a # $(call linkm.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION)) #endif $(Q)$(RM) $@ diff --git a/libpthread/linuxthreads_db/Makefile.in b/libpthread/linuxthreads_db/Makefile.in index 87f20e208..56c2d112f 100644 --- a/libpthread/linuxthreads_db/Makefile.in +++ b/libpthread/linuxthreads_db/Makefile.in @@ -39,13 +39,13 @@ headers_clean-y += linuxthreads_db_headers_clean #ifeq ($(DOMULTI),n) ifeq ($(DOPIC),y) -$(top_builddir)lib/libthread_db.so: $(top_builddir)lib/libthread_db.a $(libc) +$(top_builddir)lib/libthread_db.so: $(top_builddir)lib/libthread_db.a $(libc.depend) else -$(top_builddir)lib/libthread_db.so: $(libthread_db_OUT)/libthread_db_so.a $(libc) +$(top_builddir)lib/libthread_db.so: $(libthread_db_OUT)/libthread_db_so.a $(libc.depend) endif $(call link.so,$(libthread_db_FULL_NAME),1) #else -#$(top_builddir)lib/libthread_db.so: $(libthread_db_OUT)/libthread_db.oS | $(libc) +#$(top_builddir)lib/libthread_db.so: $(libthread_db_OUT)/libthread_db.oS | $(libc.depend) # $(call linkm.so,$(libthread_db_FULL_NAME),1) #endif diff --git a/libresolv/Makefile.in b/libresolv/Makefile.in index 4afff4cdb..f0c9a980a 100644 --- a/libresolv/Makefile.in +++ b/libresolv/Makefile.in @@ -31,9 +31,9 @@ lib-so-y += $(top_builddir)lib/libresolv.so objclean-y += libresolv_clean ifeq ($(DOPIC),y) -$(top_builddir)lib/libresolv.so: $(top_builddir)lib/libresolv.a $(libc) +$(top_builddir)lib/libresolv.so: $(top_builddir)lib/libresolv.a $(libc.depend) else -$(top_builddir)lib/libresolv.so: $(libresolv_OUT)/libresolv_so.a $(libc) +$(top_builddir)lib/libresolv.so: $(libresolv_OUT)/libresolv_so.a $(libc.depend) endif $(call link.so,$(libresolv_FULL_NAME),$(MAJOR_VERSION)) diff --git a/librt/Makefile.in b/librt/Makefile.in index d8aa87f40..f6433d30b 100644 --- a/librt/Makefile.in +++ b/librt/Makefile.in @@ -31,9 +31,9 @@ lib-so-y += $(top_builddir)lib/librt.so objclean-y += librt_clean ifeq ($(DOPIC),y) -$(top_builddir)lib/librt.so: $(top_builddir)lib/librt.a $(libc) +$(top_builddir)lib/librt.so: $(top_builddir)lib/librt.a $(libc.depend) else -$(top_builddir)lib/librt.so: $(librt_OUT)/librt_so.a $(libc) +$(top_builddir)lib/librt.so: $(librt_OUT)/librt_so.a $(libc.depend) endif $(call link.so,$(librt_FULL_NAME),$(MAJOR_VERSION)) diff --git a/libutil/Makefile.in b/libutil/Makefile.in index c9f94c1f6..a1c0beefc 100644 --- a/libutil/Makefile.in +++ b/libutil/Makefile.in @@ -35,13 +35,13 @@ objclean-y += libutil_clean ifeq ($(DOMULTI),n) ifeq ($(DOPIC),y) -$(top_builddir)lib/libutil.so: $(top_builddir)lib/libutil.a $(libc) +$(top_builddir)lib/libutil.so: $(top_builddir)lib/libutil.a $(libc.depend) else -$(top_builddir)lib/libutil.so: $(libutil_OUT)/libutil_so.a $(libc) +$(top_builddir)lib/libutil.so: $(libutil_OUT)/libutil_so.a $(libc.depend) endif $(call link.so,$(libutil_FULL_NAME),$(MAJOR_VERSION)) else -$(top_builddir)lib/libutil.so: $(libutil_OUT)/libutil.oS | $(libc) +$(top_builddir)lib/libutil.so: $(libutil_OUT)/libutil.oS | $(libc.depend) $(call linkm.so,$(libutil_FULL_NAME),$(MAJOR_VERSION)) endif |