[galeon] Quiet compilation, take 2

From: Fabio Bonelli <fabiob src gnome org>
To: commits-list gnome org
Cc:
Subject: [galeon] Quiet compilation, take 2
Date: Sun, 2 May 2010 15:31:58 +0000 (UTC)
commit 974d2abc2445ca2a03b3815e2894307f886cb125
Author: Fabio Bonelli <fabiob src gnome org>
Date:   Sun May 2 16:56:41 2010 +0200

    Quiet compilation, take 2
    
    Complete the support for quiet compilation.

 bookmarks/Makefile.am       |    4 ++--
 configure.in                |   10 ++++++----
 embed/Makefile.am           |    2 +-
 libegg/Makefile.am          |    4 ++--
 libegg/dock/egg-dock-item.c |    2 +-
 mozilla/Makefile.am         |    8 +++++++-
 src/Makefile.am             |   20 +++++++++++---------
 utils/Makefile.am           |   10 ++++++++++
 8 files changed, 40 insertions(+), 20 deletions(-)
---
diff --git a/bookmarks/Makefile.am b/bookmarks/Makefile.am
index 8bcfeb9..2dbe262 100644
--- a/bookmarks/Makefile.am
+++ b/bookmarks/Makefile.am
@@ -122,8 +122,8 @@ DISTCLEANFILES = default-bookmarks.xbel
 
 # Quiet compilation
 LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LIBTOOL_ARG)
-LINK = $(Q) $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-        --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+LINK = $(QUIET_LD) $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+        --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS)          \
         $(LDFLAGS) -o $@
 
 .c.lo:
diff --git a/configure.in b/configure.in
index 7ecc6f0..892c4e1 100644
--- a/configure.in
+++ b/configure.in
@@ -368,9 +368,9 @@ _SAVE_LDFLAGS=$LDFLAGS
 #CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT $MOZILLA_COMPONENT_CFLAGS $GALEON_DEPENDENCY_CFLAGS"
 #CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT $MOZILLA_COMPONENT_CFLAGS"
 #LDFLAGS="$_SAVE_LDFLAGS $AM_LDFLAGS $MOZILLA_COMPONENT_LIBS"
-CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT `$PKG_CONFIG --cflags-only-I $MOZILLA-xpcom` $GALEON_DEPENDENCY_CFLAGS"
-CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT `pkg-config --cflags $MOZILLA-xpcom`"
-LDFLAGS="$_SAVE_LDFLAGS $AM_LDFLAGS `pkg-config --libs $MOZILLA-xpcom`"
+CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT `$PKG_CONFIG --cflags-only-I $MOZILLA-xpcom` `pkg-config --cflags-only-I nspr` $GALEON_DEPENDENCY_CFLAGS"
+CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT `pkg-config --cflags $MOZILLA-xpcom` `pkg-config --cflags nspr`"
+LDFLAGS="$_SAVE_LDFLAGS $AM_LDFLAGS `pkg-config --libs $MOZILLA-xpcom` `pkg-config --libs nspr`"
 
 
 TEST_MOZILLA_INCLUDE_DIRS="widget mimetype docshell history dom necko string layout gfx content js exthandler pipnss uriloader caps xpconnect nkcache fastfind gtkembedmoz chrome"
@@ -928,12 +928,14 @@ AC_ARG_ENABLE(quiet,
 	[
 		Q='@'
 		QUIET_CC='@echo "    CC $@";'
-		QUIET_CPP='@echo "    CPP$@";'
+		QUIET_CPP='@echo "    CPP $@";'
+		QUIET_LD='@echo "    LINK $@";'
 		LIBTOOL_ARG="--silent"
 
 		AC_SUBST(Q)
 		AC_SUBST(QUIET_CC)
 		AC_SUBST(QUIET_CPP)
+		AC_SUBST(QUIET_LD)
 		AC_SUBST(LIBTOOL_ARG)
 	])
 
diff --git a/embed/Makefile.am b/embed/Makefile.am
index 5a6b7fc..3b99338 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -55,7 +55,7 @@ EXTRA_DIST = $(nautilus_view_extra_dist)
 
 # Quiet compilation
 LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LIBTOOL_ARG)
-LINK = $(Q) $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+LINK = $(QUIET_LD) $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
         --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
         $(LDFLAGS) -o $@
 
diff --git a/libegg/Makefile.am b/libegg/Makefile.am
index f2177d7..e3640dc 100644
--- a/libegg/Makefile.am
+++ b/libegg/Makefile.am
@@ -51,8 +51,8 @@ regenerate-built-sources:
 
 # Quiet compilation
 LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LIBTOOL_ARG)
-LINK = $(Q) $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-        --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+LINK = $(QUIET_LD) $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+        --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS)          \
         $(LDFLAGS) -o $@
 
 .c.lo:
diff --git a/libegg/dock/egg-dock-item.c b/libegg/dock/egg-dock-item.c
index 5e45c19..de64e79 100644
--- a/libegg/dock/egg-dock-item.c
+++ b/libegg/dock/egg-dock-item.c
@@ -1154,7 +1154,7 @@ egg_dock_item_dock (EggDockObject    *object,
         {
             GEnumClass *enum_class = G_ENUM_CLASS (g_type_class_ref (EGG_TYPE_DOCK_PLACEMENT));
             GEnumValue *enum_value = g_enum_get_value (enum_class, position);
-            gchar *name = enum_value ? enum_value->value_name : NULL;
+            const gchar *name = enum_value ? enum_value->value_name : NULL;
             
             g_warning (("Unsupported docking strategy %s in dock object of type %s"),
                        name,  G_OBJECT_TYPE_NAME (object));
diff --git a/mozilla/Makefile.am b/mozilla/Makefile.am
index 09d6990..a8f6983 100644
--- a/mozilla/Makefile.am
+++ b/mozilla/Makefile.am
@@ -177,7 +177,13 @@ libmozillaembed_la_LIBADD = \
 	$(top_builddir)/embed/libembed.la
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LIBTOOL_ARG)
+CXXLINK = $(QUIET_LD) $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)     \
+          --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+          $(LDFLAGS) -o $@
 
 .cpp.lo:
-	$(QUIET_CPP) $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	$(QUIET_CPP)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 	$(Q) $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+.c.lo:
+	$(QUIET_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	$(Q)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
diff --git a/src/Makefile.am b/src/Makefile.am
index 3054324..afc40cc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,8 +12,10 @@ INCLUDES = \
 bin_PROGRAMS = galeon
 
 CXXLD = $(CXX)
-LINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-
+LINK = $(QUIET_LD) $(LIBTOOL) --mode=link $(CXXLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+galeon_LINK = $(QUIET_LD) $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+              --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS)         \
+              $(galeon_LDFLAGS) $(LDFLAGS) -o $@
 
 galeon_automation_interface_idl_sources = \
 	GaleonAutomation-common.c	  \
@@ -165,13 +167,13 @@ GaleonAutomation-common.c GaleonAutomation-stubs.c GaleonAutomation-skels.c Gale
 
 EXTRA_DIST = $(top_srcdir)/idl/GaleonAutomation.idl $(nautilus_view_extra_dist)
 
-
 # Quiet compilation
 LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LIBTOOL_ARG)
-LINK = $(Q) $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-        --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-        $(LDFLAGS) -o $@
 
-.c.lo:
-	$(QUIET_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-	$(Q)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+.c.o:
+	$(QUIET_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	$(Q)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+
+.cpp.o:
+	$(QUIET_CPP)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	$(Q)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 844edd5..9ef2265 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -118,3 +118,13 @@ Gtm-common.c Gtm-stubs.c Gtm.h: $(top_srcdir)/idl/Gtm.idl
 	$(ORBIT_IDL) --noskels $(top_srcdir)/idl/Gtm.idl 
 
 EXTRA_DIST = galeon-marshal.list $(top_srcdir)/idl/Gtm.idl $(nautilus_view_extra_dist)
+
+# Quiet compilation
+LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LIBTOOL_ARG)
+LINK = $(QUIET_LD) $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+        --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS)          \
+        $(LDFLAGS) -o $@
+
+.c.lo:
+	$(QUIET_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	$(Q)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]