corect build bbconfig applet, Thanks, Bernhard Fischer

This commit is contained in:
"Vladimir N. Oleynik" 2005-09-19 16:18:46 +00:00
parent 9bfb2fc922
commit 4a5d95d3fb
2 changed files with 9 additions and 8 deletions

View File

@ -70,7 +70,7 @@ $(filter-out _all,$(MAKECMDGOALS)) _all: $(KBUILD_OUTPUT)/Rules.mak $(KBUILD_OUT
$(MAKE) -C $(KBUILD_OUTPUT) \ $(MAKE) -C $(KBUILD_OUTPUT) \
top_srcdir=$(CURDIR) \ top_srcdir=$(CURDIR) \
top_builddir=$(KBUILD_OUTPUT) \ top_builddir=$(KBUILD_OUTPUT) \
TOPDIR=$(KBUILD_OUTPUT) \ TOPDIR=$(KBUILD_OUTPUT) \
KBUILD_SRC=$(CURDIR) \ KBUILD_SRC=$(CURDIR) \
-f $(CURDIR)/Makefile $@ -f $(CURDIR)/Makefile $@
@ -100,7 +100,7 @@ ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
all: busybox busybox.links doc all: busybox busybox.links doc
all_tree: $(ALL_MAKEFILES) all_tree: $(ALL_MAKEFILES)
$(ALL_MAKEFILES): %/Makefile: $(top_srcdir)/%/Makefile $(ALL_MAKEFILES): %/Makefile: $(top_srcdir)/%/Makefile
[ -d $(@D) ] || mkdir -p $(@D); cp $< $@ [ -d $(@D) ] || mkdir -p $(@D); cp $< $@
@ -202,10 +202,6 @@ include/bb_config.h: include/config.h
< $< >> $@ < $< >> $@
@echo "#endif" >> $@ @echo "#endif" >> $@
include/bbconfigopts.h: .config
@[ -d $(@D) ] || mkdir -v $(@D)
$(top_srcdir)/scripts/config/mkconfigs >include/bbconfigopts.h
finished2: finished2:
$(SECHO) $(SECHO)
$(SECHO) Finished installing... $(SECHO) Finished installing...

View File

@ -33,9 +33,9 @@ MISCUTILS-$(CONFIG_DEVFSD) += devfsd.o
MISCUTILS-$(CONFIG_EJECT) += eject.o MISCUTILS-$(CONFIG_EJECT) += eject.o
MISCUTILS-$(CONFIG_HDPARM) += hdparm.o MISCUTILS-$(CONFIG_HDPARM) += hdparm.o
MISCUTILS-$(CONFIG_LAST) += last.o MISCUTILS-$(CONFIG_LAST) += last.o
MISCUTILS-${CONFIG_LESS} += less.o MISCUTILS-${CONFIG_LESS} += less.o
MISCUTILS-$(CONFIG_MAKEDEVS) += makedevs.o MISCUTILS-$(CONFIG_MAKEDEVS) += makedevs.o
MISCUTILS-$(CONFIG_MOUNTPOINT) += mountpoint.o MISCUTILS-$(CONFIG_MOUNTPOINT) += mountpoint.o
MISCUTILS-$(CONFIG_MT) += mt.o MISCUTILS-$(CONFIG_MT) += mt.o
MISCUTILS-$(CONFIG_RX) += rx.o MISCUTILS-$(CONFIG_RX) += rx.o
MISCUTILS-$(CONFIG_SETSID) += setsid.o MISCUTILS-$(CONFIG_SETSID) += setsid.o
@ -55,6 +55,11 @@ endif
$(MISCUTILS_DIR)$(MISCUTILS_AR): $(patsubst %,$(MISCUTILS_DIR)%, $(MISCUTILS-y)) $(MISCUTILS_DIR)$(MISCUTILS_AR): $(patsubst %,$(MISCUTILS_DIR)%, $(MISCUTILS-y))
$(AR) $(ARFLAGS) $@ $(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 $(MISCUTILS_DIR)%.o: $(srcdir)/%.c
$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<