gnome-specimen r63 - in branches/import-from-bzr: . data po

[wbolster svn gnome org]

Author: wbolster
Date: Tue Jun 17 18:52:55 2008
New Revision: 63
URL: http://svn.gnome.org/viewvc/gnome-specimen?rev=63&view=rev

Log:
* Some work trying to get make distcheck to work properly


Added:
   branches/import-from-bzr/ChangeLog
   branches/import-from-bzr/po/ChangeLog
Modified:
   branches/import-from-bzr/   (props changed)
   branches/import-from-bzr/.bzrignore
   branches/import-from-bzr/Makefile.am
   branches/import-from-bzr/data/Makefile.am

Modified: branches/import-from-bzr/.bzrignore
==============================================================================
--- branches/import-from-bzr/.bzrignore	(original)
+++ branches/import-from-bzr/.bzrignore	Tue Jun 17 18:52:55 2008
@@ -22,3 +22,4 @@
 ./gnome-specimen
 specimen/config.py
 po/.intltool-merge-cache
+po/gnome-specimen.pot

Modified: branches/import-from-bzr/Makefile.am
==============================================================================
--- branches/import-from-bzr/Makefile.am	(original)
+++ branches/import-from-bzr/Makefile.am	Tue Jun 17 18:52:55 2008
@@ -1,11 +1,27 @@
 
-.PHONY: ChangeLog
-
 SUBDIRS = data po specimen
 
-ChangeLog:
-	bzr log --forward > $<
+.PHONY: force-run
+
+force-run:
+
+EXTRA_DIST = autogen.sh
+DISTCLEANFILES =
+
+
+#
+# ChangeLog from bzr
+#
+
+EXTRA_DIST += ChangeLog
+DISTCLEANFILES += ChangeLog
 
+dist-hook:
+	bzr log --short > ChangeLog
+
+#
+# Executable to be installed
+#
 bin_SCRIPTS = gnome-specimen
 
 gnome-specimen: gnome-specimen.in Makefile
@@ -16,18 +32,22 @@
 		> $@
 	chmod a+x $@
 
+EXTRA_DIST += gnome-specimen.in
+
+CLEANFILES= gnome-specimen
+
 
-EXTRA_DIST = \
-	ChangeLog \
-	gnome-specimen.in \
+#
+# i18n build foo
+#
+
+EXTRA_DIST += \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in
 
-CLEANFILES= \
-	gnome-specimen
-
-DISTCLEANFILES = \
+DISTCLEANFILES += \
 	intltool-extract \
 	intltool-merge \
 	intltool-update
+

Modified: branches/import-from-bzr/data/Makefile.am
==============================================================================
--- branches/import-from-bzr/data/Makefile.am	(original)
+++ branches/import-from-bzr/data/Makefile.am	Tue Jun 17 18:52:55 2008
@@ -1,18 +1,32 @@
+
+EXTRA_DIST =
+DISTCLEANFILES =
+
+
+#
+# Glade files
+#
+
 gladedir   = $(pkgdatadir)/glade
 glade_DATA = gnome-specimen.glade
+EXTRA_DIST += $(glade_DATA)
+
+
+#
+# Artwork
+#
 
 artdir = $(pkgdatadir)
 art_DATA = gnome-specimen.png
+EXTRA_DIST += $(art_DATA)
+
+#
+# .desktop file
+#
 
 @INTLTOOL_DESKTOP_RULE@
 desktop_in_files = gnome-specimen.desktop.in.in
 desktopdir = $(datadir)/applications
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
-
-EXTRA_DIST = \
-	$(desktop_in_files) \
-	$(glade_DATA)
-
-
-DISTCLEANFILES = \
-	$(desktop_DATA)
+EXTRA_DIST += $(desktop_in_files)
+DISTCLEANFILES += $(desktop_DATA)