[Olsr-dev] [PATCH 1/1] build: do not print full commandlines
Ferry Huberts
(spam-protected)
Tue Jul 26 17:09:30 CEST 2011
From: Ferry Huberts <(spam-protected)>
Make the build less verbose, just print [CC] when compiling
and [LD] when linking.
Signed-off-by: Ferry Huberts <(spam-protected)>
---
Makefile | 135 +++++++++++++++++++++++----------------------
Makefile.inc | 4 +
lib/arprefresh/Makefile | 3 +-
lib/bmf/Makefile | 3 +-
lib/dot_draw/Makefile | 3 +-
lib/dyn_gw/Makefile | 3 +-
lib/dyn_gw_plain/Makefile | 3 +-
lib/httpinfo/Makefile | 3 +-
lib/mdns/Makefile | 3 +-
lib/mini/Makefile | 3 +-
lib/nameservice/Makefile | 3 +-
lib/p2pd/Makefile | 3 +-
lib/pgraph/Makefile | 3 +-
lib/quagga/Makefile | 3 +-
lib/secure/Makefile | 3 +-
lib/tas/Makefile | 3 +-
lib/txtinfo/Makefile | 3 +-
lib/watchdog/Makefile | 3 +-
src/cfgparser/Makefile | 3 +-
src/cfgparser/local.mk | 16 +++--
src/olsr_switch/Makefile | 3 +-
21 files changed, 117 insertions(+), 92 deletions(-)
diff --git a/Makefile b/Makefile
index 8322f56..70e5d28 100644
--- a/Makefile
+++ b/Makefile
@@ -63,13 +63,14 @@ TAG_SRCS = $(SRCS) $(HDRS) $(wildcard $(CFGDIR)/*.[ch] $(SWITCHDIR)/*.[ch])
default_target: $(EXENAME)
$(EXENAME): $(OBJS) src/builddata.o
- $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ @echo "[LD] $@"
+ @$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
cfgparser: $(CFGDEPS) src/builddata.o
$(MAKE) -C $(CFGDIR)
switch:
- $(MAKECMD) -C $(SWITCHDIR)
+ @$(MAKECMD) -C $(SWITCHDIR)
# generate it always
.PHONY: src/builddata.c
@@ -96,8 +97,8 @@ uberclean: clean clean_libs
-rm -f $(TAGFILE)
# BSD-xargs has no "--no-run-if-empty" aka "-r"
find . \( -name '*.[od]' -o -name '*~' \) -not -path "*/.hg*" -print0 | xargs -0 rm -f
- $(MAKECMD) -C $(SWITCHDIR) clean
- $(MAKECMD) -C $(CFGDIR) clean
+ @$(MAKECMD) -C $(SWITCHDIR) clean
+ @$(MAKECMD) -C $(CFGDIR) clean
install: install_olsrd
@@ -174,16 +175,16 @@ endif
endif
libs:
- set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR);done
+ @set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR);done
libs_clean clean_libs:
-for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR) clean;rm -f lib/$$dir/*.so lib/$$dir/*.dll;done
libs_install install_libs:
- set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR) install;done
+ @set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR) install;done
libs_uninstall uninstall_libs:
- set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR) uninstall;done
+ @set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR) uninstall;done
rmdir -p --ignore-fail-on-non-empty $(LIBDIR)
#
@@ -191,159 +192,159 @@ libs_uninstall uninstall_libs:
#
arprefresh:
- $(MAKECMD) -C lib/arprefresh clean
- $(MAKECMD) -C lib/arprefresh
+ @$(MAKECMD) -C lib/arprefresh clean
+ @$(MAKECMD) -C lib/arprefresh
arprefresh_install:
- $(MAKECMD) -C lib/arprefresh DESTDIR=$(DESTDIR) install
+ @$(MAKECMD) -C lib/arprefresh DESTDIR=$(DESTDIR) install
arprefresh_uninstall:
- $(MAKECMD) -C lib/arprefresh DESTDIR=$(DESTDIR) uninstall
+ @$(MAKECMD) -C lib/arprefresh DESTDIR=$(DESTDIR) uninstall
bmf:
- $(MAKECMD) -C lib/bmf clean
- $(MAKECMD) -C lib/bmf
+ @$(MAKECMD) -C lib/bmf clean
+ @$(MAKECMD) -C lib/bmf
bmf_install:
- $(MAKECMD) -C lib/bmf DESTDIR=$(DESTDIR) install
+ @$(MAKECMD) -C lib/bmf DESTDIR=$(DESTDIR) install
bmf_uninstall:
- $(MAKECMD) -C lib/bmf DESTDIR=$(DESTDIR) uninstall
+ @$(MAKECMD) -C lib/bmf DESTDIR=$(DESTDIR) uninstall
dot_draw:
- $(MAKECMD) -C lib/dot_draw clean
- $(MAKECMD) -C lib/dot_draw
+ @$(MAKECMD) -C lib/dot_draw clean
+ @$(MAKECMD) -C lib/dot_draw
dot_draw_install:
- $(MAKECMD) -C lib/dot_draw DESTDIR=$(DESTDIR) install
+ @$(MAKECMD) -C lib/dot_draw DESTDIR=$(DESTDIR) install
dot_draw_uninstall:
- $(MAKECMD) -C lib/dot_draw DESTDIR=$(DESTDIR) uninstall
+ @$(MAKECMD) -C lib/dot_draw DESTDIR=$(DESTDIR) uninstall
dyn_gw:
- $(MAKECMD) -C lib/dyn_gw clean
- $(MAKECMD) -C lib/dyn_gw
+ @$(MAKECMD) -C lib/dyn_gw clean
+ @$(MAKECMD) -C lib/dyn_gw
dyn_gw_install:
- $(MAKECMD) -C lib/dyn_gw DESTDIR=$(DESTDIR) install
+ @$(MAKECMD) -C lib/dyn_gw DESTDIR=$(DESTDIR) install
dyn_gw_uninstall:
- $(MAKECMD) -C lib/dyn_gw DESTDIR=$(DESTDIR) uninstall
+ @$(MAKECMD) -C lib/dyn_gw DESTDIR=$(DESTDIR) uninstall
dyn_gw_plain:
- $(MAKECMD) -C lib/dyn_gw_plain clean
- $(MAKECMD) -C lib/dyn_gw_plain
+ @$(MAKECMD) -C lib/dyn_gw_plain clean
+ @$(MAKECMD) -C lib/dyn_gw_plain
dyn_gw_plain_install:
- $(MAKECMD) -C lib/dyn_gw_plain DESTDIR=$(DESTDIR) install
+ @$(MAKECMD) -C lib/dyn_gw_plain DESTDIR=$(DESTDIR) install
dyn_gw_plain_uninstall:
- $(MAKECMD) -C lib/dyn_gw_plain DESTDIR=$(DESTDIR) uninstall
+ @$(MAKECMD) -C lib/dyn_gw_plain DESTDIR=$(DESTDIR) uninstall
httpinfo:
- $(MAKECMD) -C lib/httpinfo clean
- $(MAKECMD) -C lib/httpinfo
+ @$(MAKECMD) -C lib/httpinfo clean
+ @$(MAKECMD) -C lib/httpinfo
httpinfo_install:
- $(MAKECMD) -C lib/httpinfo DESTDIR=$(DESTDIR) install
+ @$(MAKECMD) -C lib/httpinfo DESTDIR=$(DESTDIR) install
httpinfo_uninstall:
- $(MAKECMD) -C lib/httpinfo DESTDIR=$(DESTDIR) uninstall
+ @$(MAKECMD) -C lib/httpinfo DESTDIR=$(DESTDIR) uninstall
mdns:
- $(MAKECMD) -C lib/mdns clean
- $(MAKECMD) -C lib/mdns
+ @$(MAKECMD) -C lib/mdns clean
+ @$(MAKECMD) -C lib/mdns
mdns_install:
- $(MAKECMD) -C lib/mdns DESTDIR=$(DESTDIR) install
+ @$(MAKECMD) -C lib/mdns DESTDIR=$(DESTDIR) install
mdns_uninstall:
- $(MAKECMD) -C lib/mdns DESTDIR=$(DESTDIR) uninstall
+ @$(MAKECMD) -C lib/mdns DESTDIR=$(DESTDIR) uninstall
#
# no targets for mini: it's an example plugin
#
nameservice:
- $(MAKECMD) -C lib/nameservice clean
- $(MAKECMD) -C lib/nameservice
+ @$(MAKECMD) -C lib/nameservice clean
+ @$(MAKECMD) -C lib/nameservice
nameservice_install:
- $(MAKECMD) -C lib/nameservice DESTDIR=$(DESTDIR) install
+ @$(MAKECMD) -C lib/nameservice DESTDIR=$(DESTDIR) install
nameservice_uninstall:
- $(MAKECMD) -C lib/nameservice DESTDIR=$(DESTDIR) uninstall
+ @$(MAKECMD) -C lib/nameservice DESTDIR=$(DESTDIR) uninstall
p2pd:
- $(MAKECMD) -C lib/p2pd clean
- $(MAKECMD) -C lib/p2pd
+ @$(MAKECMD) -C lib/p2pd clean
+ @$(MAKECMD) -C lib/p2pd
p2pd_install:
- $(MAKECMD) -C lib/p2pd DESTDIR=$(DESTDIR) install
+ @$(MAKECMD) -C lib/p2pd DESTDIR=$(DESTDIR) install
p2pd_uninstall:
- $(MAKECMD) -C lib/p2pd DESTDIR=$(DESTDIR) uninstall
+ @$(MAKECMD) -C lib/p2pd DESTDIR=$(DESTDIR) uninstall
pgraph:
- $(MAKECMD) -C lib/pgraph clean
- $(MAKECMD) -C lib/pgraph
+ @$(MAKECMD) -C lib/pgraph clean
+ @$(MAKECMD) -C lib/pgraph
pgraph_install:
- $(MAKECMD) -C lib/pgraph DESTDIR=$(DESTDIR) install
+ @$(MAKECMD) -C lib/pgraph DESTDIR=$(DESTDIR) install
pgraph_uninstall:
- $(MAKECMD) -C lib/pgraph DESTDIR=$(DESTDIR) uninstall
+ @$(MAKECMD) -C lib/pgraph DESTDIR=$(DESTDIR) uninstall
quagga:
- $(MAKECMD) -C lib/quagga clean
- $(MAKECMD) -C lib/quagga
+ @$(MAKECMD) -C lib/quagga clean
+ @$(MAKECMD) -C lib/quagga
quagga_install:
- $(MAKECMD) -C lib/quagga DESTDIR=$(DESTDIR) install
+ @$(MAKECMD) -C lib/quagga DESTDIR=$(DESTDIR) install
quagga_uninstall:
- $(MAKECMD) -C lib/quagga DESTDIR=$(DESTDIR) uninstall
+ @$(MAKECMD) -C lib/quagga DESTDIR=$(DESTDIR) uninstall
secure:
- $(MAKECMD) -C lib/secure clean
- $(MAKECMD) -C lib/secure
+ @$(MAKECMD) -C lib/secure clean
+ @$(MAKECMD) -C lib/secure
secure_install:
- $(MAKECMD) -C lib/secure DESTDIR=$(DESTDIR) install
+ @$(MAKECMD) -C lib/secure DESTDIR=$(DESTDIR) install
secure_uninstall:
- $(MAKECMD) -C lib/secure DESTDIR=$(DESTDIR) uninstall
+ @$(MAKECMD) -C lib/secure DESTDIR=$(DESTDIR) uninstall
tas:
- $(MAKECMD) -C lib/tas clean
- $(MAKECMD) -C lib/tas
+ @$(MAKECMD) -C lib/tas clean
+ @$(MAKECMD) -C lib/tas
tas_install:
- $(MAKECMD) -C lib/tas DESTDIR=$(DESTDIR) install
+ @$(MAKECMD) -C lib/tas DESTDIR=$(DESTDIR) install
tas_uninstall:
- $(MAKECMD) -C lib/tas DESTDIR=$(DESTDIR) uninstall
+ @$(MAKECMD) -C lib/tas DESTDIR=$(DESTDIR) uninstall
txtinfo:
- $(MAKECMD) -C lib/txtinfo clean
- $(MAKECMD) -C lib/txtinfo
+ @$(MAKECMD) -C lib/txtinfo clean
+ @$(MAKECMD) -C lib/txtinfo
txtinfo_install:
- $(MAKECMD) -C lib/txtinfo DESTDIR=$(DESTDIR) install
+ @$(MAKECMD) -C lib/txtinfo DESTDIR=$(DESTDIR) install
txtinfo_uninstall:
- $(MAKECMD) -C lib/txtinfo DESTDIR=$(DESTDIR) uninstall
+ @$(MAKECMD) -C lib/txtinfo DESTDIR=$(DESTDIR) uninstall
watchdog:
- $(MAKECMD) -C lib/watchdog clean
- $(MAKECMD) -C lib/watchdog
+ @$(MAKECMD) -C lib/watchdog clean
+ @$(MAKECMD) -C lib/watchdog
watchdog_install:
- $(MAKECMD) -C lib/watchdog DESTDIR=$(DESTDIR) install
+ @$(MAKECMD) -C lib/watchdog DESTDIR=$(DESTDIR) install
watchdog_uninstall:
- $(MAKECMD) -C lib/watchdog DESTDIR=$(DESTDIR) uninstall
+ @$(MAKECMD) -C lib/watchdog DESTDIR=$(DESTDIR) uninstall
build_all: all switch libs
diff --git a/Makefile.inc b/Makefile.inc
index 5b73434..c348e15 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -206,6 +206,10 @@ quote = $(subst .,\.,$(subst /,\/,$1))
%.d: %.c
@$(filter-out $(CCACHE),$(CC)) -M $(strip $(CPPFLAGS)) "$<" | sed -e '1s/\($(call quote,$(*F))\.o\)[ :]*/$(call quote,$(*D)/\1 $@: Makefile $(TOPDIR)$(if $(TOPDIR),/)Makefile.inc) /g' >"$@"
+%.o: %.c
+ @echo "[CC] $<"
+ @$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+
# we always need the includes and defines
# for legacy since now
CPPFLAGS += $(INCLUDES) $(DEFINES)
diff --git a/lib/arprefresh/Makefile b/lib/arprefresh/Makefile
index 2aba076..c860182 100644
--- a/lib/arprefresh/Makefile
+++ b/lib/arprefresh/Makefile
@@ -47,7 +47,8 @@ include $(TOPDIR)/Makefile.inc
default_target: $(PLUGIN_FULLNAME)
$(PLUGIN_FULLNAME): $(OBJS) version-script.txt
- $(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
+ @echo "[LD] $@"
+ @$(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
install: $(PLUGIN_FULLNAME)
$(STRIP) $(PLUGIN_FULLNAME)
diff --git a/lib/bmf/Makefile b/lib/bmf/Makefile
index dbb149c..f7fc0c8 100644
--- a/lib/bmf/Makefile
+++ b/lib/bmf/Makefile
@@ -46,7 +46,8 @@ ifeq ($(OS),$(filter $(OS),linux android))
default_target: $(PLUGIN_FULLNAME)
$(PLUGIN_FULLNAME): $(OBJS) version-script.txt
- $(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
+ @echo "[LD] $@"
+ @$(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
install: $(PLUGIN_FULLNAME)
$(STRIP) $(PLUGIN_FULLNAME)
diff --git a/lib/dot_draw/Makefile b/lib/dot_draw/Makefile
index 060d73c..3364318 100644
--- a/lib/dot_draw/Makefile
+++ b/lib/dot_draw/Makefile
@@ -46,7 +46,8 @@ include $(TOPDIR)/Makefile.inc
default_target: $(PLUGIN_FULLNAME)
$(PLUGIN_FULLNAME): $(OBJS) version-script.txt
- $(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
+ @echo "[LD] $@"
+ @$(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
install: $(PLUGIN_FULLNAME)
$(STRIP) $(PLUGIN_FULLNAME)
diff --git a/lib/dyn_gw/Makefile b/lib/dyn_gw/Makefile
index f4e594f..9246c42 100644
--- a/lib/dyn_gw/Makefile
+++ b/lib/dyn_gw/Makefile
@@ -48,7 +48,8 @@ LIBS += $(OS_LIB_PTHREAD)
default_target: $(PLUGIN_FULLNAME)
$(PLUGIN_FULLNAME): $(OBJS) version-script.txt
- $(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
+ @echo "[LD] $@"
+ @$(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
install: $(PLUGIN_FULLNAME)
$(STRIP) $(PLUGIN_FULLNAME)
diff --git a/lib/dyn_gw_plain/Makefile b/lib/dyn_gw_plain/Makefile
index c58c175..f1cbe5e 100644
--- a/lib/dyn_gw_plain/Makefile
+++ b/lib/dyn_gw_plain/Makefile
@@ -46,7 +46,8 @@ include $(TOPDIR)/Makefile.inc
default_target: $(PLUGIN_FULLNAME)
$(PLUGIN_FULLNAME): $(OBJS) version-script.txt
- $(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
+ @echo "[LD] $@"
+ @$(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
install: $(PLUGIN_FULLNAME)
$(STRIP) $(PLUGIN_FULLNAME)
diff --git a/lib/httpinfo/Makefile b/lib/httpinfo/Makefile
index 6c0ace3..7e388d6 100644
--- a/lib/httpinfo/Makefile
+++ b/lib/httpinfo/Makefile
@@ -55,7 +55,8 @@ ifdef ADMIN_INTERFACE
endif
$(PLUGIN_FULLNAME): $(OBJS) version-script.txt
- $(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
+ @echo "[LD] $@"
+ @$(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
install: $(PLUGIN_FULLNAME)
$(STRIP) $(PLUGIN_FULLNAME)
diff --git a/lib/mdns/Makefile b/lib/mdns/Makefile
index 0e69202..e2f71b8 100644
--- a/lib/mdns/Makefile
+++ b/lib/mdns/Makefile
@@ -21,7 +21,8 @@ else
default_target: $(PLUGIN_FULLNAME)
$(PLUGIN_FULLNAME): $(OBJS) version-script.txt
- $(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
+ @echo "[LD] $@"
+ @$(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
install: $(PLUGIN_FULLNAME)
$(STRIP) $(PLUGIN_FULLNAME)
diff --git a/lib/mini/Makefile b/lib/mini/Makefile
index 3a73ae4..4bf26dd 100644
--- a/lib/mini/Makefile
+++ b/lib/mini/Makefile
@@ -46,7 +46,8 @@ include $(TOPDIR)/Makefile.inc
default_target: $(PLUGIN_FULLNAME)
$(PLUGIN_FULLNAME): $(OBJS) version-script.txt
- $(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
+ @echo "[LD] $@"
+ @$(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
install: $(PLUGIN_FULLNAME)
$(STRIP) $(PLUGIN_FULLNAME)
diff --git a/lib/nameservice/Makefile b/lib/nameservice/Makefile
index 98cb670..9ba270a 100644
--- a/lib/nameservice/Makefile
+++ b/lib/nameservice/Makefile
@@ -59,7 +59,8 @@ endif
default_target: $(PLUGIN_FULLNAME)
$(PLUGIN_FULLNAME): $(OBJS) version-script.txt
- $(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
+ @echo "[LD] $@"
+ @$(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
install: $(PLUGIN_FULLNAME)
$(STRIP) $(PLUGIN_FULLNAME)
diff --git a/lib/p2pd/Makefile b/lib/p2pd/Makefile
index 3031502..c61d560 100644
--- a/lib/p2pd/Makefile
+++ b/lib/p2pd/Makefile
@@ -21,7 +21,8 @@ else
default_target: $(PLUGIN_FULLNAME)
$(PLUGIN_FULLNAME): $(OBJS) version-script.txt
- $(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
+ @echo "[LD] $@"
+ @$(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
install: $(PLUGIN_FULLNAME)
$(STRIP) $(PLUGIN_FULLNAME)
diff --git a/lib/pgraph/Makefile b/lib/pgraph/Makefile
index 31d7627..af42ab1 100644
--- a/lib/pgraph/Makefile
+++ b/lib/pgraph/Makefile
@@ -46,7 +46,8 @@ include $(TOPDIR)/Makefile.inc
default_target: $(PLUGIN_FULLNAME)
$(PLUGIN_FULLNAME): $(OBJS) version-script.txt
- $(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
+ @echo "[LD] $@"
+ @$(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
install: $(PLUGIN_FULLNAME)
$(STRIP) $(PLUGIN_FULLNAME)
diff --git a/lib/quagga/Makefile b/lib/quagga/Makefile
index 22c651e..b97aef8 100644
--- a/lib/quagga/Makefile
+++ b/lib/quagga/Makefile
@@ -56,7 +56,8 @@ else
default_target: $(PLUGIN_FULLNAME)
$(PLUGIN_FULLNAME): $(OBJS) version-script.txt
- $(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
+ @echo "[LD] $@"
+ @$(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
install: $(PLUGIN_FULLNAME)
$(STRIP) $(PLUGIN_FULLNAME)
diff --git a/lib/secure/Makefile b/lib/secure/Makefile
index 45a248b..adb5e1e 100644
--- a/lib/secure/Makefile
+++ b/lib/secure/Makefile
@@ -51,7 +51,8 @@ endif
default_target: $(PLUGIN_FULLNAME)
$(PLUGIN_FULLNAME): $(OBJS) version-script.txt
- $(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
+ @echo "[LD] $@"
+ @$(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
install: $(PLUGIN_FULLNAME)
$(STRIP) $(PLUGIN_FULLNAME)
diff --git a/lib/tas/Makefile b/lib/tas/Makefile
index 9fc4fc6..abdff3e 100644
--- a/lib/tas/Makefile
+++ b/lib/tas/Makefile
@@ -60,7 +60,8 @@ else
default_target: $(PLUGIN_FULLNAME)
$(PLUGIN_FULLNAME): $(OBJS) version-script.txt
- $(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
+ @echo "[LD] $@"
+ @$(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
# this is not nice but there is no nicer solution
src/lua/lapi.o src/lua/ltable.o: CFLAGS += -Wno-cast-qual
diff --git a/lib/txtinfo/Makefile b/lib/txtinfo/Makefile
index feaa07c..63c2920 100644
--- a/lib/txtinfo/Makefile
+++ b/lib/txtinfo/Makefile
@@ -46,7 +46,8 @@ include $(TOPDIR)/Makefile.inc
default_target: $(PLUGIN_FULLNAME)
$(PLUGIN_FULLNAME): $(OBJS) version-script.txt
- $(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
+ @echo "[LD] $@"
+ @$(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
install: $(PLUGIN_FULLNAME)
$(STRIP) $(PLUGIN_FULLNAME)
diff --git a/lib/watchdog/Makefile b/lib/watchdog/Makefile
index caece70..b22c094 100644
--- a/lib/watchdog/Makefile
+++ b/lib/watchdog/Makefile
@@ -46,7 +46,8 @@ include $(TOPDIR)/Makefile.inc
default_target: $(PLUGIN_FULLNAME)
$(PLUGIN_FULLNAME): $(OBJS) version-script.txt
- $(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
+ @echo "[LD] $@"
+ @$(CC) $(LDFLAGS) -o $(PLUGIN_FULLNAME) $(OBJS) $(LIBS)
install: $(PLUGIN_FULLNAME)
$(STRIP) $(PLUGIN_FULLNAME)
diff --git a/src/cfgparser/Makefile b/src/cfgparser/Makefile
index 4c4dcc9..ce2e05e 100644
--- a/src/cfgparser/Makefile
+++ b/src/cfgparser/Makefile
@@ -89,7 +89,8 @@ endif
default_target: $(NAME)
$(NAME): $(OBJS)
- $(CC) $(LDFLAGS) -o "$@" $^ $(LIBS)
+ @echo "[LD] $@"
+ @$(CC) $(LDFLAGS) -o "$@" $^ $(LIBS)
install:
install -D -m 755 $(NAME) $(LIBDIR)/$(NAME)
diff --git a/src/cfgparser/local.mk b/src/cfgparser/local.mk
index 3195c58..b614a9f 100644
--- a/src/cfgparser/local.mk
+++ b/src/cfgparser/local.mk
@@ -46,8 +46,9 @@ OBJS += $(foreach file,olsrd_conf oparse oscan cfgfile_gen,$(C)$(file).o)
HDRS += $(foreach file,olsrd_conf oparse,$(C)$(file).h)
$(C)oscan.c: $(C)oscan.lex $(C)Makefile
- $(FLEX) -Cem -o"$@-tmp" "$<"
- sed -e '/^static/s/yy_get_next_buffer[\(][\)]/yy_get_next_buffer(void)/' \
+ @echo "[FLEX] $@"
+ @$(FLEX) -Cem -o"$@-tmp" "$<"
+ @sed -e '/^static/s/yy_get_next_buffer[\(][\)]/yy_get_next_buffer(void)/' \
-e '/^static/s/yy_get_previous_state[\(][\)]/yy_get_previous_state(void)/' \
-e '/^static/s/yygrowstack[\(][\)]/yygrowstack(void)/' \
-e '/^static/s/input[\(][\)]/input(void)/' \
@@ -55,7 +56,7 @@ $(C)oscan.c: $(C)oscan.lex $(C)Makefile
-e 's/register //' \
-e '/^#line/s/$(call quote,$@-tmp)/$(call quote,$@)/' \
< "$@-tmp" >"$@"
- $(RM) "$@-tmp"
+ @$(RM) "$@-tmp"
# we need a dependency to generate oparse before we compile oscan.c
$(C)oscan.o: $(C)oparse.c
@@ -64,12 +65,13 @@ $(C)oscan.o: CFLAGS := $(filter-out -Wunreachable-code -Wsign-compare,$(CFLAGS))
$(C)oscan.o: CPPFLAGS += $(if $(CFGDIR),-I$(CFGDIR)) -DYY_NO_INPUT
$(C)oparse.c: $(C)oparse.y $(C)olsrd_conf.h $(C)Makefile
- $(BISON) -d -o "$@-tmp" "$<"
- sed -e 's/register //' \
+ @echo "[BISON] $@"
+ @$(BISON) -d -o "$@-tmp" "$<"
+ @sed -e 's/register //' \
-e '/^#line/s/$(call quote,$@-tmp)/$(call quote,$@)/' \
< "$@-tmp" >"$@"
- mv "$(subst .c,.h,$@-tmp)" "$(subst .c,.h,$@)"
- $(RM) "$@-tmp" "$(subst .c,.h,$@-tmp)"
+ @mv "$(subst .c,.h,$@-tmp)" "$(subst .c,.h,$@)"
+ @$(RM) "$@-tmp" "$(subst .c,.h,$@-tmp)"
$(C)oparse.o: CFLAGS := $(filter-out -Wunreachable-code,$(CFLAGS))
diff --git a/src/olsr_switch/Makefile b/src/olsr_switch/Makefile
index 31dfc2d..afdbbb9 100644
--- a/src/olsr_switch/Makefile
+++ b/src/olsr_switch/Makefile
@@ -9,7 +9,8 @@ BINNAME = olsr_switch
endif
default_target: $(OBJS)
- $(CC) $(LDFLAGS) -o $(TOPDIR)/$(BINNAME) $(OBJS) $(LIBS)
+ @echo "[LD] $@"
+ @$(CC) $(LDFLAGS) -o $(TOPDIR)/$(BINNAME) $(OBJS) $(LIBS)
ohs_cmd.o: CFLAGS += -Wno-cast-qual
--
1.7.6
More information about the Olsr-dev
mailing list