svn commit: trunk/uClibc
vapier at uclibc.org
vapier at uclibc.org
Sat Feb 18 03:13:08 UTC 2006
Author: vapier
Date: 2006-02-17 19:13:07 -0800 (Fri, 17 Feb 2006)
New Revision: 14102
Log:
touchup headers target somemore so building in subdirs works nicely again
Modified:
trunk/uClibc/Makefile.in
trunk/uClibc/Makerules
trunk/uClibc/Rules.mak
Changeset:
Modified: trunk/uClibc/Makefile.in
===================================================================
--- trunk/uClibc/Makefile.in 2006-02-18 03:12:04 UTC (rev 14101)
+++ trunk/uClibc/Makefile.in 2006-02-18 03:13:07 UTC (rev 14102)
@@ -13,6 +13,7 @@
release dist tags
include $(top_builddir)Rules.mak
+sub_headers := headers
ifeq ($(HAVE_DOT_CONFIG),y)
@@ -267,10 +268,7 @@
$(MAKE) -C extra/config $(notdir $@)
menuconfig: extra/config/mconf
- $(RM) -r include/bits
- $(INSTALL) -d include/bits
- @./extra/config/mconf extra/Configs/Config.in
- $(MAKE) headers
+ $(Q)./extra/config/mconf extra/Configs/Config.in
config: extra/config/conf
$(RM) -r include/bits
Modified: trunk/uClibc/Makerules
===================================================================
--- trunk/uClibc/Makerules 2006-02-18 03:12:04 UTC (rev 14101)
+++ trunk/uClibc/Makerules 2006-02-18 03:13:07 UTC (rev 14102)
@@ -29,7 +29,7 @@
else
all_objs: $(ar_objs)
endif
-$(shared_objs) $(ar_objs): | headers
+$(shared_objs) $(ar_objs): | $(sub_headers)
headers-y: $(headers-y)
@true
@@ -162,7 +162,7 @@
%.s: %.c ; $(compile.s)
%.s: %.S ; $(compile.s)
-$(top_builddir)lib/interp.c: | headers
+$(top_builddir)lib/interp.c: | $(sub_headers)
$(Q)$(INSTALL) -d $(dir $@)
$(Q)echo "/* Force shared libraries to know about the correct library loader */" > $@
$(Q)echo "#include <features.h>" >> $@
@@ -180,7 +180,7 @@
@cd $(top_builddir); $(MAKE) lib/$(patsubst %.$(MAJOR_VERSION),%,$(notdir $@))
$(headers_dep):
- @cd $(top_builddir); $(MAKE) headers
+ $(Q)cd $(top_builddir); $(MAKE) headers
CRT := crt1
Modified: trunk/uClibc/Rules.mak
===================================================================
--- trunk/uClibc/Rules.mak 2006-02-18 03:12:04 UTC (rev 14101)
+++ trunk/uClibc/Rules.mak 2006-02-18 03:13:07 UTC (rev 14102)
@@ -85,6 +85,7 @@
interp := $(top_builddir)lib/interp.os
ldso := $(top_builddir)lib/$(UCLIBC_LDSO)
headers_dep := $(top_builddir)include/bits/sysnum.h
+sub_headers := $(headers_dep)
#LIBS :=$(interp) -L$(top_builddir)lib -lc
LIBS := $(interp) -L$(top_builddir)lib $(libc:.$(MAJOR_VERSION)=)
More information about the uClibc-cvs
mailing list