svn commit: trunk/busybox: miscutils

vodz at busybox.net vodz at busybox.net
Mon Sep 19 16:18:48 UTC 2005


Author: vodz
Date: 2005-09-19 09:18:46 -0700 (Mon, 19 Sep 2005)
New Revision: 11505

Log:
corect build bbconfig applet, Thanks, Bernhard Fischer

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


Changeset:
Modified: trunk/busybox/Makefile
===================================================================
--- trunk/busybox/Makefile	2005-09-19 14:25:55 UTC (rev 11504)
+++ trunk/busybox/Makefile	2005-09-19 16:18:46 UTC (rev 11505)
@@ -70,7 +70,7 @@
 	$(MAKE) -C $(KBUILD_OUTPUT) \
 	top_srcdir=$(CURDIR) \
 	top_builddir=$(KBUILD_OUTPUT) \
-	TOPDIR=$(KBUILD_OUTPUT)	\
+	TOPDIR=$(KBUILD_OUTPUT) \
 	KBUILD_SRC=$(CURDIR) \
 	-f $(CURDIR)/Makefile $@
 
@@ -100,7 +100,7 @@
 
 all: busybox busybox.links doc
 
-all_tree:	$(ALL_MAKEFILES)
+all_tree:       $(ALL_MAKEFILES)
 
 $(ALL_MAKEFILES): %/Makefile: $(top_srcdir)/%/Makefile
 	[ -d $(@D) ] || mkdir -p $(@D); cp $< $@
@@ -202,10 +202,6 @@
 		< $< >> $@
 	@echo "#endif" >> $@
 
-include/bbconfigopts.h: .config
-	@[ -d $(@D) ] || mkdir -v $(@D)
-	$(top_srcdir)/scripts/config/mkconfigs >include/bbconfigopts.h
-
 finished2:
 	$(SECHO)
 	$(SECHO) Finished installing...

Modified: trunk/busybox/miscutils/Makefile.in
===================================================================
--- trunk/busybox/miscutils/Makefile.in	2005-09-19 14:25:55 UTC (rev 11504)
+++ trunk/busybox/miscutils/Makefile.in	2005-09-19 16:18:46 UTC (rev 11505)
@@ -33,9 +33,9 @@
 MISCUTILS-$(CONFIG_EJECT)       += eject.o
 MISCUTILS-$(CONFIG_HDPARM)      += hdparm.o
 MISCUTILS-$(CONFIG_LAST)        += last.o
-MISCUTILS-${CONFIG_LESS}	+= less.o
+MISCUTILS-${CONFIG_LESS}        += less.o
 MISCUTILS-$(CONFIG_MAKEDEVS)    += makedevs.o
-MISCUTILS-$(CONFIG_MOUNTPOINT)	+= mountpoint.o
+MISCUTILS-$(CONFIG_MOUNTPOINT)  += mountpoint.o
 MISCUTILS-$(CONFIG_MT)          += mt.o
 MISCUTILS-$(CONFIG_RX)          += rx.o
 MISCUTILS-$(CONFIG_SETSID)      += setsid.o
@@ -55,6 +55,11 @@
 $(MISCUTILS_DIR)$(MISCUTILS_AR): $(patsubst %,$(MISCUTILS_DIR)%, $(MISCUTILS-y))
 	$(AR) $(ARFLAGS) $@ $(patsubst %,$(MISCUTILS_DIR)%, $(MISCUTILS-y))
 
+include/bbconfigopts.h: $(top_builddir)/.config
+	$(top_builddir)/scripts/config/mkconfigs >include/bbconfigopts.h
+
+$(MISCUTILS_DIR)bbconfig.o: include/bbconfigopts.h
+
 $(MISCUTILS_DIR)%.o: $(srcdir)/%.c
 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
 




More information about the busybox-cvs mailing list