diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-09-16 13:10:39 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-09-16 13:10:39 +0200 |
commit | 9a625cd021c2d087a988699dcfc3e512fa163235 (patch) | |
tree | 2fbdefdee370f2cd2c5ee76ec62b9dd9b65cbd9c /config/Makefile | |
parent | afab289b265ff987c3f62393b3ef707c2650704f (diff) | |
parent | 4422cda575db22275b067e07ad4b585572d91756 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
mk/kernel-build.mk
package/expat/Makefile
package/gettext/Makefile
package/perl/Makefile
package/zlib/Makefile
Diffstat (limited to 'config/Makefile')
-rw-r--r-- | config/Makefile | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/config/Makefile b/config/Makefile index 86114f55f..cacb2a28c 100644 --- a/config/Makefile +++ b/config/Makefile @@ -53,25 +53,25 @@ GCONF_OBJS=$(patsubst %.c,%.o, $(GCONF_SRC)) SHARED_OBJS=$(patsubst %.c,%.o, $(SHARED_SRC)) conf: $(CONF_OBJS) $(SHARED_OBJS) - $(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) $^ -o $@ + @$(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) $^ -o $@ mconf: $(MCONF_OBJS) $(SHARED_OBJS) - $(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) $^ -o $@ $(LIBS) + @$(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) $^ -o $@ $(LIBS) gconf: $(GCONF_OBJS) $(SHARED_OBJS) - $(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) $^ -o $@ $(HOSTGTKLIBS) + @$(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) $^ -o $@ $(HOSTGTKLIBS) $(CONF_OBJS): %.o : %.c $(SHARED_DEPS) - $(HOSTCC) $(HOSTCFLAGS) -I. -c $< -o $@ + @$(HOSTCC) $(HOSTCFLAGS) -I. -c $< -o $@ $(MCONF_OBJS): %.o : %.c $(SHARED_DEPS) - $(HOSTCC) $(HOSTCFLAGS) $(HOSTNCURSES) -I. -c $< -o $@ + @$(HOSTCC) $(HOSTCFLAGS) $(HOSTNCURSES) -I. -c $< -o $@ $(GCONF_OBJS): %.o : %.c $(SHARED_DEPS) - $(HOSTCC) $(HOSTCFLAGS) $(HOSTGTKCFLAGS) -DLKC_DIRECT_LINK -I. -c $< -o $@ + @$(HOSTCC) $(HOSTCFLAGS) $(HOSTGTKCFLAGS) -DLKC_DIRECT_LINK -I. -c $< -o $@ glob.o: glob.c $(SHARED_DEPS) - $(HOSTCC) $(HOSTCFLAGS) -I. -c glob.c -o $@ + @$(HOSTCC) $(HOSTCFLAGS) -I. -c glob.c -o $@ lkc_defs.h: lkc_proto.h @sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/' @@ -105,19 +105,19 @@ lex.zconf.o: lex.zconf.c $(SHARED_DEPS) $(HOSTCC) $(HOSTCFLAGS) -I. -c $< -o $@ lex.zconf.c: lex.zconf.c_shipped - $(CP) lex.zconf.c_shipped lex.zconf.c + @$(CP) lex.zconf.c_shipped lex.zconf.c zconf.hash.c: zconf.hash.c_shipped - $(CP) zconf.hash.c_shipped zconf.hash.c + @$(CP) zconf.hash.c_shipped zconf.hash.c zconf.tab.o: zconf.tab.c zconf.hash.c lex.zconf.c confdata.c expr.c symbol.c menu.c $(SHARED_DEPS) - $(HOSTCC) $(HOSTCFLAGS) -I. -c $< -o $@ + @$(HOSTCC) $(HOSTCFLAGS) -I. -c $< -o $@ zconf.tab.c: zconf.tab.c_shipped - $(CP) zconf.tab.c_shipped zconf.tab.c + @$(CP) zconf.tab.c_shipped zconf.tab.c zconf.tab.h: zconf.tab.h_shipped - $(CP) zconf.tab.h_shipped zconf.tab.h + @$(CP) zconf.tab.h_shipped zconf.tab.h endif .PHONY: ncurses |