svn commit: trunk/uClibc: ldso/libdl libc libcrypt libm libnsl li etc...
bernds at uclibc.org
bernds at uclibc.org
Sun Jun 1 16:49:23 UTC 2008
Author: bernds
Date: 2008-06-01 09:49:23 -0700 (Sun, 01 Jun 2008)
New Revision: 22161
Log:
A slight improvement over my previous commit which ensured we always rebuild
libc when one of the source files changes.
Since there are more places which want to depend on $(libc), fix them all to
use a new variable $(libc.depend), which contains the filename for which we
have a rule.
Modified:
trunk/uClibc/Rules.mak
trunk/uClibc/ldso/libdl/Makefile.in
trunk/uClibc/libc/Makefile.in
trunk/uClibc/libcrypt/Makefile.in
trunk/uClibc/libm/Makefile.in
trunk/uClibc/libnsl/Makefile.in
trunk/uClibc/libpthread/linuxthreads.old/Makefile.in
trunk/uClibc/libpthread/linuxthreads.old_db/Makefile.in
trunk/uClibc/libpthread/linuxthreads/Makefile.in
trunk/uClibc/libpthread/linuxthreads_db/Makefile.in
trunk/uClibc/libresolv/Makefile.in
trunk/uClibc/librt/Makefile.in
trunk/uClibc/libutil/Makefile.in
Changeset:
Modified: trunk/uClibc/Rules.mak
===================================================================
--- trunk/uClibc/Rules.mak 2008-06-01 16:44:52 UTC (rev 22160)
+++ trunk/uClibc/Rules.mak 2008-06-01 16:49:23 UTC (rev 22161)
@@ -98,6 +98,7 @@
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
Modified: trunk/uClibc/ldso/libdl/Makefile.in
===================================================================
--- trunk/uClibc/ldso/libdl/Makefile.in 2008-06-01 16:44:52 UTC (rev 22160)
+++ trunk/uClibc/ldso/libdl/Makefile.in 2008-06-01 16:49:23 UTC (rev 22161)
@@ -41,7 +41,7 @@
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)
Modified: trunk/uClibc/libc/Makefile.in
===================================================================
--- trunk/uClibc/libc/Makefile.in 2008-06-01 16:44:52 UTC (rev 22160)
+++ trunk/uClibc/libc/Makefile.in 2008-06-01 16:49:23 UTC (rev 22161)
@@ -51,16 +51,16 @@
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
Modified: trunk/uClibc/libcrypt/Makefile.in
===================================================================
--- trunk/uClibc/libcrypt/Makefile.in 2008-06-01 16:44:52 UTC (rev 22160)
+++ trunk/uClibc/libcrypt/Makefile.in 2008-06-01 16:49:23 UTC (rev 22161)
@@ -32,13 +32,13 @@
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
Modified: trunk/uClibc/libm/Makefile.in
===================================================================
--- trunk/uClibc/libm/Makefile.in 2008-06-01 16:44:52 UTC (rev 22160)
+++ trunk/uClibc/libm/Makefile.in 2008-06-01 16:49:23 UTC (rev 22161)
@@ -152,13 +152,13 @@
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
Modified: trunk/uClibc/libnsl/Makefile.in
===================================================================
--- trunk/uClibc/libnsl/Makefile.in 2008-06-01 16:44:52 UTC (rev 22160)
+++ trunk/uClibc/libnsl/Makefile.in 2008-06-01 16:49:23 UTC (rev 22161)
@@ -31,9 +31,9 @@
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))
Modified: trunk/uClibc/libpthread/linuxthreads/Makefile.in
===================================================================
--- trunk/uClibc/libpthread/linuxthreads/Makefile.in 2008-06-01 16:44:52 UTC (rev 22160)
+++ trunk/uClibc/libpthread/linuxthreads/Makefile.in 2008-06-01 16:49:23 UTC (rev 22161)
@@ -86,10 +86,10 @@
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) $@
Modified: trunk/uClibc/libpthread/linuxthreads.old/Makefile.in
===================================================================
--- trunk/uClibc/libpthread/linuxthreads.old/Makefile.in 2008-06-01 16:44:52 UTC (rev 22160)
+++ trunk/uClibc/libpthread/linuxthreads.old/Makefile.in 2008-06-01 16:49:23 UTC (rev 22161)
@@ -76,10 +76,10 @@
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
Modified: trunk/uClibc/libpthread/linuxthreads.old_db/Makefile.in
===================================================================
--- trunk/uClibc/libpthread/linuxthreads.old_db/Makefile.in 2008-06-01 16:44:52 UTC (rev 22160)
+++ trunk/uClibc/libpthread/linuxthreads.old_db/Makefile.in 2008-06-01 16:49:23 UTC (rev 22161)
@@ -39,13 +39,13 @@
#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
Modified: trunk/uClibc/libpthread/linuxthreads_db/Makefile.in
===================================================================
--- trunk/uClibc/libpthread/linuxthreads_db/Makefile.in 2008-06-01 16:44:52 UTC (rev 22160)
+++ trunk/uClibc/libpthread/linuxthreads_db/Makefile.in 2008-06-01 16:49:23 UTC (rev 22161)
@@ -39,13 +39,13 @@
#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
Modified: trunk/uClibc/libresolv/Makefile.in
===================================================================
--- trunk/uClibc/libresolv/Makefile.in 2008-06-01 16:44:52 UTC (rev 22160)
+++ trunk/uClibc/libresolv/Makefile.in 2008-06-01 16:49:23 UTC (rev 22161)
@@ -31,9 +31,9 @@
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))
Modified: trunk/uClibc/librt/Makefile.in
===================================================================
--- trunk/uClibc/librt/Makefile.in 2008-06-01 16:44:52 UTC (rev 22160)
+++ trunk/uClibc/librt/Makefile.in 2008-06-01 16:49:23 UTC (rev 22161)
@@ -31,9 +31,9 @@
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))
Modified: trunk/uClibc/libutil/Makefile.in
===================================================================
--- trunk/uClibc/libutil/Makefile.in 2008-06-01 16:44:52 UTC (rev 22160)
+++ trunk/uClibc/libutil/Makefile.in 2008-06-01 16:49:23 UTC (rev 22161)
@@ -35,13 +35,13 @@
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
More information about the uClibc-cvs
mailing list