summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author"Vladimir N. Oleynik"2005-09-21 07:49:34 +0000
committer"Vladimir N. Oleynik"2005-09-21 07:49:34 +0000
commitcef737f03817d8e5fafcc48e7ffda479e0e25f87 (patch)
treeb8bac0a344e294c9604f08f87faa39a2c26f7134
parentc5280e8885a44c7874d6260302be62fcd534b7a0 (diff)
downloadbusybox-cef737f03817d8e5fafcc48e7ffda479e0e25f87.zip
busybox-cef737f03817d8e5fafcc48e7ffda479e0e25f87.tar.gz
moved include/bbconfigopts.h from miscutils to to top Makefile before generate .depend. Remove allyesconfig build problem, noticed by Bernhard Fischer
-rw-r--r--Makefile11
-rw-r--r--miscutils/Makefile.in3
2 files changed, 10 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index ac60951..b3f9982 100644
--- a/Makefile
+++ b/Makefile
@@ -184,7 +184,16 @@ scripts/bb_mkdep: $(top_srcdir)/scripts/bb_mkdep.c
$(HOSTCC) $(HOSTCFLAGS) -o $@ $<
depend dep: .depend
-.depend: scripts/bb_mkdep include/config.h include/bb_config.h
+
+DEP_INCLUDES=include/config.h include/bb_config.h
+ifeq ($(strip $(CONFIG_BBCONFIG)),y)
+DEP_INCLUDES += include/bbconfigopts.h
+
+include/bbconfigopts.h: .config
+ scripts/config/mkconfigs > $@
+endif
+
+.depend: scripts/bb_mkdep $(DEP_INCLUDES)
@rm -f .depend
@mkdir -p include/config
scripts/bb_mkdep -c include/config.h -c include/bb_config.h > $@
diff --git a/miscutils/Makefile.in b/miscutils/Makefile.in
index 13d20f4..2db5111 100644
--- a/miscutils/Makefile.in
+++ b/miscutils/Makefile.in
@@ -55,9 +55,6 @@ endif
$(MISCUTILS_DIR)$(MISCUTILS_AR): $(patsubst %,$(MISCUTILS_DIR)%, $(MISCUTILS-y))
$(AR) $(ARFLAGS) $@ $(patsubst %,$(MISCUTILS_DIR)%, $(MISCUTILS-y))
-$(top_builddir)/include/bbconfigopts.h: $(top_builddir)/.config
- $(top_builddir)/scripts/config/mkconfigs > $(top_builddir)/include/bbconfigopts.h
-
$(MISCUTILS_DIR)%.o: $(srcdir)/%.c
$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<