[krb5-auth-dialog] cleanup CFLAG handling

[Guido Günther <guidog src gnome org>]

commit e394f9883966af1a76d13e250627056f4f86e941
Author: Guido Günther <agx sigxcpu org>
Date:   Mon May 11 00:45:55 2009 +0200

    cleanup CFLAG handling
    
    BZ: #581901
---
 ChangeLog               |   10 +++++++
 configure.ac            |   13 +-------
 preferences/Makefile.am |   28 ++++++++++++-------
 src/Makefile.am         |   67 +++++++++++++++++++++++++++++++---------------
 4 files changed, 74 insertions(+), 44 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 496a628..eb5b85d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Mon May 11 00:46:24 CEST 2009 Guido Günther <agx sigxcpu org>
+
+	cleanup CFLAGS handling, terminate all lists with $(NULL)
+	* configure.ac: don't set CFLAGS
+	* src/Makefile.am (krb5_auth_dialog_{CPP,C}FLAGS): set instead of
+	  CFLAGS
+	* preferences/Makefile.am (krb5_auth_dialog_preferenes_{CPP,C}FLAGS):
+	  likewise
+	BZ: #581901 - based on a patch by Christian Persch
+
 Sun May 10 22:20:38 CEST 2009 Guido Günther <agx sigxcpu org>
 
 	update .gitignore files
diff --git a/configure.ac b/configure.ac
index 5818a78..e8b88fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,6 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
 
 AM_GLIB_GNU_GETTEXT
 
-
 AC_PROG_CC
 AC_ISC_POSIX
 AC_HEADER_STDC
@@ -22,6 +21,8 @@ AM_PROG_LIBTOOL
 AM_PROG_LEX
 AC_PROG_YACC
 
+AM_PROG_CC_C_O
+
 KA_COMPILE_WARNINGS([maximum])
 
 GTK_REQUIRED="2.16.0"
@@ -199,16 +200,6 @@ AC_DEFINE_UNQUOTED(MINUTES_BEFORE_PROMPTING,[$minimum_lifetime],
 		    fresh credentials.])
 AC_SUBST(minimum_lifetime)
 
-CFLAGS="\
-	$GTK_CFLAGS \
-	$DBUS_CFLAGS \
-	$GCONF_CFLAGS \
-	$KRB5_CFLAGS \
-	$NETWORK_MANAGER_CFLAGS \
-	$LIBNOTIFY_CFLAGS \
-	$WARN_CFLAGS \
-	$CFLAGS"
-
 AC_OUTPUT([
 Makefile
 krb5-auth-dialog.spec
diff --git a/preferences/Makefile.am b/preferences/Makefile.am
index f3d971f..a0d8a03 100644
--- a/preferences/Makefile.am
+++ b/preferences/Makefile.am
@@ -1,25 +1,31 @@
 NULL =
 
-INCLUDES = \
-	-I $(top_srcdir)/src/ \
-	-DKA_DATA_DIR=\""$(pkgdatadir)"\" \
-	-DLOCALE_DIR=\""$(localedir)/"\" \
-	$(NULL)
-
 bin_PROGRAMS = krb5-auth-dialog-preferences
 
 schemadir = $(sysconfdir)/gconf/schemas
 
 krb5_auth_dialog_preferences_SOURCES = \
 	krb5-auth-dialog-preferences.c \
-	../src/krb5-auth-gconf-tools.c \
-	../src/krb5-auth-gconf-tools.h \
+	$(top_srcdir)/src/krb5-auth-gconf-tools.c \
+	$(top_srcdir)/src/krb5-auth-gconf-tools.h \
 	$(NULL)
 
+krb5_auth_dialog_preferences_CPPFLAGS = \
+	-I$(top_srcdir)/src \
+	-DKA_DATA_DIR=\""$(pkgdatadir)"\" \
+	-DLOCALE_DIR=\""$(localedir)/"\"
+	$(AM_CPPFLAGS)
+
+krb5_auth_dialog_preferences_CFLAGS = \
+	$(GTK_CFLAGS) \
+	$(GCONF_CFLAGS) \
+	$(AM_CFLAGS)
+
+
 krb5_auth_dialog_preferences_LDADD = \
-			@GCONF_LIBS@ \
-			@GTK_LIBS@ \
-			$(NULL)
+	$(GCONF_LIBS) \
+	$(GTK_LIBS) \
+	$(NULL)
 
 AM_CPPFLAGS = \
 	$(DISABLE_DEPRECATED) \
diff --git a/src/Makefile.am b/src/Makefile.am
index cb6d09f..f6903e1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,5 @@
 NULL =
 
-INCLUDES = \
-	-DKA_DATA_DIR=\""$(pkgdatadir)"\" \
-	-DLOCALE_DIR=\""$(localedir)/"\"
-
 bin_PROGRAMS = krb5-auth-dialog
 man_MANS = krb5-auth-dialog.1
 
@@ -39,21 +35,44 @@ krb5_auth_dialog_SOURCES =	\
 	krb5-auth-gconf-tools.h	\
 	krb5-auth-dbus.c	\
 	krb5-auth-dbus.h	\
-	dummy-strings.c
+	dummy-strings.c		\
+	$(NULL)
+
+krb5_auth_dialog_CPPFLAGS = \
+	-I$(top_srcdir)/gtksecentry \
+	-I$(top_srcdir)/secmem \
+	-DKA_DATA_DIR=\""$(pkgdatadir)"\" \
+	-DLOCALE_DIR=\""$(localedir)/"\"
+	$(AM_CPPFLAGS) \
+	$(NULL)
+
+krb5_auth_dialog_CFLAGS = \
+	$(GTK_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	$(GCONF_CFLAGS) \
+	$(KRB5_CFLAGS) \
+	$(NETWORK_MANAGER_CFLAGS) \
+	$(LIBNOTIFY_CFLAGS) \
+	$(WARN_CFLAGS) \
+	$(AM_CFLAGS) \
+	$(NULL)
 
 krb5_auth_dialog_LDADD = \
-			../gtksecentry/libgtksecentry.a \
-			../secmem/libsecmem.a \
-			@NETWORK_MANAGER_LIBS@ \
-			@KRB5_LIBS@ \
-			@LIBNOTIFY_LIBS@ \
-			@DBUS_LIBS@ \
-			@GCONF_LIBS@ \
-			@GIO_LIBS@ \
-			@GTK_LIBS@
+	$(top_builddir)/gtksecentry/libgtksecentry.a \
+	$(top_builddir)/secmem/libsecmem.a \
+	$(NETWORK_MANAGER_LIBS) \
+	$(LIBCAP) \
+	$(KRB5_LIBS) \
+	$(LIBNOTIFY_LIBS) \
+	$(DBUS_LIBS) \
+	$(GCONF_LIBS) \
+	$(GIO_LIBS) \
+	$(GTK_LIBS) \
+	$(NULL)
 
 BUILT_SOURCES = \
-	krb5-auth-applet-dbus-glue.h
+	krb5-auth-applet-dbus-glue.h \
+	$(NULL)
 
 krb5-auth-applet-dbus-glue.h: $(srcdir)/krb5-auth-applet-dbus.xml
 	dbus-binding-tool                 \
@@ -68,18 +87,22 @@ AM_CPPFLAGS = \
 	$(NULL)
 
 pkgdatadir = $(datadir)/krb5-auth-dialog
-pkgdata_DATA =			\
-	krb5-auth-dialog.xml
+pkgdata_DATA = \
+	krb5-auth-dialog.xml \
+	$(NULL)
 
-EXTRA_DIST =		\
-	$(pkgdata_DATA)   \
+EXTRA_DIST = \
+	$(pkgdata_DATA) \
 	$(schema_in_files) \
 	$(autostart_in_files) \
 	$(service_in_files) \
 	$(srcdir)/krb5-auth-applet-dbus.xml \
-	krb5-auth-dialog.1.in
+	krb5-auth-dialog.1.in \
+	$(NULL)
 
 CLEANFILES = $(schema_DATA) $(service_DATA)
 DISTCLEANFILES = \
-	krb5-auth-dialog.desktop 	\
-	krb5-auth-applet-dbus-glue.h
+	krb5-auth-dialog.desktop \
+	krb5-auth-applet-dbus-glue.h \
+	$(NULL)
+