diff options
| author | "Vladimir N. Oleynik" <dzo@simtreas.ru> | 2005-09-19 16:18:46 +0000 |
|---|---|---|
| committer | "Vladimir N. Oleynik" <dzo@simtreas.ru> | 2005-09-19 16:18:46 +0000 |
| commit | 4a5d95d3fb6754b7e3ef22f7f05478750084e388 (patch) | |
| tree | 5498716a9f4efadb707a240cddc980ba18835e9e | |
| parent | 9bfb2fc9225be23b7625cedd565358977350a22d (diff) | |
| download | busybox-4a5d95d3fb6754b7e3ef22f7f05478750084e388.tar.gz | |
corect build bbconfig applet, Thanks, Bernhard Fischer
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | miscutils/Makefile.in | 9 |
2 files changed, 9 insertions, 8 deletions
@@ -70,7 +70,7 @@ $(filter-out _all,$(MAKECMDGOALS)) _all: $(KBUILD_OUTPUT)/Rules.mak $(KBUILD_OUT $(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 @@ ifeq ($(strip $(HAVE_DOT_CONFIG)),y) 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 @@ include/bb_config.h: include/config.h < $< >> $@ @echo "#endif" >> $@ -include/bbconfigopts.h: .config - @[ -d $(@D) ] || mkdir -v $(@D) - $(top_srcdir)/scripts/config/mkconfigs >include/bbconfigopts.h - finished2: $(SECHO) $(SECHO) Finished installing... diff --git a/miscutils/Makefile.in b/miscutils/Makefile.in index ba8069c83..7885c1638 100644 --- a/miscutils/Makefile.in +++ b/miscutils/Makefile.in @@ -33,9 +33,9 @@ MISCUTILS-$(CONFIG_DEVFSD) += devfsd.o 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 @@ endif $(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 $@ $< |