GNOME.org
 

[gnome-session] build: Update all Makefile.am to more recent standards

commit 44ec4e3f38e733ad676fc3872574459ac2a0900f
Author: Vincent Untz <vuntz gnome org>
Date:   Mon Sep 20 17:40:40 2010 +0200

    build: Update all Makefile.am to more recent standards

 Makefile.am                     |   10 ++--
 capplet/Makefile.am             |   24 +++-----
 data/Makefile.am                |   44 ++++++++-------
 data/icons/16x16/Makefile.am    |   10 ++--
 data/icons/22x22/Makefile.am    |   10 ++--
 data/icons/24x24/Makefile.am    |   10 +--
 data/icons/32x32/Makefile.am    |   10 ++--
 data/icons/48x48/Makefile.am    |    8 +-
 data/icons/scalable/Makefile.am |    9 +--
 doc/dbus/Makefile.am            |   61 ++++++++-------------
 gnome-session/Makefile.am       |  118 ++++++++++++++++-----------------------
 tools/Makefile.am               |   15 +++--
 12 files changed, 145 insertions(+), 184 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d13cd85..db24224 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,15 +3,15 @@ SUBDIRS =			\
 	gnome-session		\
 	capplet			\
 	tools			\
-	po			\
+	data			\
 	doc			\
-	data
+	po
 
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST =                    \
-        HACKING                 \
-        MAINTAINERS
+EXTRA_DIST =		\
+	HACKING		\
+	MAINTAINERS
 
 MAINTAINERCLEANFILES = \
 	$(srcdir)/INSTALL \
diff --git a/capplet/Makefile.am b/capplet/Makefile.am
index 4d69ffb..7cbb60c 100644
--- a/capplet/Makefile.am
+++ b/capplet/Makefile.am
@@ -1,24 +1,15 @@
-NULL =
-
 bin_PROGRAMS = gnome-session-properties
 
-INCLUDES =						\
-	$(WARN_CFLAGS)					\
-	$(DISABLE_DEPRECATED_CFLAGS)			\
+AM_CPPFLAGS =						\
 	$(SESSION_PROPERTIES_CFLAGS)			\
 	$(GCONF_CFLAGS)					\
 	-I$(top_srcdir)/egg				\
 	-I$(top_srcdir)/gnome-session			\
 	-DLOCALE_DIR=\""$(datadir)/locale"\"		\
 	-DGTKBUILDER_DIR=\""$(pkgdatadir)"\"		\
-	$(NULL)
+	$(DISABLE_DEPRECATED_CFLAGS)
 
-gnome_session_properties_LDADD =			\
-	$(SESSION_PROPERTIES_LIBS)			\
-	$(top_builddir)/egg/libeggdesktopfile.la 	\
-	$(top_builddir)/gnome-session/libgsmutil.la 	\
-	$(GCONF_LIBS)					\
-	$(NULL)
+AM_CFLAGS = $(WARN_CFLAGS)
 
 gnome_session_properties_SOURCES =			\
 	main.c						\
@@ -31,7 +22,12 @@ gnome_session_properties_SOURCES =			\
 	gsp-app-manager.h				\
 	gsp-app-manager.c				\
 	gsp-keyfile.h					\
-	gsp-keyfile.c					\
-	$(NULL)
+	gsp-keyfile.c
+
+gnome_session_properties_LDADD =			\
+	$(SESSION_PROPERTIES_LIBS)			\
+	$(top_builddir)/egg/libeggdesktopfile.la 	\
+	$(top_builddir)/gnome-session/libgsmutil.la 	\
+	$(GCONF_LIBS)
 
 -include $(top_srcdir)/git.mk
diff --git a/data/Makefile.am b/data/Makefile.am
index 3037a1d..f023737 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,20 +1,25 @@
-NULL =
-
 SUBDIRS = icons
 
+bin_SCRIPTS = gnome-wm
+
 uidir = $(pkgdatadir)
 ui_DATA = \
 	session-properties.ui	\
-	gsm-inhibit-dialog.ui	\
-	$(NULL)
-
- INTLTOOL_DESKTOP_RULE@
+	gsm-inhibit-dialog.ui
 
 xsessiondir = $(datadir)/xsessions
 xsession_in_files = gnome.desktop.in
 xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
 
- INTLTOOL_SCHEMAS_RULE@
+desktopdir = $(datadir)/applications
+desktop_in_files = session-properties.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+if USE_GNOME_WM
+desktop_in_files += gnome-wm.desktop.in
+endif
+
+ INTLTOOL_DESKTOP_RULE@
 
 schemas_in_in_files = gnome-session.schemas.in.in
 schemas_in_files = $(schemas_in_in_files:.schemas.in.in=.schemas.in)
@@ -23,25 +28,22 @@ schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
 
 $(schemas_in_files): $(schemas_in_files).in Makefile
 	$(AM_V_GEN)sed \
-	     -e "s|\ DEFAULT_WM\@|$(DEFAULT_WM)|" \
-	     $< > $@
-
-bin_SCRIPTS = gnome-wm
+		-e "s|\ DEFAULT_WM\@|$(DEFAULT_WM)|" \
+		$< > $@
 
-desktopdir = $(datadir)/applications
-desktop_in_files = session-properties.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-if USE_GNOME_WM
-desktop_in_files += gnome-wm.desktop.in
-endif
+ INTLTOOL_SCHEMAS_RULE@
 
-install-data-local:
 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 >&1 > /dev/null; \
-	done \
+		for p in $(schemas_DATA) ; do \
+			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p ; \
+		done \
 	fi
+uninstall-local:
+	for p in $(schema_DATA) ; do \
+		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(top_builddir)/data/$$p ; \
+	done
 endif
 
 EXTRA_DIST =					\
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
index cac74c5..5694099 100644
--- a/data/icons/16x16/Makefile.am
+++ b/data/icons/16x16/Makefile.am
@@ -5,10 +5,6 @@ iconsdir = $(datadir)/icons/hicolor/$(size)/apps
 icons_DATA = session-properties.png
 icons_SOURCE = session-properties.svg
 
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(icons_SOURCE)
-
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
 install-data-hook:
@@ -16,8 +12,12 @@ install-data-hook:
 		echo "Updating Gtk icon cache."; \
 		$(gtk_update_icon_cache); \
 	else \
-		echo "*** Icon cache not updated.  After install, run this:"; \
+		echo "*** Icon cache not updated. After install, run this:"; \
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
 
+EXTRA_DIST =		\
+	$(icons_DATA)	\
+	$(icons_SOURCE)
+
 -include $(top_srcdir)/git.mk
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
index 6732cb3..ca40eab 100644
--- a/data/icons/22x22/Makefile.am
+++ b/data/icons/22x22/Makefile.am
@@ -5,10 +5,6 @@ iconsdir = $(datadir)/icons/hicolor/$(size)/apps
 icons_DATA = session-properties.png
 icons_SOURCE = session-properties.svg
 
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(icons_SOURCE)
-
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
 install-data-hook:
@@ -16,8 +12,12 @@ install-data-hook:
 		echo "Updating Gtk icon cache."; \
 		$(gtk_update_icon_cache); \
 	else \
-		echo "*** Icon cache not updated.  After install, run this:"; \
+		echo "*** Icon cache not updated. After install, run this:"; \
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
 
+EXTRA_DIST =		\
+	$(icons_DATA)	\
+	$(icons_SOURCE)
+
 -include $(top_srcdir)/git.mk
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
index bc01924..ceb5a2c 100644
--- a/data/icons/24x24/Makefile.am
+++ b/data/icons/24x24/Makefile.am
@@ -3,11 +3,6 @@ size = 24x24
 iconsdir = $(datadir)/icons/hicolor/$(size)/apps
 
 icons_DATA = session-properties.png
-icons_SOURCE =
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(icons_SOURCE)
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
@@ -16,8 +11,11 @@ install-data-hook:
 		echo "Updating Gtk icon cache."; \
 		$(gtk_update_icon_cache); \
 	else \
-		echo "*** Icon cache not updated.  After install, run this:"; \
+		echo "*** Icon cache not updated. After install, run this:"; \
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
 
+EXTRA_DIST =		\
+	$(icons_DATA)
+
 -include $(top_srcdir)/git.mk
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
index a74146c..0e71145 100644
--- a/data/icons/32x32/Makefile.am
+++ b/data/icons/32x32/Makefile.am
@@ -5,10 +5,6 @@ iconsdir = $(datadir)/icons/hicolor/$(size)/apps
 icons_DATA = session-properties.png
 icons_SOURCE = session-properties.svg
 
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(icons_SOURCE)
-
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
 install-data-hook:
@@ -16,8 +12,12 @@ install-data-hook:
 		echo "Updating Gtk icon cache."; \
 		$(gtk_update_icon_cache); \
 	else \
-		echo "*** Icon cache not updated.  After install, run this:"; \
+		echo "*** Icon cache not updated. After install, run this:"; \
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
 
+EXTRA_DIST =		\
+	$(icons_DATA)	\
+	$(icons_SOURCE)
+
 -include $(top_srcdir)/git.mk
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
index 6592923..818686b 100644
--- a/data/icons/48x48/Makefile.am
+++ b/data/icons/48x48/Makefile.am
@@ -4,9 +4,6 @@ iconsdir = $(datadir)/icons/hicolor/$(size)/apps
 
 icons_DATA = session-properties.png
 
-EXTRA_DIST =		\
-	$(icons_DATA)
-
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
 install-data-hook:
@@ -14,8 +11,11 @@ install-data-hook:
 		echo "Updating Gtk icon cache."; \
 		$(gtk_update_icon_cache); \
 	else \
-		echo "*** Icon cache not updated.  After install, run this:"; \
+		echo "*** Icon cache not updated. After install, run this:"; \
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
 
+EXTRA_DIST =		\
+	$(icons_DATA)
+
 -include $(top_srcdir)/git.mk
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
index d43139f..1f21314 100644
--- a/data/icons/scalable/Makefile.am
+++ b/data/icons/scalable/Makefile.am
@@ -4,10 +4,6 @@ iconsdir = $(datadir)/icons/hicolor/$(size)/apps
 
 icons_DATA = session-properties.svg
 
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(icons_SOURCE)
-
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
 install-data-hook:
@@ -15,8 +11,11 @@ install-data-hook:
 		echo "Updating Gtk icon cache."; \
 		$(gtk_update_icon_cache); \
 	else \
-		echo "*** Icon cache not updated.  After install, run this:"; \
+		echo "*** Icon cache not updated. After install, run this:"; \
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
 
+EXTRA_DIST =		\
+	$(icons_DATA)
+
 -include $(top_srcdir)/git.mk
diff --git a/doc/dbus/Makefile.am b/doc/dbus/Makefile.am
index a64871a..aedb24c 100644
--- a/doc/dbus/Makefile.am
+++ b/doc/dbus/Makefile.am
@@ -1,63 +1,48 @@
-NULL =
-
-SPEC_XML_FILES =			\
-	gnome-session.xml		\
-	org.gnome.SessionManager.ref.xml \
-	org.gnome.SessionManager.Client.ref.xml \
-	org.gnome.SessionManager.ClientPrivate.ref.xml \
-	org.gnome.SessionManager.Inhibitor.ref.xml \
-	org.gnome.SessionManager.Presence.ref.xml \
-	$(NULL)
+SPEC_XML_FILES =					\
+	gnome-session.xml				\
+	org.gnome.SessionManager.ref.xml		\
+	org.gnome.SessionManager.Client.ref.xml		\
+	org.gnome.SessionManager.ClientPrivate.ref.xml	\
+	org.gnome.SessionManager.Inhibitor.ref.xml	\
+	org.gnome.SessionManager.Presence.ref.xml
 
 if DOCBOOK_DOCS_ENABLED
 
 htmldocdir = $(docdir)/dbus
 htmldoc_DATA = gnome-session.html
 
-gnome-session.html : $(SPEC_XML_FILES)
+gnome-session.html: $(SPEC_XML_FILES)
 	$(AM_V_GEN)$(XMLTO) xhtml-nochunks -m $(top_srcdir)/doc/dbus/config.xsl gnome-session.xml
 
 endif # DOCBOOK_DOCS_ENABLED
 
-BUILT_SOURCES =	\
-	org.gnome.SessionManager.ref.xml \
-	org.gnome.SessionManager.Client.ref.xml \
-	org.gnome.SessionManager.ClientPrivate.ref.xml \
-	org.gnome.SessionManager.Inhibitor.ref.xml \
-	org.gnome.SessionManager.Presence.ref.xml \
-	$(NULL)
-
-org.gnome.SessionManager.ref.xml : $(top_srcdir)/gnome-session/org.gnome.SessionManager.xml spec-to-docbook.xsl
+org.gnome.SessionManager.ref.xml: $(top_srcdir)/gnome-session/org.gnome.SessionManager.xml spec-to-docbook.xsl
 	$(AM_V_GEN)$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
-org.gnome.SessionManager.Client.ref.xml : $(top_srcdir)/gnome-session/org.gnome.SessionManager.Client.xml spec-to-docbook.xsl
+org.gnome.SessionManager.Client.ref.xml: $(top_srcdir)/gnome-session/org.gnome.SessionManager.Client.xml spec-to-docbook.xsl
 	$(AM_V_GEN)$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
-org.gnome.SessionManager.ClientPrivate.ref.xml : $(top_srcdir)/gnome-session/org.gnome.SessionManager.ClientPrivate.xml spec-to-docbook.xsl
+org.gnome.SessionManager.ClientPrivate.ref.xml: $(top_srcdir)/gnome-session/org.gnome.SessionManager.ClientPrivate.xml spec-to-docbook.xsl
 	$(AM_V_GEN)$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
-org.gnome.SessionManager.Inhibitor.ref.xml : $(top_srcdir)/gnome-session/org.gnome.SessionManager.Inhibitor.xml spec-to-docbook.xsl
+org.gnome.SessionManager.Inhibitor.ref.xml: $(top_srcdir)/gnome-session/org.gnome.SessionManager.Inhibitor.xml spec-to-docbook.xsl
 	$(AM_V_GEN)$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
-org.gnome.SessionManager.Presence.ref.xml : $(top_srcdir)/gnome-session/org.gnome.SessionManager.Presence.xml spec-to-docbook.xsl
+org.gnome.SessionManager.Presence.ref.xml: $(top_srcdir)/gnome-session/org.gnome.SessionManager.Presence.xml spec-to-docbook.xsl
 	$(AM_V_GEN)$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
 
+BUILT_SOURCES =	\
+	org.gnome.SessionManager.ref.xml \
+	org.gnome.SessionManager.Client.ref.xml \
+	org.gnome.SessionManager.ClientPrivate.ref.xml \
+	org.gnome.SessionManager.Inhibitor.ref.xml \
+	org.gnome.SessionManager.Presence.ref.xml
+
 CLEANFILES =				\
-	$(BUILT_SOURCES)
+	$(BUILT_SOURCES)		\
+	$(htmldoc_DATA)
 
 EXTRA_DIST =				\
-	spec-to-docbook.xsl		\
 	gnome-session.xml.in		\
 	config.xsl			\
 	docbook.css			\
 	dbus-introspect-docs.dtd	\
-	$(NULL)
-
-
-MAINTAINERCLEANFILES =		\
-	*~			\
-	Makefile.in		\
-	$(NULL)
-
-clean-local:
-	rm -f *~
-	rm -f gnome-session.html
+	spec-to-docbook.xsl
 
-GITIGNOREFILES = gnome-session.html
 -include $(top_srcdir)/git.mk
diff --git a/gnome-session/Makefile.am b/gnome-session/Makefile.am
index 120505c..c3fb968 100644
--- a/gnome-session/Makefile.am
+++ b/gnome-session/Makefile.am
@@ -1,60 +1,14 @@
-NULL =
-
 bin_PROGRAMS = gnome-session
-
 noinst_LTLIBRARIES = libgsmutil.la
-
 noinst_PROGRAMS = 		\
 	test-client-dbus	\
-	test-inhibit		\
-	$(NULL)
+	test-inhibit
 
-INCLUDES =					\
-	$(WARN_CFLAGS)				\
-	$(DISABLE_DEPRECATED_CFLAGS)		\
-	$(SM_CFLAGS)				\
-	$(ICE_CFLAGS)				\
-	$(XEXT_CFLAGS)				\
+AM_CPPFLAGS =					\
 	$(GNOME_SESSION_CFLAGS)			\
-	$(GCONF_CFLAGS)				\
-	-I$(top_srcdir)/egg			\
-	-DLOCALE_DIR=\""$(datadir)/locale"\"	\
-	-DDATA_DIR=\""$(datadir)/gnome-session"\" \
-	-DDBUS_LAUNCH=\"dbus-launch\"		\
-	-DLIBEXECDIR=\"$(libexecdir)\"		\
-	-DGTKBUILDER_DIR=\""$(pkgdatadir)"\"		\
-	-DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" \
-	-DGCONFTOOL_CMD=\"$(GCONFTOOL)\"	\
-	-DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE
+	$(DISABLE_DEPRECATED_CFLAGS)
 
-test_inhibit_SOURCES = 	\
-	test-inhibit.c	\
-	$(NULL)
-
-test_inhibit_LDADD =				\
-	$(GNOME_SESSION_LIBS)			\
-	$(NULL)
-
-test_client_dbus_SOURCES = 	\
-	test-client-dbus.c	\
-	$(NULL)
-
-test_client_dbus_LDADD =			\
-	$(DBUS_GLIB_LIBS)			\
-	$(NULL)
-
-gnome_session_LDADD =				\
-	libgsmutil.la 				\
-	$(top_builddir)/egg/libeggdesktopfile.la \
-	$(SM_LIBS)				\
-	$(ICE_LIBS)				\
-	$(GNOME_SESSION_LIBS)			\
-	$(GCONF_LIBS)				\
-	$(XRENDER_LIBS)				\
-	$(XTEST_LIBS)				\
-	$(XEXT_LIBS)				\
-	$(EXECINFO_LIBS)			\
-	$(NULL)
+AM_CFLAGS = $(WARN_CFLAGS)
 
 gnome_session_SOURCES =				\
 	gsm-app.h				\
@@ -97,22 +51,54 @@ gnome_session_SOURCES =				\
 	gsm-session-save.c			\
 	gsm-session-save.h			\
 	gsm-xsmp-server.c			\
-	gsm-xsmp-server.h			\
-	$(NULL)
+	gsm-xsmp-server.h
 
-libgsmutil_la_LIBADD = 				\
-	$(GNOME_SESSION_LIBS)
+gnome_session_CPPFLAGS =			\
+	$(AM_CPPFLAGS)				\
+	$(SM_CFLAGS)				\
+	$(ICE_CFLAGS)				\
+	$(XEXT_CFLAGS)				\
+	$(GCONF_CFLAGS)				\
+	-I$(top_srcdir)/egg			\
+	-DLOCALE_DIR=\""$(datadir)/locale"\"	\
+	-DDATA_DIR=\""$(datadir)/gnome-session"\" \
+	-DLIBEXECDIR=\"$(libexecdir)\"		\
+	-DGTKBUILDER_DIR=\""$(pkgdatadir)"\"	\
+	-DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" \
+	-DGCONFTOOL_CMD=\"$(GCONFTOOL)\"	\
+	-DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE
+
+gnome_session_LDADD =				\
+	libgsmutil.la 				\
+	$(top_builddir)/egg/libeggdesktopfile.la \
+	$(SM_LIBS)				\
+	$(ICE_LIBS)				\
+	$(XRENDER_LIBS)				\
+	$(XTEST_LIBS)				\
+	$(XEXT_LIBS)				\
+	$(GNOME_SESSION_LIBS)			\
+	$(GCONF_LIBS)				\
+	$(EXECINFO_LIBS)
 
 libgsmutil_la_SOURCES =				\
 	gsm-util.c				\
 	gsm-util.h
 
+libgsmutil_la_LIBADD = 				\
+	$(GNOME_SESSION_LIBS)
+
+test_inhibit_SOURCES = test-inhibit.c
+test_inhibit_LDADD = $(GNOME_SESSION_LIBS)
+
+test_client_dbus_SOURCES = test-client-dbus.c
+test_client_dbus_LDADD = $(DBUS_GLIB_LIBS)
+
 gsm-marshal.c: gsm-marshal.list
 	$(AM_V_GEN)echo "#include \"gsm-marshal.h\"" > $@ && \
-	@GLIB_GENMARSHAL@ $< --prefix=gsm_marshal --body >> $@
+	$(GLIB_GENMARSHAL) $< --prefix=gsm_marshal --body >> $@
 
 gsm-marshal.h: gsm-marshal.list
-	$(AM_V_GEN)@GLIB_GENMARSHAL@ $< --prefix=gsm_marshal --header > $@
+	$(AM_V_GEN)$(GLIB_GENMARSHAL) $< --prefix=gsm_marshal --header > $@
 
 gsm-manager-glue.h: org.gnome.SessionManager.xml Makefile.am
 	$(AM_V_GEN)dbus-binding-tool --prefix=gsm_manager --mode=glib-server --output=gsm-manager-glue.h $(srcdir)/org.gnome.SessionManager.xml
@@ -130,31 +116,25 @@ gsm-presence-glue.h: org.gnome.SessionManager.Presence.xml Makefile.am
 	$(AM_V_GEN)dbus-binding-tool --prefix=gsm_presence --mode=glib-server --output=gsm-presence-glue.h $(srcdir)/org.gnome.SessionManager.Presence.xml
 
 BUILT_SOURCES =			\
-	gsm-marshal.c           \
-	gsm-marshal.h           \
+	gsm-marshal.c		\
+	gsm-marshal.h		\
 	gsm-manager-glue.h	\
 	gsm-presence-glue.h	\
 	gsm-inhibitor-glue.h	\
 	gsm-client-glue.h	\
-	gsm-app-glue.h		\
-	$(NULL)
-
-CLEANFILES =					\
-	$(BUILT_SOURCES)
+	gsm-app-glue.h
 
 EXTRA_DIST =						\
 	README						\
-	gsm-marshal.list        			\
+	gsm-marshal.list				\
 	org.gnome.SessionManager.xml			\
 	org.gnome.SessionManager.App.xml		\
 	org.gnome.SessionManager.Client.xml		\
 	org.gnome.SessionManager.ClientPrivate.xml	\
 	org.gnome.SessionManager.Inhibitor.xml		\
-	org.gnome.SessionManager.Presence.xml		\
-	$(NULL)
+	org.gnome.SessionManager.Presence.xml
 
-MAINTAINERCLEANFILES =                  \
-        *~                              \
-        Makefile.in
+CLEANFILES =	\
+	$(BUILT_SOURCES)
 
 -include $(top_srcdir)/git.mk
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 6d3813f..7110543 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,12 +1,16 @@
 bin_PROGRAMS = gnome-session-save
 
-INCLUDES =					\
-	$(WARN_CFLAGS)				\
-	$(DISABLE_DEPRECATED_CFLAGS)		\
+AM_CPPFLAGS =					\
 	$(GNOME_SESSION_CFLAGS)			\
 	$(DBUS_GLIB_CFLAGS)			\
 	$(GCONF_FLAGS)				\
-	-DLOCALE_DIR=\""$(datadir)/locale"\"
+	-DLOCALE_DIR=\""$(datadir)/locale"\"	\
+	$(DISABLE_DEPRECATED_CFLAGS)
+
+AM_CFLAGS = $(WARN_CFLAGS)
+
+gnome_session_save_SOURCES =			\
+	gnome-session-save.c
 
 gnome_session_save_LDADD =			\
 	$(SM_LIBS)				\
@@ -15,7 +19,4 @@ gnome_session_save_LDADD =			\
 	$(DBUS_GLIB_LIBS)			\
 	$(GCONF_LIBS)
 
-gnome_session_save_SOURCES =			\
-	gnome-session-save.c
-
 -include $(top_srcdir)/git.mk
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]