From 874d219834e4fda6edfbb6a6211f3ac4400df602 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Sun, 13 Jun 2010 19:35:51 +0200
Subject: build-sys: various build-system beautifications

---
 Makefile.am     | 10 +++++-----
 configure.ac    |  2 +-
 doc/Makefile.am |  2 +-
 src/Makefile.am |  8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index daa67cb..caf1be4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,11 +54,11 @@ schemas_DATA = libcanberra.schemas
 
 if GCONF_SCHEMAS_INSTALL
 install-data-local:
-                if test -z "$(DESTDIR)" ; then \
-                        for p in $(schemas_DATA) ; do \
-                                GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p ; \
-                        done \
-                fi
+	if test -z "$(DESTDIR)" ; then \
+		for p in $(schemas_DATA) ; do \
+			CONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p ; \
+                done \
+	fi
 else
 install-data-local:
 endif
diff --git a/configure.ac b/configure.ac
index 0a97e1f..a61ac11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,7 +63,7 @@ AC_USE_SYSTEM_EXTENSIONS
 
 AC_PROG_CXX
 
-DESIRED_FLAGS="-Wall -W -Wextra -pedantic -pipe -Wno-long-long -Winline -Wvla -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wpacked -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-noreturn -Wshadow -Wendif-labels -Wstrict-aliasing=2 -Wcast-align -Wwrite-strings -Wno-unused-parameter -ffast-math -Wp,-D_FORTIFY_SOURCE=2 -fno-common -fdiagnostics-show-option"
+DESIRED_FLAGS="-Wall -W -Wextra -pedantic -pipe -Wno-long-long -Winline -Wvla -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wpacked -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-noreturn -Wshadow -Wendif-labels -Wstrict-aliasing=2 -Wcast-align -Wwrite-strings -Wno-unused-parameter -ffast-math -Wp,-D_FORTIFY_SOURCE=2 -fno-common -fdiagnostics-show-option -fno-strict-aliasing"
 
 for flag in $DESIRED_FLAGS ; do
   CC_CHECK_CFLAGS([$flag], [CFLAGS="$CFLAGS $flag"])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 819a6f9..fae9958 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -24,7 +24,7 @@ CLEANFILES =
 
 if USE_LYNX
 README: README.html
-	lynx --dump $^ | sed 's,file://localhost/.*/doc/README.html,README,' > $@
+	$(AM_V_GEN)lynx --dump $^ | sed 's,file://localhost/.*/doc/README.html,README,' > $@
 
 CLEANFILES += README
 endif
diff --git a/src/Makefile.am b/src/Makefile.am
index e4cd68c..d1606fa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -400,14 +400,14 @@ CLEANFILES = \
 	libcanberra-logout-sound.sh
 
 libcanberra-logout-sound.sh: libcanberra-logout-sound.sh.in Makefile
-	sed -e 's,@bindir\@,$(bindir),g' < $< > $@
-	chmod +x $@
+	$(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' < $< > $@ && \
+		chmod +x $@
 
 libcanberra-login-sound.desktop: libcanberra-login-sound.desktop.in Makefile
-	sed -e 's,@bindir\@,$(bindir),g' < $< > $@
+	$(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' < $< > $@
 
 libcanberra-ready-sound.desktop: libcanberra-ready-sound.desktop.in Makefile
-	sed -e 's,@bindir\@,$(bindir),g' < $< > $@
+	$(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' < $< > $@
 
 endif
 
-- 
cgit