gnome-settings-daemon r94 - in trunk: . src

[jensg svn gnome org]

Author: jensg
Date: Sat Feb  2 12:41:25 2008
New Revision: 94
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=94&view=rev

Log:
2008-02-02  Jens Granseuer  <jensgr gmx net>

	* src/Makefile.am: remove duplicate CFLAGS (and NULL)


Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sat Feb  2 12:41:25 2008
@@ -1,5 +1,3 @@
-NULL =
-
 INCLUDES = \
 	-DDATADIR=\""$(datadir)"\"				\
 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"	\
@@ -7,14 +5,12 @@
 	-DGNOME_SETTINGS_PLUGINDIR=\""$(plugindir)"\"		\
 	$(WARN_CFLAGS)						\
 	$(DISABLE_DEPRECATED_CFLAGS)				\
-	$(SETTINGS_DAEMON_CFLAGS)				\
-	$(NULL)
+	$(SETTINGS_DAEMON_CFLAGS)
 
 gsddir = $(libexecdir)
 
 gsd_PROGRAMS = \
-	gnome-settings-daemon \
-	$(NULL)
+	gnome-settings-daemon
 
 gnome-settings-manager-glue.h: gnome-settings-manager.xml Makefile.am
 	dbus-binding-tool --prefix=gnome_settings_manager --mode=glib-server $< > $@
@@ -24,8 +20,7 @@
 
 BUILT_SOURCES = 			\
 	gnome-settings-manager-glue.h	\
-	gnome-settings-client.h		\
-	$(NULL)
+	gnome-settings-client.h
 
 Dbusapidir   = $(includedir)/gnome-settings-daemon-2.0/gnome-settings-daemon
 Dbusapi_DATA = gnome-settings-client.h
@@ -39,34 +34,26 @@
 	gnome-settings-plugins-engine.c	\
 	gnome-settings-plugins-engine.h	\
 	gnome-settings-module.c		\
-	gnome-settings-module.h		\
-	$(NULL)
+	gnome-settings-module.h
 
 gnome_settings_daemon_CPPFLAGS = \
-	$(AM_CPPFLAGS)			\
-	$(NULL)
+	$(AM_CPPFLAGS)
 
 gnome_settings_daemon_CFLAGS = 		\
-	$(AM_CFLAGS)			\
-	$(AM_CFLAGS)			\
-	$(NULL)
+	$(AM_CFLAGS)
 
 gnome_settings_daemon_LDFLAGS = 	\
-	$(AM_LDFLAGS)			\
-	$(NULL)
+	$(AM_LDFLAGS)
 
 gnome_settings_daemon_LDADD = 		\
-	$(SETTINGS_DAEMON_LIBS)		\
-	$(NULL)
+	$(SETTINGS_DAEMON_LIBS)
 
 EXTRA_DIST = 				\
 	$(Dbusapi_DATA)			\
-	gnome-settings-manager.xml	\
-	$(NULL)
+	gnome-settings-manager.xml
 
 CLEANFILES = 				\
-	$(BUILT_SOURCES)		\
-	$(NULL)
+	$(BUILT_SOURCES)
 
 
 # vim: ts=8