summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-02-18 03:13:07 +0000
committerMike Frysinger <vapier@gentoo.org>2006-02-18 03:13:07 +0000
commit94c41e72b5fb8e961eaacf23ec604a7fb7b87ebb (patch)
treef875623f638b7a0c14859da7ba3ce609289c43d2
parent85b6ebca5cef107dfafa9150605aaae1f8c51827 (diff)
touchup headers target somemore so building in subdirs works nicely again
-rw-r--r--Makefile.in6
-rw-r--r--Makerules6
-rw-r--r--Rules.mak1
3 files changed, 6 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in
index d6a9fd154..33424af65 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,6 +13,7 @@ noconfig_targets := menuconfig config oldconfig randconfig \
release dist tags
include $(top_builddir)Rules.mak
+sub_headers := headers
ifeq ($(HAVE_DOT_CONFIG),y)
@@ -267,10 +268,7 @@ extra/config/conf extra/config/mconf:
$(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
diff --git a/Makerules b/Makerules
index 0dcdae39c..a7195681b 100644
--- a/Makerules
+++ b/Makerules
@@ -29,7 +29,7 @@ all_objs: $(sort $(shared_objs) $(ar_objs))
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 @@ CFLAGS-.oS+=$(PICFLAG) -DSHARED
%.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 @@ $(libc):
@cd $(top_builddir); $(MAKE) lib/$(patsubst %.$(MAJOR_VERSION),%,$(notdir $@))
$(headers_dep):
- @cd $(top_builddir); $(MAKE) headers
+ $(Q)cd $(top_builddir); $(MAKE) headers
CRT := crt1
diff --git a/Rules.mak b/Rules.mak
index 212b43a2d..591178b38 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -85,6 +85,7 @@ libc := $(top_builddir)lib/$(SHARED_MAJORNAME)
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)=)