Tweak Makefile.in to always show what its doing.

bareos · Feb 17, 2015 · cb29a92 · cb29a92
1 parent 977453c
commit cb29a92
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 3 deletions.
diff --git a/src/dird/Makefile.in b/src/dird/Makefile.in
@@ -76,6 +76,7 @@ bareos-dbcheck: Makefile $(DBCHKOBJS) \
 	 ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
 	 ../cats/libbareossql$(DEFAULT_ARCHIVE_TYPE) \
 	 ../cats/libbareoscats$(DEFAULT_ARCHIVE_TYPE)
+	@echo "Linking $@ ..."
 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -L../cats -o $@ $(DBCHKOBJS) \
 	      -lbareoscats -lbareossql -lbareoscfg -lbareosfind -lbareos -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS)
 
@@ -85,6 +86,7 @@ testfind: Makefile $(TSTFNDOBJS) \
 	 ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
 	 ../cats/libbareossql$(DEFAULT_ARCHIVE_TYPE) \
 	 ../cats/libbareoscats$(DEFAULT_ARCHIVE_TYPE)
+	@echo "Linking $@ ..."
 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -L../cats -o $@ $(TSTFNDOBJS) \
 	      -lbareoscats -lbareossql -lbareoscfg -lbareosfind -lbareos -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS)
 

diff --git a/src/filed/Makefile.in b/src/filed/Makefile.in
@@ -92,6 +92,7 @@ static-bareos-fd: Makefile $(SVROBJS) \
 		  ../findlib/libbareosfind.a \
 		  ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
 		  ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
+	@echo "Linking $@ ..."
 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
 	   $(FDLIBS) -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) \
 	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS)

diff --git a/src/stored/Makefile.in b/src/stored/Makefile.in
@@ -121,25 +121,28 @@ ndmp_tape.o: ndmp_tape.c
 	$(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I../lib $(INCLUDES) $(DINCLUDE) $(CXXFLAGS) $<
 
 btape: Makefile  $(TAPEOBJS) ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE)
+	@echo "Linking $@ ..."
 	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -o $@ $(TAPEOBJS) \
 	   -lbareoscfg -lbareos $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS)
 
 bls:	Makefile $(BLSOBJS) ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
-	@echo "Compiling $<"
+	@echo "Linking $@ ..."
 	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \
 	   -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS)
 
 bextract: Makefile $(BEXTOBJS) ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
-	@echo "Compiling $<"
+	@echo "Linking $@ ..."
 	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) \
 	   -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(SD_LIBS) $(BEXTRACT_LIBS) $(GETTEXT_LIBS)
 
 bscan:	Makefile $(SCNOBJS) ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
 	../cats/libbareossql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbareoscats$(DEFAULT_ARCHIVE_TYPE)
+	@echo "Linking $@ ..."
 	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \
 	   -lbareossql -lbareoscats $(DB_LIBS) -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(SD_LIBS) $(GETTEXT_LIBS)
 
 bcopy:	Makefile $(COPYOBJS) ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
+	@echo "Linking $@ ..."
 	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -o $@ $(COPYOBJS) \
 	   -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS)
 

diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
@@ -43,11 +43,13 @@ all: Makefile $(TESTS) gigaslam grow
 
 bregtest: Makefile bregtest.o \
 	  ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
+	@echo "Linking $@ ..."
 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bregtest.o -lbareos -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS)
 
 testls: Makefile testls.o \
 	../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
 	../lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
+	@echo "Linking $@ ..."
 	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -L../findlib -o $@ testls.o \
 	  $(DLIB) -lbareosfind -lbareos -lm $(LIBS) $(GETTEXT_LIBS)
 
@@ -59,6 +61,7 @@ bbatch: Makefile bbatch.o \
 	../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
 	../cats/libbareossql$(DEFAULT_ARCHIVE_TYPE) \
 	../cats/libbareoscats$(DEFAULT_ARCHIVE_TYPE)
+	@echo "Linking $@ ..."
 	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -o $@ bbatch.o \
 	  -lbareoscats -lbareossql -lbareos -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS)
 
@@ -67,6 +70,7 @@ bvfs_test: Makefile bvfs_test.o \
 	   ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
 	   ../cats/libbareossql$(DEFAULT_ARCHIVE_TYPE) \
 	   ../cats/libbareoscats$(DEFAULT_ARCHIVE_TYPE)
+	@echo "Linking $@ ..."
 	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ bvfs_test.o  \
 	  -lbareoscats -lbareossql -lbareosfind -lbareos -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS)
 
@@ -75,23 +79,28 @@ ing_test: Makefile ing_test.o \
 	  ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
 	  ../cats/libbareossql$(DEFAULT_ARCHIVE_TYPE) \
 	  ../cats/libbareoscats$(DEFAULT_ARCHIVE_TYPE)
+	@echo "Linking $@ ..."
 	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ ing_test.o  \
 	  -lbareoscats -lbareossql -lbareosfind -lbareos -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS)
 
 cats_test: Makefile cats_test.o \
 	   ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
 	   ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
 	   ../cats/libbareossql$(DEFAULT_ARCHIVE_TYPE)
+	@echo "Linking $@ ..."
 	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ cats_test.o  \
 	  -lbareoscats -lbareossql -lbareosfind -lbareos -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS)
 
 gigaslam.o: gigaslam.c
+	echo "Compiling $<"
 	$(CXX) $(CXXFLAGS) -c $<
 
 gigaslam: gigaslam.o
+	@echo "Linking $@ ..."
 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -o $@ gigaslam.o
 
 grow: Makefile grow.o ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
+	@echo "Linking $@ ..."
 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ grow.o -lbareos -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS)
 
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status

diff --git a/src/tools/Makefile.in b/src/tools/Makefile.in
@@ -42,45 +42,55 @@ all: Makefile $(TOOLS)
 	@echo " "
 
 bsmtp: Makefile bsmtp.o ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
+	@echo "Linking $@ ..."
 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bsmtp.o -lbareos -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS)
 
 fstype: Makefile fstype.o \
 	../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
 	../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE)
+	@echo "Linking $@ ..."
 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ fstype.o -lbareosfind -lbareos -lm \
 	  $(DLIB) $(LIBS) $(GETTEXT_LIBS)
 
 drivetype: Makefile drivetype.o \
 	../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
 	../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE)
+	@echo "Linking $@ ..."
 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ drivetype.o -lbareosfind -lbareos -lm \
 	  $(DLIB) $(LIBS) $(GETTEXT_LIBS)
 
 bregex: Makefile bregex.o \
 	../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
 	../lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
+	@echo "Linking $@ ..."
 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L. -L../lib -o $@ bregex.o \
 	  $(DLIB) -lbareos -lm $(LIBS) $(GETTEXT_LIBS)
 
 bwild:	Makefile bwild.o ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
+	@echo "Linking $@ ..."
 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L. -L../lib -o $@ bwild.o \
 	  $(DLIB) -lbareos -lm $(LIBS) $(GETTEXT_LIBS)
 
 bscrypto: Makefile bscrypto.o ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
+	@echo "Linking $@ ..."
 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L. -L../lib -o $@ bscrypto.o \
 	  $(DLIB) -lbareos -lm $(LIBS) $(GETTEXT_LIBS)
 
 bpluginfo.o: bpluginfo.c
+	@echo "Compiling $<"
 	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(INCLUDES) -I../filed -I../dird -I../stored $(DINCLUDE) $(CFLAGS) $<
 
 bpluginfo: Makefile bpluginfo.o ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
+	@echo "Linking $@ ..."
 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bpluginfo.o -lbareos $(GETTEXT_LIBS)
 
 timelimit.o: timelimit.c
+	@echo "Compiling $<"
 	${CC} ${DEFS} ${DEBUG} $(CFLAGS) -DHAVE_ERRNO_H -DHAVE_SETITIMER -DHAVE_SIGACTION -c timelimit.c
 
 timelimit: timelimit.o
-	$(LIBTOOL) --silent --mode=link $(CC) $(LDFLAGS) -o $@ timelimit.o
+	@echo "Linking $@ ..."
+	$(LIBTOOL_LINK) $(CC) $(LDFLAGS) -o $@ timelimit.o
 
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
 	cd $(topdir) \