[Monotone-commits-diffs] net.venge.monotone: 785f9aed6e899074a1a042029b0538e4d9f558c1

[code]

revision:            785f9aed6e899074a1a042029b0538e4d9f558c1
date:                2011-02-23T11:28:09
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone
changelog:
The .gmo files are made part of the source distribution, but were still
considered files to be removed by a normal 'make clean', which is
contradictory.  Instead, they should only be removed by 'make
maintainerclean'.

* Makefile.am (CLEAN_POFILES): Move $(ALL_GMOFILES) to ...
  (MAINTAINERCLEAN_POFILES): ... here.
  (MAINTAINERCLEANFILES): Added variable to hold files that should be
  removed by 'make maintainerclean'.

manifest:
format_version "1"

new_manifest [1f8df206127983295e6ac1a7c6f49c6542d8c5a8]

old_revision [9fa8e839780984c1028b5023f47d525066d99535]

patch "Makefile.am"
 from [6e6a3f7aaecccc749e261d452d84bd8431ba6cb7]
   to [42b1ff138d48f7ce985dc49c1221d6db70e00665]
============================================================
--- Makefile.am	6e6a3f7aaecccc749e261d452d84bd8431ba6cb7
+++ Makefile.am	42b1ff138d48f7ce985dc49c1221d6db70e00665
@@ -394,9 +394,9 @@ ALL_GMOFILES  := $(addprefix po/,$(addsu
 ALL_LINGUAS   := $(basename $(notdir $(ALL_POFILES)))
 ALL_POREADMES := $(addprefix po/README.,$(ALL_LINGUAS))
 ALL_GMOFILES  := $(addprefix po/,$(addsuffix .gmo, $(ALL_LINGUAS)))
-CLEAN_POFILES := $(ALL_GMOFILES) \
-		 $(addprefix po/,$(addsuffix .merged.po, $(ALL_LINGUAS))) \
+CLEAN_POFILES := $(addprefix po/,$(addsuffix .merged.po, $(ALL_LINGUAS))) \
 		 po/$(PACKAGE).pot
+MAINTAINERCLEAN_POFILES := $(ALL_GMOFILES)
 
 EXTRA_DIST += $(ALL_POFILES) $(ALL_POREADMES) po/LINGUAS po/README
 
@@ -702,6 +702,12 @@ CLEANFILES = $(bin_SCRIPTS) $(noinst_SCR
 CLEANFILES = $(bin_SCRIPTS) $(noinst_SCRIPTS) $(bashcomp_DATA) \
 	$(BUILT_SOURCES) $(CLEAN_SRCS) $(CLEAN_POFILES)
 
+# We make GMO files part of the source distribution.  This means we can't
+# clean them away like other files, but a maintainer might still want to
+# get rid of them to rebuild them.
+
+MAINTAINERCLEANFILES = $(MAINTAINERCLEAN_POFILES)
+
 # automake provides no nice way to build a helper program to execute
 # on the build machine, so we need our own rule.  almost all the
 # standard flags variables are inappropriate.