[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Attempt to beautify compilation



Hi,

I tried to streamline the compilation messages and I managed
to reduce the noise a bit. It is not as good as I wanted to,
but it is at least a beginning.

I added an option --enable-beauty=yes/no to reduce the
verbosity of gcc messages. The idea is that this option
introduces a variable QUIET, which is set to '@echo Compiling $@'
when the user wants to reduce the noise.

Besides that I changed the compilation in various places
to call $(QUIET)$(COMPILE) instead of $(COMPILE). Doing this,
the compilation shows things like

Compiling main.o
Compiling WPrefs.o
Compiling Appearance.o
Compiling Configurations.o
Compiling Expert.o
Compiling Focus.o

instead of the usual verbose messages.

But the problem is that I could not redefine the variable
COMPILE in a single place, and I had to modify lots of 
Makefile.am, and I still miss many messages from LIBTOOL
I guess. Therefore the compilation still has some noise,
and I have to make a better patch.

But here it goes, if somebody has a better way to reduce
the compilation messages please let me know.

diff --git a/configure.ac b/configure.ac
index 1915335..4855e24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -384,6 +384,19 @@ AC_ARG_ENABLE(lite,
   fi])
 
 
+dnl
+dnl Beautify compilation messages
+dnl ---------------------------------------------
+AC_ARG_ENABLE(beauty,
+  [  --enable-beauty           Disable verbose gcc messages during compilation ],
+  [if test x$enableval = xyes; then
+        QUIET='@echo Compiling $@;'
+	else
+	QUIET=
+        AC_SUBST(QUIET)
+  fi])
+
+
 
 dnl
 dnl Networking stuff



diff --git a/WINGs/Examples/Makefile.am b/WINGs/Examples/Makefile.am
index 4a84abf..85f6690 100644
--- a/WINGs/Examples/Makefile.am
+++ b/WINGs/Examples/Makefile.am
@@ -30,3 +30,11 @@ INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
 
 
+.c.o:
+	$(QUIET)$(COMPILE) -c $<
+
+.c.obj:
+	$(QUIET)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(QUIET)$(LTCOMPILE) -c -o $@ $<
diff --git a/WINGs/Extras/Makefile.am b/WINGs/Extras/Makefile.am
index eb96ebf..694f608 100644
--- a/WINGs/Extras/Makefile.am
+++ b/WINGs/Extras/Makefile.am
@@ -32,3 +32,11 @@ LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
 
 test_LDADD = wtableview.o wtabledelegates.o $(LDADD)
 
+.c.o:
+	$(QUIET)$(COMPILE) -c $<
+
+.c.obj:
+	$(QUIET)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(QUIET)$(LTCOMPILE) -c -o $@ $<
diff --git a/WINGs/Makefile.am b/WINGs/Makefile.am
index b27ad32..5e1cc1c 100644
--- a/WINGs/Makefile.am
+++ b/WINGs/Makefile.am
@@ -127,3 +127,12 @@ install-exec-local:
 	    $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/; \
 	  else :; fi; \
 	done
+
+.c.o:
+	$(QUIET)$(COMPILE) -c $<
+
+.c.obj:
+	$(QUIET)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(QUIET)$(LTCOMPILE) -c -o $@ $<
diff --git a/WINGs/Tests/Makefile.am b/WINGs/Tests/Makefile.am
index 96842c5..cc7d133 100644
--- a/WINGs/Tests/Makefile.am
+++ b/WINGs/Tests/Makefile.am
@@ -19,4 +19,11 @@ INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@ \
 	-DDEBUG
 
+.c.o:
+	$(QUIET)$(COMPILE) -c $<
 
+.c.obj:
+	$(QUIET)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(QUIET)$(LTCOMPILE) -c -o $@ $<
diff --git a/WINGs/WINGs/Makefile.am b/WINGs/WINGs/Makefile.am
index eb725be..23a1223 100644
--- a/WINGs/WINGs/Makefile.am
+++ b/WINGs/WINGs/Makefile.am
@@ -7,3 +7,11 @@ includedir = @includedir@/WINGs
 
 include_HEADERS = WINGs.h WUtil.h WINGsP.h proplist-compat.h
 
+.c.o:
+	$(QUIET)$(COMPILE) -c $<
+
+.c.obj:
+	$(QUIET)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(QUIET)$(LTCOMPILE) -c -o $@ $<
diff --git a/WPrefs.app/Makefile.am b/WPrefs.app/Makefile.am
index 37269f9..71e365b 100644
--- a/WPrefs.app/Makefile.am
+++ b/WPrefs.app/Makefile.am
@@ -55,4 +55,11 @@ WPrefs_LDADD = \
 	$(top_builddir)/wrlib/libwraster.la \
 	@XFTLIBS@ \
 	@INTLIBS@
+.c.o:
+	$(QUIET)$(COMPILE) -c $<
 
+.c.obj:
+	$(QUIET)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(QUIET)$(LTCOMPILE) -c -o $@ $<
diff --git a/WindowMaker/Makefile.am b/WindowMaker/Makefile.am
index a7d24f5..3ecf663 100644
--- a/WindowMaker/Makefile.am
+++ b/WindowMaker/Makefile.am
@@ -57,4 +57,11 @@ prefsdata_DATA =\
 
 EXTRA_DIST = $(prefsdata_DATA) mkMakefile
 
+.c.o:
+	$(QUIET)$(COMPILE) -c $<
 
+.c.obj:
+	$(QUIET)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(QUIET)$(LTCOMPILE) -c -o $@ $<
diff --git a/src/Makefile.am b/src/Makefile.am
index 2e72037..b05a729 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -134,3 +134,11 @@ wmaker_LDADD = \
 #	@INTLIBS@ \
 #	@DLLIBS@
 
+.c.o:
+	$(QUIET)$(COMPILE) -c $<
+
+.c.obj:
+	$(QUIET)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(QUIET)$(LTCOMPILE) -c -o $@ $<
diff --git a/test/Makefile.am b/test/Makefile.am
index f57584f..f782e3f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -13,3 +13,11 @@ wtest_LDADD = $(top_builddir)/wmlib/libWMaker.a @XLFLAGS@ @XLIBS@
 
 INCLUDES = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib 
 
+.c.o:
+	$(QUIET)$(COMPILE) -c $<
+
+.c.obj:
+	$(QUIET)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(QUIET)$(LTCOMPILE) -c -o $@ $<
diff --git a/util/Makefile.am b/util/Makefile.am
index c32327d..86eaa1c 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -70,3 +70,11 @@ wmaker.inst: $(srcdir)/wmaker.inst.in ./Makefile
 
 	chmod 755 wmaker.inst
 
+.c.o:
+	$(QUIET)$(COMPILE) -c $<
+
+.c.obj:
+	$(QUIET)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(QUIET)$(LTCOMPILE) -c -o $@ $<
diff --git a/wmlib/Makefile.am b/wmlib/Makefile.am
index 34cc11e..67ebe4c 100644
--- a/wmlib/Makefile.am
+++ b/wmlib/Makefile.am
@@ -26,3 +26,12 @@ install-exec-local:
 	    $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/; \
 	  else :; fi; \
 	done
+
+.c.o:
+	$(QUIET)$(COMPILE) -c $<
+
+.c.obj:
+	$(QUIET)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(QUIET)$(LTCOMPILE) -c -o $@ $<
diff --git a/wrlib/Makefile.am b/wrlib/Makefile.am
index f7a3428..f6be65c 100644
--- a/wrlib/Makefile.am
+++ b/wrlib/Makefile.am
@@ -48,10 +48,10 @@ COMPILE2=`echo $(COMPILE) | sed -e s/-fomit-frame-pointer//`
 
 # cant compile asm stuff with optimizations
 x86_specific.lo: x86_specific.c
-	$(LTCOMPILE2) -O0 -c $<
+	$(QUIET)$(LTCOMPILE2) -O0 -c $<
 
 x86_specific.o: x86_specific.c
-	$(COMPILE2) -O0 -c $<
+	$(QUIET)$(COMPILE2) -O0 -c $<
 
 
 INCLUDES = $(DFLAGS) @HEADER_SEARCH_PATH@
@@ -69,3 +69,13 @@ install-exec-local:
 	    $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/; \
 	  else :; fi; \
 	done
+
+.c.o:
+	$(QUIET)$(COMPILE) -c $<
+
+.c.obj:
+	$(QUIET)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(QUIET)$(LTCOMPILE) -c -o $@ $<
+
diff --git a/wrlib/tests/Makefile.am b/wrlib/tests/Makefile.am
index 0ed8e8a..364dd74 100644
--- a/wrlib/tests/Makefile.am
+++ b/wrlib/tests/Makefile.am
@@ -22,3 +22,11 @@ testrot_LDADD = $(LIBLIST)
 view_SOURCES= view.c
 view_LDADD = $(LIBLIST)
 
+.c.o:
+	$(QUIET)$(COMPILE) -c $<
+
+.c.obj:
+	$(QUIET)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(QUIET)$(LTCOMPILE) -c -o $@ $<


-- 
To unsubscribe, send mail to wmaker-dev-unsubscribe@lists.windowmaker.info.