Description: Build clean-ups
 This patch makes build output more useful when things go wrong.
Author: Jeff Licquia <licquia@debian.org>
Forwarded: not-needed
Last-Update: 2011-02-19

--- a/Makefile.in
+++ b/Makefile.in
@@ -71,14 +71,10 @@
 # Rules...
 #
 
-.SILENT:
-
 .SUFFIXES:	.c .cxx .h .o
 .c.o:
-	echo Compiling $<...
 	$(CC) $(CFLAGS) $(CPPFLAGS) -I. -I$(srcdir) -c $<
 .cxx.o:
-	echo Compiling $<...
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -I. -I$(srcdir) -c $<
 
 
@@ -169,7 +165,7 @@
 #
 
 install: all @INSTALL_GUIS@ @INSTALL_OSX@
-	echo Installing EPM programs in $(bindir)
+	@echo Installing EPM programs in $(bindir)
 	-$(MKDIR) $(bindir)
 	$(RM) $(bindir)/epm
 	$(CP) epm $(bindir)
@@ -179,7 +175,7 @@
 	$(STRIP) $(bindir)/epminstall
 	$(RM) $(bindir)/mkepmlist
 	$(CP) mkepmlist $(bindir)
-	echo Installing EPM manpages in $(mandir)/man1
+	@echo Installing EPM manpages in $(mandir)/man1
 	-$(MKDIR) $(mandir)/man1
 	$(RM) $(mandir)/man1/epm.1
 	$(CP) $(srcdir)/doc/epm.man $(mandir)/man1/epm.1
@@ -189,13 +185,13 @@
 	$(CP) $(srcdir)/doc/mkepmlist.man $(mandir)/man1/mkepmlist.1
 	$(RM) $(mandir)/man1/setup.1
 	$(CP) $(srcdir)/doc/setup.man $(mandir)/man1/setup.1
-	echo Installing EPM manpages in $(mandir)/man5
+	@echo Installing EPM manpages in $(mandir)/man5
 	-$(MKDIR) $(mandir)/man5
 	$(RM) $(mandir)/man5/epm.list.5
 	$(CP) $(srcdir)/doc/epm.list.man $(mandir)/man5/epm.list.5
 	$(RM) $(mandir)/man5/setup.types.5
 	$(CP) $(srcdir)/doc/setup.types.man $(mandir)/man5/setup.types.5
-	echo Installing EPM documentation in $(docdir)
+	@echo Installing EPM documentation in $(docdir)
 	-$(MKDIR) $(docdir)
 	$(RM) $(docdir)/COPYING
 	$(CP) $(srcdir)/COPYING $(docdir)
@@ -205,7 +201,7 @@
 	$(CP) $(srcdir)/doc/epm-book.html $(docdir)
 
 install-guis:	setup uninst
-	echo Installing EPM setup/uninst in $(libdir)/epm
+	@echo Installing EPM setup/uninst in $(libdir)/epm
 	$(RM) -r $(libdir)/epm
 	-$(MKDIR) $(libdir)/epm
 	$(CP) setup $(libdir)/epm
@@ -214,7 +210,7 @@
 	-$(STRIP) $(libdir)/epm/uninst
 
 install-osx:
-	echo Installing EPM OSX data files in $(datadir)/epm
+	@echo Installing EPM OSX data files in $(datadir)/epm
 	$(RM) -r $(datadir)/epm
 	-$(MKDIR) $(datadir)/epm
 	$(CP) macosx/setup.icns $(datadir)/epm
@@ -228,23 +224,23 @@
 #
 
 uninstall:
-	echo Uninstalling EPM programs from $(bindir)
+	@echo Uninstalling EPM programs from $(bindir)
 	$(RM) $(bindir)/epm
 	$(RM) $(bindir)/epminstall
 	$(RM) $(bindir)/mkepmlist
-	echo Uninstalling EPM manpages from $(mandir)/man1
+	@echo Uninstalling EPM manpages from $(mandir)/man1
 	$(RM) $(mandir)/man1/epm.1
 	$(RM) $(mandir)/man1/epminstall.1
 	$(RM) $(mandir)/man1/mkepmlist.1
 	$(RM) $(mandir)/man1/setup.1
-	echo Uninstalling EPM manpages from $(mandir)/man5
+	@echo Uninstalling EPM manpages from $(mandir)/man5
 	$(RM) $(mandir)/man5/epm.list.5
 	$(RM) $(mandir)/man5/setup.types.5
-	echo Uninstalling EPM documentation from $(docdir)
+	@echo Uninstalling EPM documentation from $(docdir)
 	$(RM) -r $(docdir)
-	echo Uninstalling EPM setup/uninstall from $(libdir)/epm
+	@echo Uninstalling EPM setup/uninstall from $(libdir)/epm
 	$(RM) -r $(libdir)/epm
-	echo Uninstalling EPM OSX data files from $(datadir)/epm
+	@echo Uninstalling EPM OSX data files from $(datadir)/epm
 	$(RM) -r $(datadir)/epm
 
 
@@ -281,15 +277,15 @@
 #
 
 test:	$(TARGETS)
-	echo Starting portable distribution build test...
-	if ./epm -vv epm >test.log; then \
+	@echo Starting portable distribution build test...
+	@if ./epm -vv epm >test.log; then \
 		echo Portable distribution build test PASSED.; \
 	else \
 		echo Portable distribution build test FAILED.; \
 		cat test.log; \
 	fi
-	echo Starting native distribution build test...
-	if ./epm -vv -s doc/epmlogo.tif -f native epm >test.log; then \
+	@echo Starting native distribution build test...
+	@if ./epm -vv -s doc/epmlogo.tif -f native epm >test.log; then \
 		echo Native distribution build test PASSED.; \
 	else \
 		echo Native distribution build test FAILED.; \
@@ -343,7 +339,6 @@
 #
 
 libepm.a:	$(EPM_OBJS)
-	echo Archiving libepm.a...
 	$(RM) libepm.a
 	$(AR) $(ARFLAGS) libepm.a $(EPM_OBJS)
 	$(RANLIB) libepm.a
@@ -356,7 +351,6 @@
 #
 
 epm:	epm.o $(EPM_OBJS)
-	echo Linking epm...
 	$(CC) $(LDFLAGS) -o epm epm.o libepm.a $(LIBS)
 
 epm.o:	epm.h epmstring.h
@@ -367,7 +361,6 @@
 #
 
 epminstall:	epminstall.o libepm.a
-	echo Linking epminstall...
 	$(CC) $(LDFLAGS) -o epminstall epminstall.o libepm.a $(LIBS)
 
 epminstall.o:	epm.h epmstring.h
@@ -378,7 +371,6 @@
 #
 
 mkepmlist:	mkepmlist.o libepm.a
-	echo Linking mkepmlist...
 	$(CC) $(LDFLAGS) -o mkepmlist mkepmlist.o libepm.a $(LIBS)
 
 mkepmlist.o:	epm.h epmstring.h
@@ -389,7 +381,6 @@
 #
 
 setup:	$(SETUP_OBJS) libepm.a
-	echo Linking setup...
 	$(CXX) $(LDFLAGS) -o setup $(SETUP_OBJS) libepm.a $(GUILIBS) $(LIBS)
 
 setup.o:	setup.h gui-common.h epmstring.h
@@ -402,7 +393,6 @@
 #
 
 uninst:	$(UNINST_OBJS) libepm.a
-	echo Linking uninst...
 	$(CXX) $(LDFLAGS) -o uninst $(UNINST_OBJS) libepm.a $(GUILIBS) $(LIBS)
 
 uninst.o:	uninst.h epmstring.h gui-common.h
