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

From: Vincent Untz <vuntz src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-panel] build: Update all Makefile.am to more recent standards
Date: Mon, 20 Sep 2010 15:51:41 +0000 (UTC)
commit ae6be22c37e19782f26032d42e4b9868ebfac988
Author: Vincent Untz <vuntz gnome org>
Date:   Mon Sep 20 17:49:38 2010 +0200

    build: Update all Makefile.am to more recent standards

 Makefile.am                                     |   12 +-
 applets/Makefile.am                             |   16 +--
 applets/clock/Makefile.am                       |  141 +++++++--------
 applets/clock/pixmaps/Makefile.am               |    2 +-
 applets/fish/Makefile.am                        |   86 +++++-----
 applets/notification_area/Makefile.am           |  120 ++++++-------
 applets/wncklet/Makefile.am                     |   75 ++++-----
 bonobo/idl/Makefile.am                          |    1 -
 bonobo/libpanel-applet/Makefile.am              |  122 +++++++-------
 bonobo/panel-module/Makefile.am                 |   53 +++---
 gnome-panel/Makefile.am                         |  210 +++++++++++------------
 gnome-panel/libegg/Makefile.am                  |   27 ++--
 gnome-panel/libpanel-applet-private/Makefile.am |   26 ++--
 gnome-panel/libpanel-util/Makefile.am           |   17 +-
 icons/16x16/Makefile.am                         |   18 +--
 icons/22x22/Makefile.am                         |   18 +--
 icons/24x24/Makefile.am                         |   13 +-
 icons/32x32/Makefile.am                         |   18 +--
 icons/48x48/Makefile.am                         |   18 +--
 icons/Makefile.am                               |    7 +-
 icons/scalable/Makefile.am                      |   17 +--
 libpanel-applet/Makefile.am                     |  129 +++++++--------
 man/Makefile.am                                 |    3 +-
 23 files changed, 523 insertions(+), 626 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b7a6a64..d658dc7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,12 @@
 SUBDIRS =			\
-	po 			\
-	icons			\
 	gnome-panel		\
 	libpanel-applet		\
 	applets			\
-	help			\
 	doc			\
-	man
+	help			\
+	icons			\
+	man			\
+	po
 
 if HAVE_BONOBO
 SUBDIRS += bonobo
@@ -14,6 +14,8 @@ endif
 
 ACLOCAL_AMFLAGS = -I m4
 
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection --disable-scrollkeeper
+
 EXTRA_DIST = \
 	COPYING-DOCS		\
 	HACKING			\
@@ -21,8 +23,6 @@ EXTRA_DIST = \
 	ChangeLog.pre-git	\
 	gnome-doc-utils.make
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-scrollkeeper --enable-introspection
-
 DISTCLEANFILES =		\
 	gnome-doc-utils.make
 
diff --git a/applets/Makefile.am b/applets/Makefile.am
index 28f243d..e1e952d 100644
--- a/applets/Makefile.am
+++ b/applets/Makefile.am
@@ -1,15 +1,7 @@
-SUBDIRS =		\
-	clock		\
-	fish		\
-	notification_area \
+SUBDIRS =			\
+	clock			\
+	fish			\
+	notification_area	\
 	wncklet
 
-
-# Remove any old gen_util .server files lying around.
-gen_util_server = $(libdir)/bonobo/servers/GNOME_GenUtilApplet_Factory.server
-install-data-local:
-	if test -f $(DESTDIR)$(gen_util_server); then \
-		rm -f $(DESTDIR)$(gen_util_server); \
-	fi
-
 -include $(top_srcdir)/git.mk
diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
index 4d76f04..e3cf76d 100644
--- a/applets/clock/Makefile.am
+++ b/applets/clock/Makefile.am
@@ -1,24 +1,26 @@
 SUBDIRS = pixmaps
 
-INCLUDES =							\
+noinst_LTLIBRARIES = libsystem-timezone.la
+noinst_PROGRAMS = test-system-timezone
+
+AM_CPPFLAGS =							\
+	$(LIBPANEL_APPLET_CFLAGS)				\
+	$(CLOCK_CFLAGS)						\
 	-I$(srcdir)/../../libpanel-applet			\
 	-I$(top_builddir)/libpanel-applet			\
-	$(DISABLE_DEPRECATED_CFLAGS)				\
-	$(GNOME_INCLUDEDIR)					\
-	$(WARN_CFLAGS)						\
-	$(CLOCK_CFLAGS)						\
-	$(POLKIT_CFLAGS)					\
-	$(LIBPANEL_APPLET_CFLAGS)				\
-	-DDATADIR=\""$(datadir)"\"				\
+	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
 	-DBUILDERDIR=\""$(uidir)"\"				\
-	-DCLOCK_MENU_UI_DIR=\""$(xmluidir)"\"                   \
+	-DCLOCK_MENU_UI_DIR=\""$(xmluidir)"\"			\
 	-DICONDIR=\""$(datadir)/gnome-panel/pixmaps"\"		\
-	-DLIBDIR=\""$(libdir)"\"				\
-	-DSYSCONFDIR=\""$(sysconfdir)"\"			\
-	-DPREFIX=\""$(prefix)"\"				\
-	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
 	-DCLOCK_EDS_ICONDIR="\"$(CLOCK_EDS_ICONDIR)\""		\
-	-DGWEATHER_I_KNOW_THIS_IS_UNSTABLE
+	-DGWEATHER_I_KNOW_THIS_IS_UNSTABLE			\
+	$(DISABLE_DEPRECATED_CFLAGS)
+
+AM_CFLAGS = $(WARN_CFLAGS)
+
+libsystem_timezone_la_SOURCES = \
+	system-timezone.c	\
+	system-timezone.h
 
 if HAVE_LIBECAL
 CALENDAR_SOURCES =		\
@@ -48,8 +50,6 @@ CLOCK_SOURCES = 		\
 	clock-utils.h		\
 	set-timezone.c		\
 	set-timezone.h		\
-	system-timezone.c	\
-	system-timezone.h	\
 	$(BUILT_SOURCES)	\
 	$(CALENDAR_SOURCES)
 
@@ -57,14 +57,34 @@ CLOCK_LDADD =						\
 	../../libpanel-applet/libpanel-applet-3.la	\
 	$(CLOCK_LIBS)					\
 	$(LIBPANEL_APPLET_LIBS)				\
-	$(POLKIT_LIBS)				\
-	-lgweather -lm
+	libsystem-timezone.la				\
+	-lm
 
-BUILT_SOURCES =					\
-	clock-marshallers.c			\
-	clock-marshallers.h			\
-	clock-typebuiltins.c			\
-	clock-typebuiltins.h
+test_system_timezone_SOURCES = 	\
+	test-system-timezone.c
+test_system_timezone_LDADD = $(CLOCK_LDADD) libsystem-timezone.la
+
+if CLOCK_INPROCESS
+APPLET_IN_PROCESS = true
+APPLET_LOCATION   = $(pkglibdir)/libclock-applet.so
+
+clock_appletlibdir = $(pkglibdir)
+clock_appletlib_LTLIBRARIES = libclock-applet.la
+libclock_applet_la_SOURCES = $(CLOCK_SOURCES)
+libclock_applet_la_LIBADD = $(CLOCK_LDADD)
+libclock_applet_la_LDFLAGS = -module -avoid-version
+libclock_applet_la_CFLAGS = $(AM_CFLAGS)
+$(libclock_applet_la_OBJECTS): $(BUILT_SOURCES)
+else
+APPLET_IN_PROCESS = false
+APPLET_LOCATION = $(libexecdir)/clock-applet
+
+libexec_PROGRAMS = clock-applet
+clock_applet_SOURCES = $(CLOCK_SOURCES)
+clock_applet_LDADD = $(CLOCK_LDADD)
+clock_applet_CFLAGS = $(AM_CFLAGS)
+$(clock_applet_OBJECTS): $(BUILT_SOURCES)
+endif
 
 clock-marshallers.c: clock-marshallers.list
 	$(AM_V_GEN)glib-genmarshal --prefix _clock_marshal --header --body --internal $< > $@
@@ -101,37 +121,13 @@ clock-typebuiltins.h: @REBUILD@ $(clock_enum_headers)
 			--fprod "\n/* --- @filename@ --- */" \
 			--eprod "#define CLOCK_TYPE_ ENUMSHORT@ @enum_name _get_type()\n" \
 			--eprod "GType @enum_name _get_type (void);\n" \
-		$(clock_enum_headers) >  $@
-
-if CLOCK_INPROCESS
-APPLET_IN_PROCESS = true
-APPLET_LOCATION   = $(pkglibdir)/libclock-applet.so
-
-clock_appletlibdir = $(pkglibdir)
-clock_appletlib_LTLIBRARIES = libclock-applet.la
-libclock_applet_la_SOURCES = $(CLOCK_SOURCES)
-libclock_applet_la_LIBADD = $(CLOCK_LDADD)
-libclock_applet_la_LDFLAGS = -module -avoid-version
-libclock_applet_la_CFLAGS =
-$(libclock_applet_la_OBJECTS): $(BUILT_SOURCES)
-
-libexec_PROGRAMS = 
-else
-APPLET_IN_PROCESS = false
-APPLET_LOCATION = $(libexecdir)/clock-applet
-
-libexec_PROGRAMS = clock-applet 
-clock_applet_SOURCES = $(CLOCK_SOURCES)
-clock_applet_LDADD = $(CLOCK_LDADD)
-clock_applet_CFLAGS =
-$(clock_applet_OBJECTS): $(BUILT_SOURCES)
-endif
-
-uidir		= $(datadir)/gnome-panel/ui
-ui_DATA		= clock.ui
+		$(clock_enum_headers) > $@
 
-xmluidir 	= $(datadir)/gnome-panel/ui
-xmlui_DATA	= clock-menu.xml
+BUILT_SOURCES =					\
+	clock-marshallers.c			\
+	clock-marshallers.h			\
+	clock-typebuiltins.c			\
+	clock-typebuiltins.h
 
 appletdir       = $(datadir)/gnome-panel/applets
 applet_in_files = org.gnome.panel.ClockApplet.panel-applet.in
@@ -139,10 +135,10 @@ applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
 $(applet_in_files): $(applet_in_files).in Makefile
 	$(AM_V_GEN)sed \
-            -e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
-            -e "s|\ IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \
-            -e "s|\ VERSION\@|$(PACKAGE_VERSION)|" \
-            $< > $@
+		-e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
+		-e "s|\ IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \
+		-e "s|\ VERSION\@|$(PACKAGE_VERSION)|" \
+		$< > $@
 
 @PANEL_INTLTOOL_PANEL_APPLET_RULE@
 
@@ -153,10 +149,16 @@ service_DATA     = $(service_in_files:.service.in=.service)
 
 org.gnome.panel.applet.ClockAppletFactory.service: $(service_in_files)
 	$(AM_V_GEN)sed \
-            -e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
-            $< > $@
+		-e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
+		$< > $@
 endif
 
+uidir		= $(datadir)/gnome-panel/ui
+ui_DATA		= clock.ui
+
+xmluidir 	= $(datadir)/gnome-panel/ui
+xmlui_DATA	= clock-menu.xml
+
 schemasdir       = $(GCONF_SCHEMA_FILE_DIR)
 schemas_in_files = clock.schemas.in
 schemas_DATA     = $(schemas_in_files:.schemas.in=.schemas)
@@ -164,29 +166,18 @@ schemas_DATA     = $(schemas_in_files:.schemas.in=.schemas)
 @INTLTOOL_SCHEMAS_RULE@
 
 if GCONF_SCHEMAS_INSTALL
-# don't do this if we are building in eg. rpm
 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)/applets/clock/$$p ; \
+			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/applets/clock/$$p ; \
 		done \
 	fi
-else
-install-data-local:
+uninstall-local:
+	for p in $(schema_DATA) ; do \
+		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(top_builddir)/applets/clock/$$p ; \
+	done
 endif
 
-noinst_PROGRAMS = test-system-timezone
-
-test_system_timezone_SOURCES = 	\
-	system-timezone.c	\
-	system-timezone.h	\
-	test-system-timezone.c	\
-	$(NULL)
-
-test_system_timezone_LDADD =	\
-	$(CLOCK_LDADD)		\
-	$(NULL)
-
 EXTRA_DIST =						\
 	org.gnome.panel.ClockApplet.panel-applet.in.in	\
 	$(schemas_in_files)				\
diff --git a/applets/clock/pixmaps/Makefile.am b/applets/clock/pixmaps/Makefile.am
index 353091d..26ce476 100644
--- a/applets/clock/pixmaps/Makefile.am
+++ b/applets/clock/pixmaps/Makefile.am
@@ -7,7 +7,7 @@ icon_DATA =				\
 	clock-face-small-day.svg	\
 	clock-face-small-evening.svg	\
 	clock-face-small-night.svg	\
-	clock-map.png		\
+	clock-map.png			\
 	clock-map-location-marker.png	\
 	clock-map-location-current.png	\
 	clock-map-location-hilight.png
diff --git a/applets/fish/Makefile.am b/applets/fish/Makefile.am
index 2edc145..157cc55 100644
--- a/applets/fish/Makefile.am
+++ b/applets/fish/Makefile.am
@@ -1,4 +1,6 @@
-INCLUDES =							\
+AM_CPPFLAGS =							\
+	$(LIBPANEL_APPLET_CFLAGS)				\
+	$(FISH_CFLAGS)						\
 	-I$(srcdir)						\
 	-I$(srcdir)/../../libpanel-applet			\
 	-I$(top_builddir)/libpanel-applet			\
@@ -6,10 +8,9 @@ INCLUDES =							\
 	-DFISH_ICONDIR=\""$(fishbitmapsdir)"\"			\
 	-DFISH_BUILDERDIR=\""$(uidir)"\"			\
 	-DFISH_MENU_UI_DIR=\""$(xmluidir)"\" 			\
-	$(WARN_CFLAGS)						\
-	$(DISABLE_DEPRECATED_CFLAGS)				\
-	$(FISH_CFLAGS)						\
-	$(LIBPANEL_APPLET_CFLAGS)
+	$(DISABLE_DEPRECATED_CFLAGS)
+
+AM_CFLAGS = $(WARN_CFLAGS)
 
 FISH_SOURCES = fish.c
 
@@ -27,7 +28,7 @@ fish_applet_lib_LTLIBRARIES = libfish-applet.la
 libfish_applet_la_SOURCES = $(FISH_SOURCES)
 libfish_applet_la_LIBADD = $(FISH_LDADD)
 libfish_applet_la_LDFLAGS = -module -avoid-version
-libfish_applet_la_CFLAGS =
+libfish_applet_la_CFLAGS = $(AM_CFLAGS)
 else
 APPLET_IN_PROCESS = false
 APPLET_LOCATION = $(libexecdir)/fish-applet
@@ -35,46 +36,19 @@ APPLET_LOCATION = $(libexecdir)/fish-applet
 libexec_PROGRAMS = fish-applet
 fish_applet_SOURCES = $(FISH_SOURCES)
 fish_applet_LDADD = $(FISH_LDADD)
-fish_applet_CFLAGS =
+fish_applet_CFLAGS = $(AM_CFLAGS)
 endif
 
-FISH_BITMAPS =		\
-	wanda.png	\
-	fishanim.png	\
-	oldwanda.png	\
-	footguy.png	\
-	monkey.png
-
-EXTRA_DIST =						\
-	wanda.svg					\
-	$(FISH_BITMAPS)					\
-	org.gnome.panel.FishApplet.panel-applet.in.in	\
-	$(service_in_files)				\
-	fish.schemas.in					\
-	$(ui_DATA)					\
-	$(xmlui_DATA)
-
-uidir		= $(datadir)/gnome-panel/ui
-ui_DATA		= fish.ui
-
-fishbitmapsdir = $(datadir)/gnome-panel/pixmaps
-fishbitmaps_DATA = $(FISH_BITMAPS)
-
-xmluidir 	= $(datadir)/gnome-panel/ui
-xmlui_DATA	= fish-menu.xml
-
-CLEANFILES = $(schemas_DATA) $(applet_DATA) $(applet_DATA).in $(service_DATA)
-
 appletdir       = $(datadir)/gnome-panel/applets
 applet_in_files = org.gnome.panel.FishApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
 $(applet_in_files): $(applet_in_files).in Makefile
 	$(AM_V_GEN)sed \
-	    -e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
-	    -e "s|\ IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \
-	    -e "s|\ VERSION\@|$(PACKAGE_VERSION)|" \
-	    $< > $@
+		-e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
+		-e "s|\ IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \
+		-e "s|\ VERSION\@|$(PACKAGE_VERSION)|" \
+		$< > $@
 
 @PANEL_INTLTOOL_PANEL_APPLET_RULE@
 
@@ -85,10 +59,24 @@ service_DATA     = $(service_in_files:.service.in=.service)
 
 org.gnome.panel.applet.FishAppletFactory.service: $(service_in_files)
 	$(AM_V_GEN)sed \
-	    -e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
-	    $< > $@
+		-e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
+		$< > $@
 endif
 
+fishbitmapsdir = $(datadir)/gnome-panel/pixmaps
+fishbitmaps_DATA = 	\
+	wanda.png	\
+	fishanim.png	\
+	oldwanda.png	\
+	footguy.png	\
+	monkey.png
+
+uidir		= $(datadir)/gnome-panel/ui
+ui_DATA		= fish.ui
+
+xmluidir 	= $(datadir)/gnome-panel/ui
+xmlui_DATA	= fish-menu.xml
+
 schemasdir       = $(GCONF_SCHEMA_FILE_DIR)
 schemas_in_files = fish.schemas.in
 schemas_DATA     = $(schemas_in_files:.schemas.in=.schemas)
@@ -96,15 +84,27 @@ schemas_DATA     = $(schemas_in_files:.schemas.in=.schemas)
 @INTLTOOL_SCHEMAS_RULE@
 
 if GCONF_SCHEMAS_INSTALL
-# don't do this if we are building in eg. rpm
 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)/applets/fish/$$p ; \
 	done \
 	fi
-else
-install-data-local:
+uninstall-local:
+	for p in $(schema_DATA) ; do \
+		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(top_builddir)/applets/fish/$$p ; \
+	done
 endif
 
+EXTRA_DIST =						\
+	wanda.svg					\
+	$(fishbitmaps_DATA)				\
+	org.gnome.panel.FishApplet.panel-applet.in.in	\
+	$(service_in_files)				\
+	fish.schemas.in					\
+	$(ui_DATA)					\
+	$(xmlui_DATA)
+
+CLEANFILES = $(schemas_DATA) $(applet_DATA) $(applet_DATA).in $(service_DATA)
+
 -include $(top_srcdir)/git.mk
diff --git a/applets/notification_area/Makefile.am b/applets/notification_area/Makefile.am
index 9e91025..c70ce9a 100644
--- a/applets/notification_area/Makefile.am
+++ b/applets/notification_area/Makefile.am
@@ -1,38 +1,45 @@
-INCLUDES =							\
+noinst_LTLIBRARIES = libtray.la
+noinst_PROGRAMS = testtray
+
+AM_CPPFLAGS =							\
+	$(NOTIFICATION_AREA_CFLAGS)				\
+	$(LIBPANEL_APPLET_CFLAGS)				\
 	-I$(srcdir)						\
 	-I$(srcdir)/../../libpanel-applet			\
 	-I$(top_builddir)/libpanel-applet			\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		\
-	$(GNOME_INCLUDEDIR)					\
-	$(WARN_CFLAGS)						\
-	$(DISABLE_DEPRECATED_CFLAGS)				\
-	$(NOTIFICATION_AREA_CFLAGS)				\
-	$(LIBPANEL_APPLET_CFLAGS)				\
 	-DG_LOG_DOMAIN=\""notification-area-applet"\"		\
-	-DPREFIX=\"$(prefix)\"					\
-	-DSYSCONFDIR=\"$(sysconfdir)\"				\
-	-DDATADIR=\"$(datadir)\"				\
-	-DLIBDIR=\"$(libdir)\"					\
-	-DNOTIFICATION_AREA_MENU_UI_DIR=\""$(uidir)"\"
-
-NOTIFICATION_AREA_SOURCES =		\
-	fixedtip.h				\
-	fixedtip.c				\
-	main.c					\
-	na-tray.c				\
-	na-tray.h				\
-	na-tray-child.c				\
-	na-tray-child.h				\
-	na-tray-manager.c			\
-	na-tray-manager.h			\
-	na-marshal.c				\
-	na-marshal.h
-
-NOTIFICATION_AREA_LDADD =			\
+	-DNOTIFICATION_AREA_MENU_UI_DIR=\""$(uidir)"\"		\
+	$(DISABLE_DEPRECATED_CFLAGS)
+
+AM_CFLAGS = $(WARN_CFLAGS)
+
+libtray_la_SOURCES =		\
+	fixedtip.h		\
+	fixedtip.c		\
+	na-marshal.c		\
+	na-marshal.h		\
+	na-tray.c		\
+	na-tray.h		\
+	na-tray-child.c		\
+	na-tray-child.h		\
+	na-tray-manager.c	\
+	na-tray-manager.h
+
+NOTIFICATION_AREA_SOURCES = main.c
+
+NOTIFICATION_AREA_LDADD =				\
 	../../libpanel-applet/libpanel-applet-3.la	\
 	$(X_LIBS)					\
 	$(NOTIFICATION_AREA_LIBS)			\
-	$(LIBPANEL_APPLET_LIBS)
+	$(LIBPANEL_APPLET_LIBS)				\
+	libtray.la
+
+testtray_SOURCES = testtray.c
+testtray_LDADD =			\
+	$(X_LIBS)			\
+	$(NOTIFICATION_AREA_LIBS)	\
+	libtray.la
 
 if NOTIFICATION_AREA_INPROCESS
 APPLET_IN_PROCESS = true
@@ -43,7 +50,7 @@ notification_area_appletlib_LTLIBRARIES = libnotification-area-applet.la
 libnotification_area_applet_la_SOURCES = $(NOTIFICATION_AREA_SOURCES)
 libnotification_area_applet_la_LIBADD = $(NOTIFICATION_AREA_LDADD)
 libnotification_area_applet_la_LDFLAGS = -module -avoid-version
-libnotification_area_applet_la_CFLAGS =
+libnotification_area_applet_la_CFLAGS = $(AM_CFLAGS)
 else
 APPLET_IN_PROCESS = false
 APPLET_LOCATION   = $(libexecdir)/notification-area-applet
@@ -51,19 +58,28 @@ APPLET_LOCATION   = $(libexecdir)/notification-area-applet
 libexec_PROGRAMS = notification-area-applet
 notification_area_applet_SOURCES = $(NOTIFICATION_AREA_SOURCES)
 notification_area_applet_LDADD = $(NOTIFICATION_AREA_LDADD)
-notification_area_applet_CFLAGS =
+notification_area_applet_CFLAGS = $(AM_CFLAGS)
 endif
 
+na-marshal.h: na-marshal.list $(GLIB_GENMARSHAL)
+	$(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=_na_marshal > $@
+
+na-marshal.c: na-marshal.list $(GLIB_GENMARSHAL)
+	$(AM_V_GEN)echo "#include \"na-marshal.h\"" > $@ && \
+	$(GLIB_GENMARSHAL) $< --body --prefix=_na_marshal >> $@
+
+BUILT_SOURCES = na-marshal.c na-marshal.h
+
 appletdir       = $(datadir)/gnome-panel/applets
 applet_in_files = org.gnome.panel.NotificationAreaApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
 $(applet_in_files): $(applet_in_files).in Makefile
 	$(AM_V_GEN)sed \
-            -e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
-            -e "s|\ IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \
-            -e "s|\ VERSION\@|$(PACKAGE_VERSION)|" \
-            $< > $@
+		-e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
+		-e "s|\ IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \
+		-e "s|\ VERSION\@|$(PACKAGE_VERSION)|" \
+		$< > $@
 
 @PANEL_INTLTOOL_PANEL_APPLET_RULE@
 
@@ -74,8 +90,8 @@ service_DATA     = $(service_in_files:.service.in=.service)
 
 org.gnome.panel.applet.NotificationAreaAppletFactory.service: $(service_in_files)
 	$(AM_V_GEN)sed \
-            -e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
-            $< > $@
+		-e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
+		$< > $@
 endif
 
 uidir = $(datadir)/gnome-panel/ui
@@ -87,37 +103,9 @@ EXTRA_DIST =								\
 	$(service_in_files)						\
 	na-marshal.list
 
-BUILT_SOURCES = na-marshal.c na-marshal.h
-
-CLEANFILES =                                    \
-	$(applet_DATA) 				\
-	$(applet_DATA).in			\
+CLEANFILES =			\
+	$(applet_DATA) 		\
+	$(applet_DATA).in	\
 	$(service_DATA)
 
-na-marshal.h: na-marshal.list $(GLIB_GENMARSHAL)
-	$(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=_na_marshal > $@
-
-na-marshal.c: na-marshal.list $(GLIB_GENMARSHAL)
-	$(AM_V_GEN)echo "#include \"na-marshal.h\"" > $@ && \
-	$(GLIB_GENMARSHAL) $< --body --prefix=_na_marshal >> $@
-
-noinst_PROGRAMS = testtray
-
-testtray_SOURCES = \
-	fixedtip.h		\
-	fixedtip.c		\
-	na-marshal.c		\
-	na-marshal.h		\
-	na-tray.c		\
-	na-tray.h		\
-	na-tray-child.c		\
-	na-tray-child.h		\
-	na-tray-manager.c	\
-	na-tray-manager.h	\
-	testtray.c
-
-testtray_LDADD = \
-	$(X_LIBS)					\
-	$(PANEL_LIBS)
-
 -include $(top_srcdir)/git.mk
diff --git a/applets/wncklet/Makefile.am b/applets/wncklet/Makefile.am
index a66d121..7ade04c 100644
--- a/applets/wncklet/Makefile.am
+++ b/applets/wncklet/Makefile.am
@@ -1,20 +1,17 @@
-INCLUDES = \
-	-I$(top_builddir) \
-	-I$(top_builddir)/applets/wncklet \
-	-I$(top_srcdir)/libpanel-applet \
-	-I$(top_builddir)/libpanel-applet \
-	$(WNCKLET_CFLAGS) \
-	$(LIBPANEL_APPLET_CFLAGS) \
-	$(DISABLE_DEPRECATED_CFLAGS) \
-	$(WARN_CFLAGS) \
-	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-	-DPAGER_BUILDERDIR=\""$(uidir)"\" \
-	-DTASKLIST_BUILDERDIR=\""$(uidir)"\" \
-	-DWNCK_MENU_UI_DIR=\""$(xmluidir)"\" \
-	-DPREFIX=\"$(prefix)\" \
-        -DSYSCONFDIR=\"$(sysconfdir)\" \
-        -DDATADIR=\"$(datadir)\" \
-        -DLIBDIR=\"$(libdir)\"
+AM_CPPFLAGS =							\
+	$(LIBPANEL_APPLET_CFLAGS)				\
+	$(WNCKLET_CFLAGS)					\
+	-I$(top_builddir)					\
+	-I$(top_builddir)/applets/wncklet			\
+	-I$(top_srcdir)/libpanel-applet				\
+	-I$(top_builddir)/libpanel-applet			\
+	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
+	-DPAGER_BUILDERDIR=\""$(uidir)"\"			\
+	-DTASKLIST_BUILDERDIR=\""$(uidir)"\"			\
+	-DWNCK_MENU_UI_DIR=\""$(xmluidir)"\"			\
+	$(DISABLE_DEPRECATED_CFLAGS)
+
+AM_CFLAGS = $(WARN_CFLAGS)
 
 WNCKLET_SOURCES = \
 	wncklet.c \
@@ -28,8 +25,6 @@ WNCKLET_SOURCES = \
 	showdesktop.c \
 	showdesktop.h
 
-$(wnck_applet_OBJECTS): $(BUILT_SOURCES)
-
 WNCKLET_LDADD =						\
 	../../libpanel-applet/libpanel-applet-3.la	\
 	$(WNCKLET_LIBS)					\
@@ -44,7 +39,7 @@ wnck_appletlib_LTLIBRARIES = libwnck-applet.la
 libwnck_applet_la_SOURCES = $(WNCKLET_SOURCES)
 libwnck_applet_la_LIBADD = $(WNCKLET_LDADD)
 libwnck_applet_la_LDFLAGS = -module -avoid-version
-libwnck_applet_la_CFLAGS =
+libwnck_applet_la_CFLAGS = $(AM_CFLAGS)
 else
 APPLET_IN_PROCESS = false
 APPLET_LOCATION   = $(libexecdir)/wnck-applet
@@ -52,26 +47,19 @@ APPLET_LOCATION   = $(libexecdir)/wnck-applet
 libexec_PROGRAMS = wnck-applet
 wnck_applet_SOURCES = $(WNCKLET_SOURCES)
 wnck_applet_LDADD = $(WNCKLET_LDADD)
-wnck_applet_CFLAGS =
+wnck_applet_CFLAGS = $(AM_CFLAGS)
 endif
 
-EXTRA_DIST = \
-	org.gnome.panel.Wncklet.panel-applet.in.in \
-	$(service_in_files) \
-	$(xmlui_DATA) \
-	$(schemas_in_files) \
-	$(ui_DATA)
-
 appletdir       = $(datadir)/gnome-panel/applets
 applet_in_files = org.gnome.panel.Wncklet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
 $(applet_in_files): $(applet_in_files).in Makefile
 	$(AM_V_GEN)sed \
-            -e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
-            -e "s|\ IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \
-            -e "s|\ VERSION\@|$(PACKAGE_VERSION)|" \
-            $< > $@
+		-e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
+		-e "s|\ IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \
+		-e "s|\ VERSION\@|$(PACKAGE_VERSION)|" \
+		$< > $@
 
 @PANEL_INTLTOOL_PANEL_APPLET_RULE@
 
@@ -82,11 +70,12 @@ service_DATA     = $(service_in_files:.service.in=.service)
 
 org.gnome.panel.applet.WnckletFactory.service: $(service_in_files)
 	$(AM_V_GEN)sed \
-            -e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
-            $< > $@
+		-e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
+		$< > $@
 endif
 
-CLEANFILES = $(BUILT_SOURCES) $(schemas_DATA) $(applet_DATA) $(applet_DATA).in $(service_DATA)
+uidir   = $(datadir)/gnome-panel/ui
+ui_DATA = workspace-switcher.ui window-list.ui
 
 xmluidir    = $(datadir)/gnome-panel/ui
 xmlui_DATA  = \
@@ -102,19 +91,25 @@ schemas_DATA     = $(schemas_in_files:.schemas.in=.schemas)
 @INTLTOOL_SCHEMAS_RULE@
 
 if GCONF_SCHEMAS_INSTALL
-# don't do this if we are building in eg. rpm
 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)/applets/wncklet/$$p ; \
 		done \
 	fi
-else
-install-data-local:
+uninstall-local:
+	for p in $(schema_DATA) ; do \
+		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(top_builddir)/applets/wncklet/$$p ; \
+	done
 endif
 
-uidir   = $(datadir)/gnome-panel/ui
-ui_DATA = workspace-switcher.ui window-list.ui
+EXTRA_DIST = \
+	org.gnome.panel.Wncklet.panel-applet.in.in \
+	$(service_in_files) \
+	$(xmlui_DATA) \
+	$(schemas_in_files) \
+	$(ui_DATA)
 
+CLEANFILES = $(schemas_DATA) $(applet_DATA) $(applet_DATA).in $(service_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/bonobo/idl/Makefile.am b/bonobo/idl/Makefile.am
index 7c18d30..4d3dc6d 100644
--- a/bonobo/idl/Makefile.am
+++ b/bonobo/idl/Makefile.am
@@ -1,5 +1,4 @@
 idldir = $(datadir)/idl/gnome-panel-2.0
-
 idl_DATA = GNOME_Panel.idl
 
 EXTRA_DIST = $(idl_DATA)
diff --git a/bonobo/libpanel-applet/Makefile.am b/bonobo/libpanel-applet/Makefile.am
index 82def38..463d2eb 100644
--- a/bonobo/libpanel-applet/Makefile.am
+++ b/bonobo/libpanel-applet/Makefile.am
@@ -1,13 +1,23 @@
-INCLUDES =							\
+lib_LTLIBRARIES = libpanel-applet-2.la
+bin_PROGRAMS = panel-test-applets-bonobo
+noinst_PROGRAMS = test-bonobo-applet
+
+AM_CPPFLAGS =							\
+	$(LIBPANEL_APPLET_BONOBO_CFLAGS)			\
 	-I$(top_builddir)/bonobo/libpanel-applet		\
+	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
 	-DPANEL_APPLET_DATADIR=\""$(datadir)"\"			\
 	-DPANEL_APPLET_BUILDERDIR=\""$(uidir)"\"		\
-	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
-	$(LIBPANEL_APPLET_BONOBO_CFLAGS)			\
-	$(DISABLE_DEPRECATED_CFLAGS)				\
-	$(WARN_CFLAGS)
+	$(DISABLE_DEPRECATED_CFLAGS)
 
-lib_LTLIBRARIES = libpanel-applet-2.la
+AM_CFLAGS = $(WARN_CFLAGS)
+
+libpanel_appletincludedir = $(includedir)/panel-2.0
+libpanel_appletinclude_HEADERS =	\
+	panel-applet.h			\
+	panel-applet-gconf.h		\
+	panel-applet-enums.h		\
+	GNOME_Panel.h
 
 libpanel_applet_2_la_SOURCES =		\
 	panel-applet.h			\
@@ -30,13 +40,14 @@ libpanel_applet_2_la_LIBADD  = \
 	$(LIBPANEL_APPLET_BONOBO_LIBS) \
 	$(X_LIBS)
 
-libpanel_appletincludedir = $(includedir)/panel-2.0
+panel_test_applets_bonobo_LDADD   =	\
+	$(LIBPANEL_APPLET_BONOBO_LIBS)
 
-libpanel_appletinclude_HEADERS =	\
-	panel-applet.h			\
-	panel-applet-gconf.h		\
-	panel-applet-enums.h		\
-	GNOME_Panel.h
+test_bonobo_applet_LDADD =		\
+	$(LIBPANEL_APPLET_BONOBO_LIBS)	\
+	libpanel-applet-2.la
+
+$(libpanel_applet_2_la_OBJECTS) $(test_bonobo_applet_bonobo_OBJECTS): $(BUILT_SOURCES)
 
 CORBA_SRCLIST =			\
 	GNOME_Panel-stubs.c	\
@@ -47,35 +58,6 @@ CORBA_SRCLIST =			\
 $(CORBA_SRCLIST): $(top_srcdir)/bonobo/idl/GNOME_Panel.idl $(ORBIT_IDL)
 	$(AM_V_GEN)$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/bonobo/idl/GNOME_Panel.idl
 
-noinst_PROGRAMS = test-bonobo-applet
-
-bin_PROGRAMS = panel-test-applets-bonobo
-
-panel_test_applets_bonobo_LDFLAGS = -export-dynamic
-panel_test_applets_bonobo_LDADD   =	\
-	$(LIBPANEL_APPLET_BONOBO_LIBS)	\
-	libpanel-applet-2.la
-
-test_bonobo_applet_LDADD =	\
-	$(LIBPANEL_APPLET_BONOBO_LIBS)	\
-	libpanel-applet-2.la
-
-BUILT_SOURCES = \
-	$(CORBA_SRCLIST)	\
-	panel-applet-enums.c	\
-	panel-applet-enums.h	\
-	panel-applet-marshal.c	\
-	panel-applet-marshal.h
-
-$(libpanel_applet_2_la_OBJECTS) $(test_bonobo_applet_bonobo_OBJECTS): $(BUILT_SOURCES)
-
-EXTRA_DIST =					\
-	GNOME_Panel_TestApplet.server.in	\
-	panel-applet-marshal.list		\
-	libpanelapplet-2.0.pc.in		\
-	libpanelapplet-2.0-uninstalled.pc.in	\
-	panel-test-applets-bonobo.ui
-
 panel-applet-marshal.h: panel-applet-marshal.list $(GLIB_GENMARSHAL)
 	$(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=panel_applet_marshal > $@
 
@@ -87,46 +69,60 @@ panel_applet_enum_headers = $(top_srcdir)/libpanel-applet/panel-applet.h
 
 panel-applet-enums.c: @REBUILD@ $(panel_applet_enum_headers)
 	$(AM_V_GEN)glib-mkenums \
-		     --fhead "#include <glib-object.h>\n" \
-		     --fhead "#include \"panel-applet-enums.h\"\n\n" \
-		     --fprod "\n/* enumerations from \"@filename \" */" \
-		     --fprod "\n#include \"@filename \"\n" \
-		     --vhead "static const G Type@Value _ enum_name@_values[] = {" \
-		     --vprod "  { @VALUENAME@, \"@VALUENAME \", \"@valuenick \" }," \
-		     --vtail "  { 0, NULL, NULL }\n};\n\n" \
-		     --vtail "GType\n enum_name@_get_type (void)\n{\n" \
-		     --vtail "  static GType type = 0;\n\n" \
-		     --vtail "  if (!type)\n" \
-		     --vtail "    type = g_ type@_register_static (\"@EnumName \", _ enum_name@_values);\n\n" \
-		     --vtail "  return type;\n}\n\n" \
+			--fhead "#include <glib-object.h>\n" \
+			--fhead "#include \"panel-applet-enums.h\"\n\n" \
+			--fprod "\n/* enumerations from \"@filename \" */" \
+			--fprod "\n#include \"@filename \"\n" \
+			--vhead "static const G Type@Value _ enum_name@_values[] = {" \
+			--vprod "  { @VALUENAME@, \"@VALUENAME \", \"@valuenick \" }," \
+			--vtail "  { 0, NULL, NULL }\n};\n\n" \
+			--vtail "GType\n enum_name@_get_type (void)\n{\n" \
+			--vtail "  static GType type = 0;\n\n" \
+			--vtail "  if (!type)\n" \
+			--vtail "    type = g_ type@_register_static (\"@EnumName \", _ enum_name@_values);\n\n" \
+			--vtail "  return type;\n}\n\n" \
 		$(panel_applet_enum_headers) > $@
 
 panel-applet-enums.h: @REBUILD@ $(panel_applet_enum_headers)
 	$(AM_V_GEN)glib-mkenums \
-		     --fhead "#ifndef __PANEL_APPLET_ENUMS_H__\n" \
-		     --fhead "#define __PANEL_APPLET_ENUMS_H__\n\n" \
-		     --fhead "G_BEGIN_DECLS\n\n" \
-		     --ftail "G_END_DECLS\n\n" \
-		     --ftail "#endif /* __PANEL_APPLET_ENUMS_H__ */\n" \
-		     --fprod "\n/* --- @filename@ --- */" \
-		     --eprod "#define PANEL_TYPE_ ENUMNAME@ @enum_name _get_type()\n" \
-		     --eprod "GType @enum_name _get_type (void);\n" \
+			--fhead "#ifndef __PANEL_APPLET_ENUMS_H__\n" \
+			--fhead "#define __PANEL_APPLET_ENUMS_H__\n\n" \
+			--fhead "G_BEGIN_DECLS\n\n" \
+			--ftail "G_END_DECLS\n\n" \
+			--ftail "#endif /* __PANEL_APPLET_ENUMS_H__ */\n" \
+			--fprod "\n/* --- @filename@ --- */" \
+			--eprod "#define PANEL_TYPE_ ENUMNAME@ @enum_name _get_type()\n" \
+			--eprod "GType @enum_name _get_type (void);\n" \
 		$(panel_applet_enum_headers) > $@
 
+BUILT_SOURCES = \
+	$(CORBA_SRCLIST)	\
+	panel-applet-enums.c	\
+	panel-applet-enums.h	\
+	panel-applet-marshal.c	\
+	panel-applet-marshal.h
+
 uidir   = $(datadir)/gnome-panel/ui
 ui_DATA = panel-test-applets-bonobo.ui
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libpanelapplet-2.0.pc
 
-CLEANFILES = $(BUILT_SOURCES) $(noinst_DATA)
-
 serverdir       = $(libdir)/bonobo/servers
 server_in_files = GNOME_Panel_TestApplet.server.in
 noinst_DATA     = $(server_in_files:.server.in=.server)
 
 @INTLTOOL_SERVER_RULE@
 
+EXTRA_DIST =					\
+	GNOME_Panel_TestApplet.server.in	\
+	panel-applet-marshal.list		\
+	libpanelapplet-2.0.pc.in		\
+	libpanelapplet-2.0-uninstalled.pc.in	\
+	panel-test-applets-bonobo.ui
+
+CLEANFILES = $(BUILT_SOURCES) $(noinst_DATA)
+
 dist-hook:
 	cd $(distdir) ; rm -f $(CLEANFILES)
 
diff --git a/bonobo/panel-module/Makefile.am b/bonobo/panel-module/Makefile.am
index 2664ab6..5f21ae5 100644
--- a/bonobo/panel-module/Makefile.am
+++ b/bonobo/panel-module/Makefile.am
@@ -1,46 +1,36 @@
-NULL =
-
-module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload|query)'
-
 panelmodule_LTLIBRARIES = libpanel-applets-bonobo.la
 panelmoduledir = $(modulesdir)
 
-CORBA_SRCLIST =			\
-	GNOME_Panel-stubs.c	\
-	GNOME_Panel-skels.c	\
-	GNOME_Panel-common.c	\
-	GNOME_Panel.h		\
-	$(NULL)
-
-$(CORBA_SRCLIST): $(top_srcdir)/bonobo/idl/GNOME_Panel.idl $(ORBIT_IDL)
-	$(AM_V_GEN)$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/bonobo/idl/GNOME_Panel.idl
-
-BUILT_SOURCES = \
-	$(CORBA_SRCLIST)
-
 libpanel_applets_bonobo_la_SOURCES =	\
 	$(CORBA_SRCLIST)		\
 	panel-applets-bonobo-module.c	\
 	panel-applets-manager-bonobo.c	\
 	panel-applets-manager-bonobo.h	\
 	panel-applet-frame-bonobo.c	\
-	panel-applet-frame-bonobo.h	\
-	$(NULL)
+	panel-applet-frame-bonobo.h
 
-libpanel_applets_bonobo_la_CFLAGS =	\
+libpanel_applets_bonobo_la_CPPFLAGS =	\
+	$(BONOBO_CFLAGS)		\
 	-I$(top_srcdir)			\
 	-I$(top_srcdir)/gnome-panel	\
 	-I$(top_builddir)		\
-	-DDATADIR=\""$(datadir)"\"	\
-	$(BONOBO_CFLAGS)
+	-DDATADIR=\""$(datadir)"\"
 
-libpanel_applets_bonobo_la_LDFLAGS =	\
-	$(module_flags)			\
-	$(NULL)
+libpanel_applets_bonobo_la_LDFLAGS =				\
+	-export_dynamic -avoid-version -module -no-undefined	\
+	-export-symbols-regex '^g_io_module_(load|unload|query)'
 
 libpanel_applets_bonobo_la_LIBADD =	\
-	$(BONOBO_LIBS)			\
-	$(NULL)
+	$(BONOBO_LIBS)
+
+CORBA_SRCLIST =			\
+	GNOME_Panel-stubs.c	\
+	GNOME_Panel-skels.c	\
+	GNOME_Panel-common.c	\
+	GNOME_Panel.h
+
+$(CORBA_SRCLIST): $(top_srcdir)/bonobo/idl/GNOME_Panel.idl $(ORBIT_IDL)
+	$(AM_V_GEN)$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/bonobo/idl/GNOME_Panel.idl
 
 xmluidir   = $(datadir)/gnome-2.0/ui
 xmlui_DATA = GNOME_Panel_Popup.xml
@@ -49,8 +39,13 @@ install-data-hook:
 	if test -z "$(DESTDIR)" -a "$(GIO_QUERYMODULES)" != "no" ; then	\
 		$(GIO_QUERYMODULES) $(modulesdir) ;			\
 	fi
+uninstall-local:
+	if test "$(GIO_QUERYMODULES)" != "no" ; then	\
+		$(GIO_QUERYMODULES) $(modulesdir) ;	\
+	fi
+
+EXTRA_DIST = $(xmlui_DATA)
 
-EXTRA_DIST =		\
-	$(xmlui_DATA)
+CLEANFILES = $(CORBA_SRCLIST)
 
 -include $(top_srcdir)/git.mk
diff --git a/gnome-panel/Makefile.am b/gnome-panel/Makefile.am
index bf5d2dc..69d8c97 100644
--- a/gnome-panel/Makefile.am
+++ b/gnome-panel/Makefile.am
@@ -1,46 +1,23 @@
-## We require new-style dependency handling.
-AUTOMAKE_OPTIONS = 1.3
 SUBDIRS = libegg libpanel-applet-private libpanel-util
 
-NULL =
+bin_PROGRAMS = \
+	gnome-panel 			\
+	gnome-desktop-item-edit		\
+	panel-test-applets
+libexec_SCRIPTS = gnome-panel-add
 
-INCLUDES =							\
+AM_CPPFLAGS =							\
+	$(PANEL_CFLAGS)						\
 	-I.							\
 	-I$(srcdir)						\
 	-I$(top_builddir)/gnome-panel				\
 	-I$(top_builddir)/gnome-panel/libpanel-util		\
-	-DPANEL_DEBUG						\
 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
 	-DBUILDERDIR=\""$(uidir)"\"				\
 	-DICONDIR=\""$(datadir)/gnome-panel/pixmaps"\"		\
-	-DDATADIR=\""$(datadir)"\"				\
-	-DPANEL_MODULES_DIR=\"$(modulesdir)\"			\
-	-DPANEL_APPLETS_DIR=\"$(appletsdir)\"			\
-	-DGMENU_I_KNOW_THIS_IS_UNSTABLE				\
-	$(DISABLE_DEPRECATED_CFLAGS)				\
-	$(PANEL_CFLAGS)						\
-	$(XRANDR_CFLAGS)					\
-	$(WARN_CFLAGS)						\
-	$(NULL)
-
-# Used by the GNOME_PROGRAM_STANDARD_PROPERTIES macros
-STANDARD_PROPERTIES_CFLAGS = 					\
-	-DPREFIX=\""$(prefix)"\"				\
-	-DSYSCONFDIR=\""$(sysconfdir)"\"			\
-	-DLIBDIR=\""$(libdir)"\"				\
-	-DDATADIR=\""$(datadir)"\"				\
-	$(NULL)
-
-bin_PROGRAMS = \
-	gnome-panel 			\
-	gnome-desktop-item-edit		\
-	panel-test-applets
+	$(DISABLE_DEPRECATED_CFLAGS)
 
-BUILT_SOURCES = \
-	panel-typebuiltins.c		\
-	panel-typebuiltins.h		\
-	panel-marshal.c			\
-	panel-marshal.h
+AM_CFLAGS = $(WARN_CFLAGS)
 
 panel_sources =			\
 	panel-typebuiltins.c	\
@@ -48,32 +25,32 @@ panel_sources =			\
 	panel-marshal.c		\
 	panel-marshal.h		\
 	main.c			\
-	panel-widget.c  	\
-	button-widget.c  	\
+	panel-widget.c		\
+	button-widget.c		\
 	xstuff.c		\
 	panel-session.c		\
-	panel-compatibility.c   \
+	panel-compatibility.c	\
 	panel.c			\
 	applet.c		\
-	drawer.c  		\
-	panel-config-global.c  	\
+	drawer.c		\
+	panel-config-global.c	\
 	panel-util.c		\
 	panel-gconf.c		\
-	panel-properties-dialog.c \
+	panel-properties-dialog.c	\
 	panel-run-dialog.c	\
-	menu.c  		\
-	panel-context-menu.c 	\
+	menu.c			\
+	panel-context-menu.c	\
 	launcher.c		\
 	panel-applet-frame.c	\
 	panel-applets-manager.c	\
 	panel-shell.c		\
 	panel-background.c	\
-	panel-background-monitor.c \
+	panel-background-monitor.c	\
 	panel-stock-icons.c	\
 	panel-action-button.c	\
-	panel-menu-bar.c        \
-	panel-menu-button.c     \
-	panel-menu-items.c      \
+	panel-menu-bar.c	\
+	panel-menu-button.c	\
+	panel-menu-items.c	\
 	panel-separator.c	\
 	panel-recent.c		\
 	panel-action-protocol.c	\
@@ -84,14 +61,13 @@ panel_sources =			\
 	panel-multiscreen.c	\
 	panel-a11y.c		\
 	panel-bindings.c	\
-	panel-profile.c         \
+	panel-profile.c		\
 	panel-force-quit.c	\
 	panel-lockdown.c	\
 	panel-addto.c		\
 	panel-ditem-editor.c	\
 	panel-modules.c		\
-	panel-applet-info.c	\
-	$(NULL)
+	panel-applet-info.c
 
 panel_headers =			\
 	panel-types.h		\
@@ -100,28 +76,28 @@ panel_headers =			\
 	button-widget.h		\
 	xstuff.h		\
 	panel-session.h		\
-	panel-compatibility.h   \
-	panel.h         	\
-	applet.h         	\
-	drawer.h  		\
+	panel-compatibility.h	\
+	panel.h			\
+	applet.h		\
+	drawer.h		\
 	panel-util.h		\
-	panel-properties-dialog.h \
-	panel-config-global.h  	\
+	panel-properties-dialog.h	\
+	panel-config-global.h	\
 	panel-gconf.h		\
 	panel-run-dialog.h	\
-	menu.h  		\
-	panel-context-menu.h 	\
+	menu.h			\
+	panel-context-menu.h	\
 	launcher.h		\
 	panel-applet-frame.h	\
 	panel-applets-manager.h	\
 	panel-shell.h		\
 	panel-background.h	\
-	panel-background-monitor.h \
+	panel-background-monitor.h	\
 	panel-stock-icons.h	\
 	panel-action-button.h	\
-	panel-menu-bar.h        \
-	panel-menu-button.h     \
-	panel-menu-items.h      \
+	panel-menu-bar.h	\
+	panel-menu-button.h	\
+	panel-menu-items.h	\
 	panel-separator.h	\
 	panel-recent.h		\
 	panel-action-protocol.h	\
@@ -132,7 +108,7 @@ panel_headers =			\
 	panel-multiscreen.h	\
 	panel-a11y.h		\
 	panel-bindings.h	\
-	panel-profile.h         \
+	panel-profile.h		\
 	panel-enums.h		\
 	panel-force-quit.h	\
 	panel-lockdown.h	\
@@ -140,13 +116,17 @@ panel_headers =			\
 	panel-ditem-editor.h	\
 	panel-icon-names.h	\
 	panel-modules.h		\
-	panel-applet-info.h	\
-	$(NULL)
+	panel-applet-info.h
 
 gnome_panel_SOURCES =			\
 	$(panel_sources)		\
-	$(panel_headers)		\
-	$(NULL)
+	$(panel_headers)
+
+gnome_panel_CPPFLAGS = 				\
+	$(AM_CPPFLAGS)				\
+	$(XRANDR_CFLAGS)			\
+	-DPANEL_MODULES_DIR=\"$(modulesdir)\"	\
+	-DGMENU_I_KNOW_THIS_IS_UNSTABLE
 
 gnome_panel_LDADD =		\
 	$(top_builddir)/gnome-panel/libegg/libegg.la					\
@@ -156,36 +136,16 @@ gnome_panel_LDADD =		\
 	$(XRANDR_LIBS)									\
 	$(X_LIBS)
 
-gnome_panel_LDFLAGS = -export-dynamic
-
-gnome_desktop_item_edit_SOURCES = \
-	gnome-desktop-item-edit.c \
-	panel-ditem-editor.c	  \
-	panel-marshal.c		  \
-	panel-util.c		  \
+gnome_desktop_item_edit_SOURCES =	\
+	gnome-desktop-item-edit.c	\
+	panel-ditem-editor.c		\
+	panel-marshal.c			\
+	panel-util.c			\
 	xstuff.c
 
-gnome_desktop_item_edit_LDFLAGS = -export-dynamic
-
 gnome_desktop_item_edit_LDADD = 	\
 	$(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
-	$(PANEL_LIBS)			\
-	$(X_LIBS)
-
-uidir = $(datadir)/gnome-panel/ui
-ui_DATA =					\
-	panel-properties-dialog.ui		\
-	panel-run-dialog.ui			\
-	panel-test-applets.ui
-
-libexec_SCRIPTS = gnome-panel-add
-
-gnome-panel-add: gnome-panel-add.in Makefile
-	$(AM_V_GEN)sed 					\
-	    -e s!\ PYTHON\@! PYTHON@! 			\
-	    -e s!\ PANEL_APPLETS_DIR\@!$(appletsdir)! 	\
-	    < $< > $@
-	$(AM_V_at)chmod a+x $@
+	$(PANEL_LIBS)
 
 panel_test_applets_SOURCES =		\
 	panel-modules.c			\
@@ -194,25 +154,22 @@ panel_test_applets_SOURCES =		\
 	panel-marshal.c			\
 	panel-test-applets.c
 
-panel_test_applets_LDFLAGS = -export-dynamic
+panel_test_applets_CPPFLAGS =			\
+	$(AM_CPPFLAGS)				\
+	-DPANEL_MODULES_DIR=\"$(modulesdir)\"	\
+	-DPANEL_APPLETS_DIR=\"$(appletsdir)\"
+
 panel_test_applets_LDADD = 		\
 	$(top_builddir)/gnome-panel/libpanel-applet-private/libpanel-applet-private-mini.la	\
 	$(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la				\
 	$(PANEL_LIBS)
 
-EXTRA_DIST =					\
-	$(ui_DATA)				\
-	nothing.cP				\
-	nothing.h				\
-	$(schemas_in_files)			\
-	panel-compatibility.schemas		\
-	panel-marshal.list			\
-	gnome-panelrc				\
-	$(entries_DATA)				\
-	$(desktop_in_files)			\
-	gnome-panel-add.in
-
- INTLTOOL_DESKTOP_RULE@
+gnome-panel-add: gnome-panel-add.in Makefile
+	$(AM_V_GEN)sed 						\
+		-e s!\ PYTHON\@! PYTHON@! 			\
+		-e s!\ PANEL_APPLETS_DIR\@!$(appletsdir)! 	\
+		< $< > $@
+	$(AM_V_at)chmod a+x $@
 
 panel_enum_headers =					\
 	$(top_srcdir)/gnome-panel/panel-enums.h		\
@@ -251,11 +208,29 @@ panel-typebuiltins.h: @REBUILD@ $(panel_enum_headers)
 			--fprod "\n/* --- @filename@ --- */" \
 			--eprod "#define PANEL_TYPE_ ENUMSHORT@ @enum_name _get_type()\n" \
 			--eprod "GType @enum_name _get_type (void);\n" \
-		$(panel_enum_headers) >  $@
+		$(panel_enum_headers) > $@
+
+BUILT_SOURCES = \
+	panel-typebuiltins.c		\
+	panel-typebuiltins.h		\
+	panel-marshal.c			\
+	panel-marshal.h
 
 rcdir = $(datadir)
 rc_DATA = gnome-panelrc
 
+uidir = $(datadir)/gnome-panel/ui
+ui_DATA =					\
+	panel-properties-dialog.ui		\
+	panel-run-dialog.ui			\
+	panel-test-applets.ui
+
+desktopdir = $(datadir)/applications
+desktop_in_files = gnome-panel.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+ INTLTOOL_DESKTOP_RULE@
+
 entriesdir       = $(GCONF_SCHEMA_FILE_DIR)
 entries_DATA     = panel-default-setup.entries
 
@@ -264,14 +239,9 @@ schemas_in_files =				\
 	panel-global.schemas.in 		\
 	panel-general.schemas.in		\
 	panel-toplevel.schemas.in		\
-	panel-object.schemas.in			\
-	$(NULL)
+	panel-object.schemas.in
 schemas_DATA     = panel-compatibility.schemas $(schemas_in_files:.schemas.in=.schemas)
 
-desktopdir = $(datadir)/applications
-desktop_in_files = gnome-panel.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
 @INTLTOOL_SCHEMAS_RULE@
 
 if GCONF_SCHEMAS_INSTALL
@@ -283,10 +253,24 @@ install-data-local:
 		$(GCONFTOOL) --direct --config-source=$(GCONF_SCHEMA_CONFIG_SOURCE) --load $(srcdir)/panel-default-setup.entries ; \
 		$(GCONFTOOL) --direct --config-source=$(GCONF_SCHEMA_CONFIG_SOURCE) --load $(srcdir)/panel-default-setup.entries /apps/panel ; \
 	fi
-else
-install-data-local:
+uninstall-local:
+	for p in $(schema_DATA) ; do \
+		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(top_builddir)/applets/ngome-panel/$$p ; \
+	done
 endif
 
+EXTRA_DIST =					\
+	$(ui_DATA)				\
+	nothing.cP				\
+	nothing.h				\
+	$(schemas_in_files)			\
+	panel-compatibility.schemas		\
+	panel-marshal.list			\
+	gnome-panelrc				\
+	$(entries_DATA)				\
+	$(desktop_in_files)			\
+	gnome-panel-add.in
+
 CLEANFILES = \
 	$(BUILT_SOURCES) \
 	$(schemas_in_files:.schemas.in=.schemas) \
diff --git a/gnome-panel/libegg/Makefile.am b/gnome-panel/libegg/Makefile.am
index f765c4b..c50c1fa 100644
--- a/gnome-panel/libegg/Makefile.am
+++ b/gnome-panel/libegg/Makefile.am
@@ -1,24 +1,25 @@
 platform_defines = -DEGG_SM_CLIENT_BACKEND_XSMP
 platform_sources = eggsmclient-xsmp.c
 
-INCLUDES =                               \
-	-DG_LOG_DOMAIN=\""EggSMClient"\" \
-	$(platform_defines)              \
-	$(EGG_SMCLIENT_CFLAGS)           \
-	$(WARN_CFLAGS)			 \
-	$(DISABLE_DEPRECATED_CFLAGS)
-
 noinst_LTLIBRARIES = libegg.la
 
-libegg_la_LIBADD =			\
-	$(EGG_SMCLIENT_LIBS)
+AM_CPPFLAGS =				\
+	$(EGG_SMCLIENT_CFLAGS)		\
+	-DG_LOG_DOMAIN=\""EggSMClient"\"\
+	$(platform_defines)		\
+	$(DISABLE_DEPRECATED_CFLAGS)
+
+AM_CFLAGS = $(WARN_CFLAGS)
 
 libegg_la_SOURCES =			\
-	eggdesktopfile.c                \
+	eggdesktopfile.c		\
 	eggdesktopfile.h		\
-	eggsmclient.c                   \
-	eggsmclient.h                   \
-	eggsmclient-private.h           \
+	eggsmclient.c			\
+	eggsmclient.h			\
+	eggsmclient-private.h		\
 	$(platform_sources)
 
+libegg_la_LIBADD =			\
+	$(EGG_SMCLIENT_LIBS)
+
 -include $(top_srcdir)/git.mk
diff --git a/gnome-panel/libpanel-applet-private/Makefile.am b/gnome-panel/libpanel-applet-private/Makefile.am
index 25a68bb..f12dee8 100644
--- a/gnome-panel/libpanel-applet-private/Makefile.am
+++ b/gnome-panel/libpanel-applet-private/Makefile.am
@@ -1,6 +1,9 @@
-NULL =
+noinst_LTLIBRARIES =			\
+	libpanel-applet-private.la	\
+	libpanel-applet-private-mini.la
 
-INCLUDES =							\
+AM_CPPFLAGS =							\
+	$(PANEL_CFLAGS)						\
 	-I.							\
 	-I$(srcdir)						\
 	-I$(top_srcdir)/gnome-panel				\
@@ -9,30 +12,23 @@ INCLUDES =							\
 	-I$(top_builddir)/gnome-panel/libpanel-util		\
 	-DDATADIR=\""$(datadir)"\"				\
 	-DPANEL_APPLETS_DIR=\"$(appletsdir)\"			\
-	$(DISABLE_DEPRECATED_CFLAGS)				\
-	$(PANEL_CFLAGS)						\
-	$(WARN_CFLAGS)						\
-	$(NULL)
+	$(DISABLE_DEPRECATED_CFLAGS)
 
-noinst_LTLIBRARIES=		\
-	libpanel-applet-private.la	\
-	libpanel-applet-private-mini.la
+AM_CFLAGS = $(WARN_CFLAGS)
 
-libpanel_applet_private_la_SOURCES=	\
+libpanel_applet_private_la_SOURCES =	\
 	panel-applets-manager-dbus.c	\
 	panel-applets-manager-dbus.h	\
 	panel-applet-container.c	\
 	panel-applet-container.h	\
 	panel-applet-frame-dbus.c	\
-	panel-applet-frame-dbus.h	\
-	$(NULL)
+	panel-applet-frame-dbus.h
 
-libpanel_applet_private_mini_la_SOURCES=	\
+libpanel_applet_private_mini_la_SOURCES =\
 	panel-applet-mini.c		\
 	panel-applets-manager-dbus.c	\
 	panel-applets-manager-dbus.h	\
 	panel-applet-container.c	\
-	panel-applet-container.h	\
-	$(NULL)
+	panel-applet-container.h
 
 -include $(top_srcdir)/git.mk
diff --git a/gnome-panel/libpanel-util/Makefile.am b/gnome-panel/libpanel-util/Makefile.am
index d7832f5..8cd034c 100644
--- a/gnome-panel/libpanel-util/Makefile.am
+++ b/gnome-panel/libpanel-util/Makefile.am
@@ -1,18 +1,16 @@
-NULL =
+noinst_LTLIBRARIES = libpanel-util.la
 
-INCLUDES =							\
+AM_CPPFLAGS =							\
+	$(PANEL_CFLAGS)						\
 	-I.							\
 	-I$(srcdir)						\
 	-I$(top_builddir)/gnome-panel/libpanel-util		\
 	-DDATADIR=\""$(datadir)"\"				\
-	$(DISABLE_DEPRECATED_CFLAGS)				\
-	$(PANEL_CFLAGS)						\
-	$(WARN_CFLAGS)						\
-	$(NULL)
+	$(DISABLE_DEPRECATED_CFLAGS)
 
-noinst_LTLIBRARIES=libpanel-util.la
+AM_CFLAGS = $(WARN_CFLAGS)
 
-libpanel_util_la_SOURCES=	\
+libpanel_util_la_SOURCES =		\
 	panel-cleanup.c			\
 	panel-cleanup.h			\
 	panel-dbus-service.c		\
@@ -36,7 +34,6 @@ libpanel_util_la_SOURCES=	\
 	panel-show.c			\
 	panel-show.h			\
 	panel-xdg.c			\
-	panel-xdg.h			\
-	$(NULL)
+	panel-xdg.h
 
 -include $(top_srcdir)/git.mk
diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am
index 44d350f..5ef8316 100644
--- a/icons/16x16/Makefile.am
+++ b/icons/16x16/Makefile.am
@@ -1,5 +1,3 @@
-NULL =
-
 size = 16x16
 
 iconsdir = $(datadir)/icons/hicolor/$(size)/apps
@@ -15,8 +13,7 @@ icons_DATA =					\
 	gnome-panel.png				\
 	gnome-panel-window-list.png		\
 	gnome-panel-window-menu.png		\
-	gnome-panel-workspace-switcher.png	\
-	$(NULL)
+	gnome-panel-workspace-switcher.png
 
 icons_SOURCE =					\
 	gnome-panel-clock.xcf.bz2		\
@@ -29,12 +26,7 @@ icons_SOURCE =					\
 	gnome-panel.svg				\
 	gnome-panel-window-list.xcf.bz2		\
 	gnome-panel-window-menu.xcf.bz2		\
-	gnome-panel-workspace-switcher.svg	\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(icons_SOURCE)
+	gnome-panel-workspace-switcher.svg
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
@@ -45,8 +37,12 @@ update-icon-cache:
 		echo "Updating Gtk icon cache."; \
 		$(gtk_update_icon_cache); \
 	else \
-		echo "*** Icon cache not updated.  After (un)install, run this:"; \
+		echo "*** Icon cache not updated. After (un)install, run this:"; \
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
 
+EXTRA_DIST =		\
+	$(icons_DATA)	\
+	$(icons_SOURCE)
+
 -include $(top_srcdir)/git.mk
diff --git a/icons/22x22/Makefile.am b/icons/22x22/Makefile.am
index 277efea..5c65cdd 100644
--- a/icons/22x22/Makefile.am
+++ b/icons/22x22/Makefile.am
@@ -1,5 +1,3 @@
-NULL =
-
 size = 22x22
 
 iconsdir = $(datadir)/icons/hicolor/$(size)/apps
@@ -15,8 +13,7 @@ icons_DATA =					\
 	gnome-panel.png				\
 	gnome-panel-window-list.png		\
 	gnome-panel-window-menu.png		\
-	gnome-panel-workspace-switcher.png	\
-	$(NULL)
+	gnome-panel-workspace-switcher.png
 
 icons_SOURCE =					\
 	gnome-panel-clock.svg			\
@@ -29,12 +26,7 @@ icons_SOURCE =					\
 	gnome-panel.svg				\
 	gnome-panel-window-list.xcf.bz2		\
 	gnome-panel-window-menu.xcf.bz2		\
-	gnome-panel-workspace-switcher.svg	\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(icons_SOURCE)
+	gnome-panel-workspace-switcher.svg
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
@@ -45,8 +37,12 @@ update-icon-cache:
 		echo "Updating Gtk icon cache."; \
 		$(gtk_update_icon_cache); \
 	else \
-		echo "*** Icon cache not updated.  After (un)install, run this:"; \
+		echo "*** Icon cache not updated. After (un)install, run this:"; \
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
 
+EXTRA_DIST =		\
+	$(icons_DATA)	\
+	$(icons_SOURCE)
+
 -include $(top_srcdir)/git.mk
diff --git a/icons/24x24/Makefile.am b/icons/24x24/Makefile.am
index 8b87467..b12d140 100644
--- a/icons/24x24/Makefile.am
+++ b/icons/24x24/Makefile.am
@@ -1,5 +1,3 @@
-NULL =
-
 size = 24x24
 
 iconsdir = $(datadir)/icons/hicolor/$(size)/apps
@@ -15,11 +13,7 @@ icons_DATA =					\
 	gnome-panel.png				\
 	gnome-panel-window-list.png		\
 	gnome-panel-window-menu.png		\
-	gnome-panel-workspace-switcher.png	\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)
+	gnome-panel-workspace-switcher.png
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
@@ -30,8 +24,11 @@ update-icon-cache:
 		echo "Updating Gtk icon cache."; \
 		$(gtk_update_icon_cache); \
 	else \
-		echo "*** Icon cache not updated.  After (un)install, run this:"; \
+		echo "*** Icon cache not updated. After (un)install, run this:"; \
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
 
+EXTRA_DIST =		\
+	$(icons_DATA)
+
 -include $(top_srcdir)/git.mk
diff --git a/icons/32x32/Makefile.am b/icons/32x32/Makefile.am
index 4c5f16e..58ff797 100644
--- a/icons/32x32/Makefile.am
+++ b/icons/32x32/Makefile.am
@@ -1,5 +1,3 @@
-NULL =
-
 size = 32x32
 
 iconsdir = $(datadir)/icons/hicolor/$(size)/apps
@@ -15,8 +13,7 @@ icons_DATA =					\
 	gnome-panel.png				\
 	gnome-panel-window-list.png		\
 	gnome-panel-window-menu.png		\
-	gnome-panel-workspace-switcher.png	\
-	$(NULL)
+	gnome-panel-workspace-switcher.png
 
 icons_SOURCE =					\
 	gnome-panel-clock.svg			\
@@ -29,12 +26,7 @@ icons_SOURCE =					\
 	gnome-panel.svg				\
 	gnome-panel-window-list.svg		\
 	gnome-panel-window-menu.svg		\
-	gnome-panel-workspace-switcher.svg	\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(icons_SOURCE)
+	gnome-panel-workspace-switcher.svg
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
@@ -45,8 +37,12 @@ update-icon-cache:
 		echo "Updating Gtk icon cache."; \
 		$(gtk_update_icon_cache); \
 	else \
-		echo "*** Icon cache not updated.  After (un)install, run this:"; \
+		echo "*** Icon cache not updated. After (un)install, run this:"; \
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
 
+EXTRA_DIST =		\
+	$(icons_DATA)	\
+	$(icons_SOURCE)
+
 -include $(top_srcdir)/git.mk
diff --git a/icons/48x48/Makefile.am b/icons/48x48/Makefile.am
index 70b4647..145fe2b 100644
--- a/icons/48x48/Makefile.am
+++ b/icons/48x48/Makefile.am
@@ -1,20 +1,12 @@
-NULL =
-
 size = 48x48
 
 iconsdir = $(datadir)/icons/hicolor/$(size)/apps
 
 icons_DATA =					\
-	gnome-panel.png				\
-	$(NULL)
+	gnome-panel.png
 
 icons_SOURCE =					\
-	gnome-panel.svg				\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(icons_SOURCE)
+	gnome-panel.svg
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
@@ -25,8 +17,12 @@ update-icon-cache:
 		echo "Updating Gtk icon cache."; \
 		$(gtk_update_icon_cache); \
 	else \
-		echo "*** Icon cache not updated.  After (un)install, run this:"; \
+		echo "*** Icon cache not updated. After (un)install, run this:"; \
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
 
+EXTRA_DIST =		\
+	$(icons_DATA)	\
+	$(icons_SOURCE)
+
 -include $(top_srcdir)/git.mk
diff --git a/icons/Makefile.am b/icons/Makefile.am
index f473742..c923064 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -1,12 +1,9 @@
 SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable
 
-NULL =
-
-gegldir   = $(datadir)/gnome-panel/pixmaps
+gegldir = $(datadir)/gnome-panel/pixmaps
 gegl_DATA = 				\
 	gnome-gegl2-2.png		\
-	gnome-gegl2.png			\
-	$(NULL)
+	gnome-gegl2.png
 
 EXTRA_DIST = $(gegl_DATA)
 
diff --git a/icons/scalable/Makefile.am b/icons/scalable/Makefile.am
index a13ca52..ca3f2cc 100644
--- a/icons/scalable/Makefile.am
+++ b/icons/scalable/Makefile.am
@@ -1,5 +1,3 @@
-NULL =
-
 size = scalable
 
 iconsdir = $(datadir)/icons/hicolor/$(size)/apps
@@ -15,15 +13,7 @@ icons_DATA =					\
 	gnome-panel.svg				\
 	gnome-panel-window-list.svg		\
 	gnome-panel-window-menu.svg		\
-	gnome-panel-workspace-switcher.svg	\
-	$(NULL)
-
-icons_SOURCE =					\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(icons_SOURCE)
+	gnome-panel-workspace-switcher.svg
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
@@ -34,8 +24,11 @@ update-icon-cache:
 		echo "Updating Gtk icon cache."; \
 		$(gtk_update_icon_cache); \
 	else \
-		echo "*** Icon cache not updated.  After (un)install, run this:"; \
+		echo "*** Icon cache not updated. After (un)install, run this:"; \
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
 
+EXTRA_DIST =		\
+	$(icons_DATA)
+
 -include $(top_srcdir)/git.mk
diff --git a/libpanel-applet/Makefile.am b/libpanel-applet/Makefile.am
index ad323db..fbd36c2 100644
--- a/libpanel-applet/Makefile.am
+++ b/libpanel-applet/Makefile.am
@@ -1,12 +1,19 @@
-INCLUDES =							\
+lib_LTLIBRARIES = libpanel-applet-3.la
+noinst_PROGRAMS = test-dbus-applet
+
+AM_CPPFLAGS =							\
+	$(LIBPANEL_APPLET_CFLAGS)				\
 	-I$(top_builddir)/libpanel-applet			\
-	-DPANEL_APPLET_DATADIR=\""$(datadir)"\"			\
 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
-	$(LIBPANEL_APPLET_CFLAGS)				\
-	$(DISABLE_DEPRECATED_CFLAGS)				\
-	$(WARN_CFLAGS)
+	$(DISABLE_DEPRECATED_CFLAGS)
 
-lib_LTLIBRARIES = libpanel-applet-3.la
+AM_CFLAGS = $(WARN_CFLAGS)
+
+libpanel_appletincludedir = $(includedir)/gnome-panel-3.0/libpanel-applet
+libpanel_appletinclude_HEADERS =	\
+	panel-applet.h			\
+	panel-applet-gconf.h		\
+	panel-applet-enums.h
 
 libpanel_applet_3_la_SOURCES =		\
 	$(BUILT_SOURCES)		\
@@ -17,41 +24,20 @@ libpanel_applet_3_la_SOURCES =		\
 	panel-applet-gconf.c		\
 	panel-applet-gconf.h
 
-libpanel_applet_3_la_LDFLAGS = \
-	-version-info $(LIB_PANEL_APPLET_LT_VERSION)	\
-	-no-undefined
-
 libpanel_applet_3_la_LIBADD  = \
 	$(LIBPANEL_APPLET_LIBS) \
 	$(X_LIBS)
 
-libpanel_appletincludedir = $(includedir)/gnome-panel-3.0/libpanel-applet
-
-libpanel_appletinclude_HEADERS =	\
-	panel-applet.h			\
-	panel-applet-gconf.h		\
-	panel-applet-enums.h
-
-noinst_PROGRAMS = test-dbus-applet
-
-test_dbus_applet_LDADD =               \
-       $(LIBPANEL_APPLET_LIBS)         \
-       libpanel-applet-3.la
+libpanel_applet_3_la_LDFLAGS = \
+	-version-info $(LIB_PANEL_APPLET_LT_VERSION)	\
+	-no-undefined
 
-BUILT_SOURCES = \
-	panel-applet-enums.c			\
-	panel-applet-enums.h			\
-	panel-applet-marshal.c			\
-	panel-applet-marshal.h
+test_dbus_applet_LDADD =	\
+	$(LIBPANEL_APPLET_LIBS)	\
+	libpanel-applet-3.la
 
 $(libpanel_applet_3_la_OBJECTS) $(test_dbus_applet_OBJECTS): $(BUILT_SOURCES)
 
-EXTRA_DIST =						\
-	org.gnome.panel.TestApplet.panel-applet.in	\
-	panel-applet-marshal.list			\
-	libpanelapplet-3.0.pc.in			\
-	libpanelapplet-3.0-uninstalled.pc.in
-
 panel-applet-marshal.h: panel-applet-marshal.list $(GLIB_GENMARSHAL)
 	$(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=panel_applet_marshal > $@
 
@@ -63,35 +49,53 @@ panel_applet_enum_headers = $(top_srcdir)/libpanel-applet/panel-applet.h
 
 panel-applet-enums.c: @REBUILD@ $(panel_applet_enum_headers)
 	$(AM_V_GEN)glib-mkenums \
-		     --fhead "#include <glib-object.h>\n" \
-		     --fhead "#include \"panel-applet-enums.h\"\n\n" \
-		     --fprod "\n/* enumerations from \"@filename \" */" \
-		     --fprod "\n#include \"@filename \"\n" \
-		     --vhead "static const G Type@Value _ enum_name@_values[] = {" \
-		     --vprod "  { @VALUENAME@, \"@VALUENAME \", \"@valuenick \" }," \
-		     --vtail "  { 0, NULL, NULL }\n};\n\n" \
-		     --vtail "GType\n enum_name@_get_type (void)\n{\n" \
-		     --vtail "  static GType type = 0;\n\n" \
-		     --vtail "  if (!type)\n" \
-		     --vtail "    type = g_ type@_register_static (\"@EnumName \", _ enum_name@_values);\n\n" \
-		     --vtail "  return type;\n}\n\n" \
+			--fhead "#include <glib-object.h>\n" \
+			--fhead "#include \"panel-applet-enums.h\"\n\n" \
+			--fprod "\n/* enumerations from \"@filename \" */" \
+			--fprod "\n#include \"@filename \"\n" \
+			--vhead "static const G Type@Value _ enum_name@_values[] = {" \
+			--vprod "  { @VALUENAME@, \"@VALUENAME \", \"@valuenick \" }," \
+			--vtail "  { 0, NULL, NULL }\n};\n\n" \
+			--vtail "GType\n enum_name@_get_type (void)\n{\n" \
+			--vtail "  static GType type = 0;\n\n" \
+			--vtail "  if (!type)\n" \
+			--vtail "    type = g_ type@_register_static (\"@EnumName \", _ enum_name@_values);\n\n" \
+			--vtail "  return type;\n}\n\n" \
 		$(panel_applet_enum_headers) > $@
 
 panel-applet-enums.h: @REBUILD@ $(panel_applet_enum_headers)
 	$(AM_V_GEN)glib-mkenums \
-		     --fhead "#ifndef __PANEL_APPLET_ENUMS_H__\n" \
-		     --fhead "#define __PANEL_APPLET_ENUMS_H__\n\n" \
-		     --fhead "G_BEGIN_DECLS\n\n" \
-		     --ftail "G_END_DECLS\n\n" \
-		     --ftail "#endif /* __PANEL_APPLET_ENUMS_H__ */\n" \
-		     --fprod "\n/* --- @filename@ --- */" \
-		     --eprod "#define PANEL_TYPE_ ENUMNAME@ @enum_name _get_type()\n" \
-		     --eprod "GType @enum_name _get_type (void);\n" \
+			--fhead "#ifndef __PANEL_APPLET_ENUMS_H__\n" \
+			--fhead "#define __PANEL_APPLET_ENUMS_H__\n\n" \
+			--fhead "G_BEGIN_DECLS\n\n" \
+			--ftail "G_END_DECLS\n\n" \
+			--ftail "#endif /* __PANEL_APPLET_ENUMS_H__ */\n" \
+			--fprod "\n/* --- @filename@ --- */" \
+			--eprod "#define PANEL_TYPE_ ENUMNAME@ @enum_name _get_type()\n" \
+			--eprod "GType @enum_name _get_type (void);\n" \
 		$(panel_applet_enum_headers) > $@
 
+BUILT_SOURCES = \
+	panel-applet-enums.c			\
+	panel-applet-enums.h			\
+	panel-applet-marshal.c			\
+	panel-applet-marshal.h
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libpanelapplet-3.0.pc
 
+appletdir       = $(datadir)/gnome-panel/applets
+applet_in_files = org.gnome.panel.TestApplet.panel-applet.in
+noinst_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
+
+ PANEL_INTLTOOL_PANEL_APPLET_RULE@
+
+EXTRA_DIST =						\
+	org.gnome.panel.TestApplet.panel-applet.in	\
+	panel-applet-marshal.list			\
+	libpanelapplet-3.0.pc.in			\
+	libpanelapplet-3.0-uninstalled.pc.in
+
 CLEANFILES = $(BUILT_SOURCES) $(noinst_DATA)
 
 ###############################
@@ -112,14 +116,9 @@ built_introspection_sources =	\
 	panel-applet-enums.c	\
 	panel-applet-enums.h
 
-PanelApplet-3.0.gir: libpanel-applet-3.la Makefile
+PanelApplet-3.0.gir: libpanel-applet-3.la
 PanelApplet_3_0_gir_INCLUDES = GObject-2.0 Gtk-2.0 GConf-2.0
-PanelApplet_3_0_gir_CFLAGS =					\
-	-I$(top_srcdir)/libpanel-applet				\
-	-I$(top_builddir)/libpanel-applet			\
-	-DPANEL_APPLET_DATADIR=\""$(datadir)"\"			\
-	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
-	$(LIBPANEL_APPLET_CFLAGS)
+PanelApplet_3_0_gir_CFLAGS = $(AM_CPPFLAGS)
 PanelApplet_3_0_gir_LIBS = libpanel-applet-3.la
 PanelApplet_3_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources)) $(addprefix $(builddir)/,$(built_introspection_sources))
 # When requiring gobject-introspection 0.9.5, use this:
@@ -127,10 +126,10 @@ PanelApplet_3_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources)) $(a
 PanelApplet_3_0_gir_SCANNERFLAGS = --strip-prefix=Panel
 INTROSPECTION_GIRS += PanelApplet-3.0.gir
 
-girdir = $(datadir)/gir-1.0
+girdir = $(INTROSPECTION_GIRDIR)
 gir_DATA = $(INTROSPECTION_GIRS)
 
-typelibdir = $(libdir)/girepository-1.0
+typelibdir = $(INTROSPECTION_TYPELIBDIR)
 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
 CLEANFILES += $(gir_DATA) $(typelib_DATA)
@@ -138,12 +137,6 @@ endif
 
 ################################
 
-appletdir       = $(datadir)/gnome-panel/applets
-applet_in_files = org.gnome.panel.TestApplet.panel-applet.in
-noinst_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
-
- PANEL_INTLTOOL_PANEL_APPLET_RULE@
-
 dist-hook:
 	cd $(distdir) ; rm -f $(CLEANFILES)
 
diff --git a/man/Makefile.am b/man/Makefile.am
index 84d8162..00b31ab 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,5 +1,4 @@
-man_MANS =				\
-	gnome-panel.1
+man_MANS = gnome-panel.1
 
 EXTRA_DIST = $(man_MANS)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]