svn commit: trunk/busybox: miscutils

[vodz at busybox.net]

Author: vodz
Date: 2005-09-21 00:49:34 -0700 (Wed, 21 Sep 2005)
New Revision: 11533

Log:
moved include/bbconfigopts.h from miscutils to to top Makefile before generate .depend. Remove allyesconfig build problem, noticed by Bernhard Fischer

Modified:
   trunk/busybox/Makefile
   trunk/busybox/miscutils/Makefile.in


Changeset:
Modified: trunk/busybox/Makefile
===================================================================
--- trunk/busybox/Makefile	2005-09-21 05:14:02 UTC (rev 11532)
+++ trunk/busybox/Makefile	2005-09-21 07:49:34 UTC (rev 11533)
@@ -184,7 +184,16 @@
 	$(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 > $@

Modified: trunk/busybox/miscutils/Makefile.in
===================================================================
--- trunk/busybox/miscutils/Makefile.in	2005-09-21 05:14:02 UTC (rev 11532)
+++ trunk/busybox/miscutils/Makefile.in	2005-09-21 07:49:34 UTC (rev 11533)
@@ -55,9 +55,6 @@
 $(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 $@ $<