aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorGravatar Mike Frysinger <vapier@gentoo.org>2006-02-02 01:41:53 +0000
committerGravatar Mike Frysinger <vapier@gentoo.org>2006-02-02 01:41:53 +0000
commitb38673fb9fee63303cc6b7d4923ea0dd7cf7310a (patch)
treed6b2fba68832d7f0e061614dda4372119f58156f /scripts
parent1f04c9d29c8a79cc71a7dd01e18e14c0fe8a8726 (diff)
downloadbusybox-b38673fb9fee63303cc6b7d4923ea0dd7cf7310a.tar.gz
busybox-b38673fb9fee63303cc6b7d4923ea0dd7cf7310a.tar.bz2
make the build system puuuuuuuuuuurty
Diffstat (limited to 'scripts')
-rw-r--r--scripts/config/Makefile20
-rw-r--r--scripts/config/mconf.c5
2 files changed, 13 insertions, 12 deletions
diff --git a/scripts/config/Makefile b/scripts/config/Makefile
index 4d95ce078..c1cda3e2a 100644
--- a/scripts/config/Makefile
+++ b/scripts/config/Makefile
@@ -50,17 +50,19 @@ MCONF_OBJS = $(patsubst %.c,%.o, $(MCONF_SRC) $(LXD_SRC))
SHARED_OBJS = $(patsubst %.c,%.o, $(SHARED_SRC))
conf: $(CONF_OBJS) $(SHARED_OBJS)
- $(HOSTCC) $(NATIVE_LDFLAGS) $^ -o $@
+ $(SECHO) " "HOSTCC $@ ; true
+ $(Q)$(HOSTCC) $(NATIVE_LDFLAGS) $^ -o $@
mconf: $(MCONF_OBJS) $(SHARED_OBJS)
- $(HOSTCC) $(NATIVE_LDFLAGS) $^ -o $@ $(LIBS)
+ $(SECHO) " "HOSTCC $@ ; true
+ $(Q)$(HOSTCC) $(NATIVE_LDFLAGS) $^ -o $@ $(LIBS)
$(CONF_OBJS): %.o : $(srcdir)/%.c $(SHARED_DEPS)
- $(HOSTCC) $(HOSTCFLAGS) -I. -c $< -o $@
+ $(compile.h) -I.
$(MCONF_OBJS): %.o : $(srcdir)/%.c $(SHARED_DEPS)
@[ -d $(@D) ] || mkdir -v $(@D)
- $(HOSTCC) $(HOSTCFLAGS) $(HOSTNCURSES) -I. -c $< -o $@
+ $(compile.h) $(HOSTNCURSES) -I.
lkc_defs.h: $(srcdir)/lkc_proto.h
@sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'
@@ -81,21 +83,21 @@ lex.%.c: $(srcdir)/%.l
else
lex.zconf.o: lex.zconf.c $(SHARED_DEPS)
- $(HOSTCC) $(HOSTCFLAGS) -I$(srcdir) -c $< -o $@
+ $(compile.h) -I$(srcdir)
lex.zconf.c: $(srcdir)/lex.zconf.c_shipped
- cp $< $@
+ $(Q)cp $< $@
zconf.tab.c: $(srcdir)/zconf.tab.c_shipped
- cp $< $@
+ $(Q)cp $< $@
zconf.tab.h: $(srcdir)/zconf.tab.h_shipped
- cp $< $@
+ $(Q)cp $< $@
endif
zconf.tab.o: zconf.tab.c lex.zconf.c $(srcdir)/confdata.c $(srcdir)/expr.c \
$(srcdir)/symbol.c $(srcdir)/menu.c $(SHARED_DEPS)
- $(HOSTCC) $(HOSTCFLAGS) -I$(srcdir) -I. -c $< -o $@
+ $(compile.h) -I$(srcdir) -I.
.PHONY: ncurses
diff --git a/scripts/config/mconf.c b/scripts/config/mconf.c
index 5bc2abdd8..1b21575ad 100644
--- a/scripts/config/mconf.c
+++ b/scripts/config/mconf.c
@@ -967,9 +967,8 @@ int main(int ac, char **av)
if (stat == 0) {
conf_write(NULL);
- printf("\n\n"
- "*** End of BusyBox configuration.\n"
- "*** Check the top-level Makefile for additional configuration options.\n\n");
+ printf("\n"
+ "*** End of BusyBox configuration.\n");
} else
printf("\n\nYour BusyBox configuration changes were NOT saved.\n\n");