diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/config/Makefile | 20 | ||||
-rw-r--r-- | scripts/config/mconf.c | 5 |
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)) | |||
50 | SHARED_OBJS = $(patsubst %.c,%.o, $(SHARED_SRC)) | 50 | SHARED_OBJS = $(patsubst %.c,%.o, $(SHARED_SRC)) |
51 | 51 | ||
52 | conf: $(CONF_OBJS) $(SHARED_OBJS) | 52 | conf: $(CONF_OBJS) $(SHARED_OBJS) |
53 | $(HOSTCC) $(NATIVE_LDFLAGS) $^ -o $@ | 53 | $(SECHO) " "HOSTCC $@ ; true |
54 | $(Q)$(HOSTCC) $(NATIVE_LDFLAGS) $^ -o $@ | ||
54 | 55 | ||
55 | mconf: $(MCONF_OBJS) $(SHARED_OBJS) | 56 | mconf: $(MCONF_OBJS) $(SHARED_OBJS) |
56 | $(HOSTCC) $(NATIVE_LDFLAGS) $^ -o $@ $(LIBS) | 57 | $(SECHO) " "HOSTCC $@ ; true |
58 | $(Q)$(HOSTCC) $(NATIVE_LDFLAGS) $^ -o $@ $(LIBS) | ||
57 | 59 | ||
58 | $(CONF_OBJS): %.o : $(srcdir)/%.c $(SHARED_DEPS) | 60 | $(CONF_OBJS): %.o : $(srcdir)/%.c $(SHARED_DEPS) |
59 | $(HOSTCC) $(HOSTCFLAGS) -I. -c $< -o $@ | 61 | $(compile.h) -I. |
60 | 62 | ||
61 | $(MCONF_OBJS): %.o : $(srcdir)/%.c $(SHARED_DEPS) | 63 | $(MCONF_OBJS): %.o : $(srcdir)/%.c $(SHARED_DEPS) |
62 | @[ -d $(@D) ] || mkdir -v $(@D) | 64 | @[ -d $(@D) ] || mkdir -v $(@D) |
63 | $(HOSTCC) $(HOSTCFLAGS) $(HOSTNCURSES) -I. -c $< -o $@ | 65 | $(compile.h) $(HOSTNCURSES) -I. |
64 | 66 | ||
65 | lkc_defs.h: $(srcdir)/lkc_proto.h | 67 | lkc_defs.h: $(srcdir)/lkc_proto.h |
66 | @sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/' | 68 | @sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/' |
@@ -81,21 +83,21 @@ lex.%.c: $(srcdir)/%.l | |||
81 | else | 83 | else |
82 | 84 | ||
83 | lex.zconf.o: lex.zconf.c $(SHARED_DEPS) | 85 | lex.zconf.o: lex.zconf.c $(SHARED_DEPS) |
84 | $(HOSTCC) $(HOSTCFLAGS) -I$(srcdir) -c $< -o $@ | 86 | $(compile.h) -I$(srcdir) |
85 | 87 | ||
86 | lex.zconf.c: $(srcdir)/lex.zconf.c_shipped | 88 | lex.zconf.c: $(srcdir)/lex.zconf.c_shipped |
87 | cp $< $@ | 89 | $(Q)cp $< $@ |
88 | 90 | ||
89 | zconf.tab.c: $(srcdir)/zconf.tab.c_shipped | 91 | zconf.tab.c: $(srcdir)/zconf.tab.c_shipped |
90 | cp $< $@ | 92 | $(Q)cp $< $@ |
91 | 93 | ||
92 | zconf.tab.h: $(srcdir)/zconf.tab.h_shipped | 94 | zconf.tab.h: $(srcdir)/zconf.tab.h_shipped |
93 | cp $< $@ | 95 | $(Q)cp $< $@ |
94 | endif | 96 | endif |
95 | 97 | ||
96 | zconf.tab.o: zconf.tab.c lex.zconf.c $(srcdir)/confdata.c $(srcdir)/expr.c \ | 98 | zconf.tab.o: zconf.tab.c lex.zconf.c $(srcdir)/confdata.c $(srcdir)/expr.c \ |
97 | $(srcdir)/symbol.c $(srcdir)/menu.c $(SHARED_DEPS) | 99 | $(srcdir)/symbol.c $(srcdir)/menu.c $(SHARED_DEPS) |
98 | $(HOSTCC) $(HOSTCFLAGS) -I$(srcdir) -I. -c $< -o $@ | 100 | $(compile.h) -I$(srcdir) -I. |
99 | 101 | ||
100 | .PHONY: ncurses | 102 | .PHONY: ncurses |
101 | 103 | ||
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) | |||
967 | 967 | ||
968 | if (stat == 0) { | 968 | if (stat == 0) { |
969 | conf_write(NULL); | 969 | conf_write(NULL); |
970 | printf("\n\n" | 970 | printf("\n" |
971 | "*** End of BusyBox configuration.\n" | 971 | "*** End of BusyBox configuration.\n"); |
972 | "*** Check the top-level Makefile for additional configuration options.\n\n"); | ||
973 | } else | 972 | } else |
974 | printf("\n\nYour BusyBox configuration changes were NOT saved.\n\n"); | 973 | printf("\n\nYour BusyBox configuration changes were NOT saved.\n\n"); |
975 | 974 | ||