aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile8
-rw-r--r--miscutils/Makefile.in9
2 files changed, 9 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index c8b6d79d2..bf2c1d160 100644
--- a/Makefile
+++ b/Makefile
@@ -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
101all: busybox busybox.links doc 101all: busybox busybox.links doc
102 102
103all_tree: $(ALL_MAKEFILES) 103all_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
205include/bbconfigopts.h: .config
206 @[ -d $(@D) ] || mkdir -v $(@D)
207 $(top_srcdir)/scripts/config/mkconfigs >include/bbconfigopts.h
208
209finished2: 205finished2:
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
33MISCUTILS-$(CONFIG_EJECT) += eject.o 33MISCUTILS-$(CONFIG_EJECT) += eject.o
34MISCUTILS-$(CONFIG_HDPARM) += hdparm.o 34MISCUTILS-$(CONFIG_HDPARM) += hdparm.o
35MISCUTILS-$(CONFIG_LAST) += last.o 35MISCUTILS-$(CONFIG_LAST) += last.o
36MISCUTILS-${CONFIG_LESS} += less.o 36MISCUTILS-${CONFIG_LESS} += less.o
37MISCUTILS-$(CONFIG_MAKEDEVS) += makedevs.o 37MISCUTILS-$(CONFIG_MAKEDEVS) += makedevs.o
38MISCUTILS-$(CONFIG_MOUNTPOINT) += mountpoint.o 38MISCUTILS-$(CONFIG_MOUNTPOINT) += mountpoint.o
39MISCUTILS-$(CONFIG_MT) += mt.o 39MISCUTILS-$(CONFIG_MT) += mt.o
40MISCUTILS-$(CONFIG_RX) += rx.o 40MISCUTILS-$(CONFIG_RX) += rx.o
41MISCUTILS-$(CONFIG_SETSID) += setsid.o 41MISCUTILS-$(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
58include/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