[pessulus] build: Update all Makefile.am to more recent standards

[Vincent Untz <vuntz src gnome org>]

commit d5a549165a0e9a7989e465b77702255a18e194b2
Author: Vincent Untz <vuntz gnome org>
Date:   Mon Sep 20 17:41:05 2010 +0200

    build: Update all Makefile.am to more recent standards

 Makefile.am          |    7 +----
 Pessulus/Makefile.am |    9 +++----
 data/Makefile.am     |   56 +++++++++++++++++++++++++-------------------------
 3 files changed, 34 insertions(+), 38 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 4f20628..acc92f8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,4 @@
-NULL =
-
-SUBDIRS = data po Pessulus
+SUBDIRS = Pessulus data po
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -13,8 +11,7 @@ pessulus: pessulus.in Makefile
 EXTRA_DIST =			\
 	HACKING			\
 	MAINTAINERS		\
-	pessulus.in		\
-	$(NULL)
+	pessulus.in
 
 CLEANFILES =		\
 	pessulus
diff --git a/Pessulus/Makefile.am b/Pessulus/Makefile.am
index ab191c4..2c73d1a 100644
--- a/Pessulus/Makefile.am
+++ b/Pessulus/Makefile.am
@@ -16,11 +16,6 @@ app_PYTHON = 			\
 
 nodist_app_PYTHON = config.py
 
-CLEANFILES = config.py
-EXTRA_DIST = config.py.in
-
-all-local: config.py
-
 config.py: config.py.in Makefile
 	$(AM_V_GEN)sed								\
 		-e s!\ LOCALEDIR\@!$(datadir)/locale!			\
@@ -31,4 +26,8 @@ config.py: config.py.in Makefile
 		-e s!\ PACKAGE_VERSION\@!$(PACKAGE_VERSION)!		\
 		< $< > $@
 
+EXTRA_DIST = config.py.in
+
+CLEANFILES = config.py
+
 -include $(top_srcdir)/git.mk
diff --git a/data/Makefile.am b/data/Makefile.am
index 9b4d3cc..23099ed 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,43 +1,29 @@
-uidir   = $(pkgdatadir)/ui
+uidir = $(pkgdatadir)/ui
 ui_DATA = pessulus.ui
 
 desktopdir = $(datadir)/applications
-desktop_in_files = pessulus.desktop.in 
+desktop_in_files = pessulus.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 @INTLTOOL_DESKTOP_RULE@
 
-EXTRA_DIST =			\
-	$(desktop_in_files)	\
-	$(ui_DATA) \
-	pessulus-16.png pessulus-22.png \
-	pessulus-24.png pessulus-32.png \
-	pessulus-48.png pessulus.svg
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
-DISTCLEANFILES = $(applications_DATA)
+install-data-local: install-icons
+uninstall-local: uninstall-icons
 
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
 
 install-icons:			
 	for size in 16x16 22x22 24x24 32x32 48x48 scalable; do mkdir --parents $(DESTDIR)/$(datadir)/icons/hicolor/$$size/apps; done
 
-	install -m 644 $(srcdir)/pessulus-16.png $(DESTDIR)/$(datadir)/icons/hicolor/16x16/apps/pessulus.png 
-	install -m 644 $(srcdir)/pessulus-22.png $(DESTDIR)/$(datadir)/icons/hicolor/22x22/apps/pessulus.png 
-	install -m 644 $(srcdir)/pessulus-24.png $(DESTDIR)/$(datadir)/icons/hicolor/24x24/apps/pessulus.png 
-	install -m 644 $(srcdir)/pessulus-32.png $(DESTDIR)/$(datadir)/icons/hicolor/32x32/apps/pessulus.png 
-	install -m 644 $(srcdir)/pessulus-48.png $(DESTDIR)/$(datadir)/icons/hicolor/48x48/apps/pessulus.png 
-	install -m 644 $(srcdir)/pessulus.svg $(DESTDIR)/$(datadir)/icons/hicolor/scalable/apps/pessulus.svg 
-
-install-data-hook:
-	@-if test -z "$(DESTDIR)"; then \
-	        echo "Updating Gtk icon cache."; \
-	        $(gtk_update_icon_cache); \
-	else \
-	        echo "*** Icon cache not updated.  After install, run this:"; \
-	        echo "***   $(gtk_update_icon_cache)"; \
-	fi
-
-install-data-local: install-icons
+	$(INSTALL_DATA) $(srcdir)/pessulus-16.png $(DESTDIR)/$(datadir)/icons/hicolor/16x16/apps/pessulus.png
+	$(INSTALL_DATA) $(srcdir)/pessulus-22.png $(DESTDIR)/$(datadir)/icons/hicolor/22x22/apps/pessulus.png
+	$(INSTALL_DATA) $(srcdir)/pessulus-24.png $(DESTDIR)/$(datadir)/icons/hicolor/24x24/apps/pessulus.png
+	$(INSTALL_DATA) $(srcdir)/pessulus-32.png $(DESTDIR)/$(datadir)/icons/hicolor/32x32/apps/pessulus.png
+	$(INSTALL_DATA) $(srcdir)/pessulus-48.png $(DESTDIR)/$(datadir)/icons/hicolor/48x48/apps/pessulus.png
+	$(INSTALL_DATA) $(srcdir)/pessulus.svg $(DESTDIR)/$(datadir)/icons/hicolor/scalable/apps/pessulus.svg
 
 uninstall-icons:
 	rm -f $(DESTDIR)/$(datadir)/icons/hicolor/16x16/apps/pessulus.png
@@ -47,7 +33,21 @@ uninstall-icons:
 	rm -f $(DESTDIR)/$(datadir)/icons/hicolor/48x48/apps/pessulus.png
 	rm -f $(DESTDIR)/$(datadir)/icons/hicolor/scalable/apps/pessulus.svg
 
-uninstall-local: uninstall-icons
+update-icon-cache:
+	@-if test -z "$(DESTDIR)"; then \
+		echo "Updating Gtk icon cache."; \
+		$(gtk_update_icon_cache); \
+	else \
+		echo "*** Icon cache not updated. After (un)install, run this:"; \
+		echo "***   $(gtk_update_icon_cache)"; \
+	fi
+
+EXTRA_DIST =				\
+	$(desktop_in_files)		\
+	$(ui_DATA)			\
+	pessulus-16.png pessulus-22.png \
+	pessulus-24.png pessulus-32.png \
+	pessulus-48.png pessulus.svg
 
 CLEANFILES =			\
 	$(desktop_DATA)