diff options
author | vodz <vodz@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2005-09-19 16:18:46 +0000 |
---|---|---|
committer | vodz <vodz@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2005-09-19 16:18:46 +0000 |
commit | 151b4723e77c0f8ff858a969713b3c04da2fa9b5 (patch) | |
tree | 5498716a9f4efadb707a240cddc980ba18835e9e | |
parent | df1194ec0f7bdb696bc2cd8ec2996a402713f994 (diff) | |
download | busybox-w32-151b4723e77c0f8ff858a969713b3c04da2fa9b5.tar.gz busybox-w32-151b4723e77c0f8ff858a969713b3c04da2fa9b5.tar.bz2 busybox-w32-151b4723e77c0f8ff858a969713b3c04da2fa9b5.zip |
corect build bbconfig applet, Thanks, Bernhard Fischer
git-svn-id: svn://busybox.net/trunk/busybox@11505 69ca8d6d-28ef-0310-b511-8ec308f3f277
-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 | |||
70 | $(MAKE) -C $(KBUILD_OUTPUT) \ | 70 | $(MAKE) -C $(KBUILD_OUTPUT) \ |
71 | top_srcdir=$(CURDIR) \ | 71 | top_srcdir=$(CURDIR) \ |
72 | top_builddir=$(KBUILD_OUTPUT) \ | 72 | top_builddir=$(KBUILD_OUTPUT) \ |
73 | TOPDIR=$(KBUILD_OUTPUT) \ | 73 | TOPDIR=$(KBUILD_OUTPUT) \ |
74 | KBUILD_SRC=$(CURDIR) \ | 74 | KBUILD_SRC=$(CURDIR) \ |
75 | -f $(CURDIR)/Makefile $@ | 75 | -f $(CURDIR)/Makefile $@ |
76 | 76 | ||
@@ -100,7 +100,7 @@ ifeq ($(strip $(HAVE_DOT_CONFIG)),y) | |||
100 | 100 | ||
101 | all: busybox busybox.links doc | 101 | all: busybox busybox.links doc |
102 | 102 | ||
103 | all_tree: $(ALL_MAKEFILES) | 103 | all_tree: $(ALL_MAKEFILES) |
104 | 104 | ||
105 | $(ALL_MAKEFILES): %/Makefile: $(top_srcdir)/%/Makefile | 105 | $(ALL_MAKEFILES): %/Makefile: $(top_srcdir)/%/Makefile |
106 | [ -d $(@D) ] || mkdir -p $(@D); cp $< $@ | 106 | [ -d $(@D) ] || mkdir -p $(@D); cp $< $@ |
@@ -202,10 +202,6 @@ include/bb_config.h: include/config.h | |||
202 | < $< >> $@ | 202 | < $< >> $@ |
203 | @echo "#endif" >> $@ | 203 | @echo "#endif" >> $@ |
204 | 204 | ||
205 | include/bbconfigopts.h: .config | ||
206 | @[ -d $(@D) ] || mkdir -v $(@D) | ||
207 | $(top_srcdir)/scripts/config/mkconfigs >include/bbconfigopts.h | ||
208 | |||
209 | finished2: | 205 | finished2: |
210 | $(SECHO) | 206 | $(SECHO) |
211 | $(SECHO) Finished installing... | 207 | $(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 | |||
33 | MISCUTILS-$(CONFIG_EJECT) += eject.o | 33 | MISCUTILS-$(CONFIG_EJECT) += eject.o |
34 | MISCUTILS-$(CONFIG_HDPARM) += hdparm.o | 34 | MISCUTILS-$(CONFIG_HDPARM) += hdparm.o |
35 | MISCUTILS-$(CONFIG_LAST) += last.o | 35 | MISCUTILS-$(CONFIG_LAST) += last.o |
36 | MISCUTILS-${CONFIG_LESS} += less.o | 36 | MISCUTILS-${CONFIG_LESS} += less.o |
37 | MISCUTILS-$(CONFIG_MAKEDEVS) += makedevs.o | 37 | MISCUTILS-$(CONFIG_MAKEDEVS) += makedevs.o |
38 | MISCUTILS-$(CONFIG_MOUNTPOINT) += mountpoint.o | 38 | MISCUTILS-$(CONFIG_MOUNTPOINT) += mountpoint.o |
39 | MISCUTILS-$(CONFIG_MT) += mt.o | 39 | MISCUTILS-$(CONFIG_MT) += mt.o |
40 | MISCUTILS-$(CONFIG_RX) += rx.o | 40 | MISCUTILS-$(CONFIG_RX) += rx.o |
41 | MISCUTILS-$(CONFIG_SETSID) += setsid.o | 41 | MISCUTILS-$(CONFIG_SETSID) += setsid.o |
@@ -55,6 +55,11 @@ endif | |||
55 | $(MISCUTILS_DIR)$(MISCUTILS_AR): $(patsubst %,$(MISCUTILS_DIR)%, $(MISCUTILS-y)) | 55 | $(MISCUTILS_DIR)$(MISCUTILS_AR): $(patsubst %,$(MISCUTILS_DIR)%, $(MISCUTILS-y)) |
56 | $(AR) $(ARFLAGS) $@ $(patsubst %,$(MISCUTILS_DIR)%, $(MISCUTILS-y)) | 56 | $(AR) $(ARFLAGS) $@ $(patsubst %,$(MISCUTILS_DIR)%, $(MISCUTILS-y)) |
57 | 57 | ||
58 | include/bbconfigopts.h: $(top_builddir)/.config | ||
59 | $(top_builddir)/scripts/config/mkconfigs >include/bbconfigopts.h | ||
60 | |||
61 | $(MISCUTILS_DIR)bbconfig.o: include/bbconfigopts.h | ||
62 | |||
58 | $(MISCUTILS_DIR)%.o: $(srcdir)/%.c | 63 | $(MISCUTILS_DIR)%.o: $(srcdir)/%.c |
59 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< | 64 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< |
60 | 65 | ||