From: Bruno Haible <bruno@clisp.org>
Date: Wed, 24 Oct 2018 16:33:23 +0000 (+0200)
Subject: po: Remove obsolete Makefile rules for .mo files.
X-Git-Tag: v0.20~288
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5f00816c6fe584d9de0f429a68a328c819a6ea7;p=thirdparty%2Fgettext.git

po: Remove obsolete Makefile rules for .mo files.

* gettext-runtime/po/Makefile.in.in (MSGFMT*): Remove variables.
(.SUFFIXES): Remove .mo.
(.po.mo): Remove rule.
(distclean): Don't remove *.mo files.
* gettext-tools/examples/hello-*/po/Makefile.am (.SUFFIXES): Remove .mo.
(.po.mo): Remove rule.
(DISTCLEANFILES): Remove *.mo.
* gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile (.SUFFIXES):
Remove .mo.
* gettext-runtime/m4/po.m4 (AM_PO_SUBDIRS): Don't set MSGFMT_015.
---

diff --git a/gettext-runtime/m4/po.m4 b/gettext-runtime/m4/po.m4
index 8235c2542..fba008a0a 100644
--- a/gettext-runtime/m4/po.m4
+++ b/gettext-runtime/m4/po.m4
@@ -1,4 +1,4 @@
-# po.m4 serial 27 (gettext-0.19.9)
+# po.m4 serial 28 (gettext-0.19.9)
 dnl Copyright (C) 1995-2014, 2016, 2018 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -45,13 +45,6 @@ AC_DEFUN([AM_PO_SUBDIRS],
   AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
 
   dnl Test whether it is GNU msgfmt >= 0.15.
-changequote(,)dnl
-  case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
-    *) MSGFMT_015=$MSGFMT ;;
-  esac
-changequote([,])dnl
-  AC_SUBST([MSGFMT_015])
 changequote(,)dnl
   case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
     '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
diff --git a/gettext-runtime/po/Makefile.in.in b/gettext-runtime/po/Makefile.in.in
index d278c10e5..371ee3944 100644
--- a/gettext-runtime/po/Makefile.in.in
+++ b/gettext-runtime/po/Makefile.in.in
@@ -53,10 +53,6 @@ GMSGFMT_ = @GMSGFMT@
 GMSGFMT_no = @GMSGFMT@
 GMSGFMT_yes = @GMSGFMT_015@
 GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
-MSGFMT_ = @MSGFMT@
-MSGFMT_no = @MSGFMT@
-MSGFMT_yes = @MSGFMT_015@
-MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
 XGETTEXT_ = @XGETTEXT@
 XGETTEXT_no = @XGETTEXT@
 XGETTEXT_yes = @XGETTEXT_015@
@@ -94,11 +90,7 @@ DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
 # Makevars gets inserted here. (Don't remove this line!)
 
 .SUFFIXES:
-.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
-
-.po.mo:
-	@echo "$(MSGFMT) -c -o $@ $<"; \
-	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+.SUFFIXES: .po .gmo .sed .sin .nop .po-create .po-update
 
 .po.gmo:
 	@lang=`echo $* | sed -e 's,.*/,,'`; \
@@ -386,7 +378,7 @@ mostlyclean:
 clean: mostlyclean
 
 distclean: clean
-	rm -f Makefile Makefile.in POTFILES *.mo
+	rm -f Makefile Makefile.in POTFILES
 
 maintainer-clean: distclean
 	@echo "This command is intended for maintainers to use;"
diff --git a/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am b/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am
index 08872fdb5..a81633cdf 100644
--- a/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am
+++ b/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am
@@ -90,11 +90,7 @@ DUMMYPOFILES = @DUMMYPOFILES@
 # $(foreach lang, user-specified subset of $(LINGUAS), $(lang).gmo)
 CATALOGS = @CATALOGS@
 
-SUFFIXES = .po .gmo .mo .sed .sin .nop .po-create .po-update
-
-.po.mo:
-	@echo "$(MSGFMT) -c -o $@ $<"; \
-	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+SUFFIXES = .po .gmo .sed .sin .nop .po-create .po-update
 
 .po.gmo:
 	@lang=`echo $* | sed -e 's,.*/,,'`; \
@@ -331,8 +327,6 @@ MOSTLYCLEANFILES += stamp-poT
 MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
 MOSTLYCLEANFILES += *.o
 
-DISTCLEANFILES = *.mo
-
 MAINTAINERCLEANFILES = stamp-po $(GMOFILES)
 
 EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES)
diff --git a/gettext-tools/examples/hello-clisp/po/Makefile.am b/gettext-tools/examples/hello-clisp/po/Makefile.am
index 84c4cbdb4..8e1b7113d 100644
--- a/gettext-tools/examples/hello-clisp/po/Makefile.am
+++ b/gettext-tools/examples/hello-clisp/po/Makefile.am
@@ -84,11 +84,7 @@ DUMMYPOFILES = @DUMMYPOFILES@
 # $(foreach lang, user-specified subset of $(LINGUAS), $(lang).gmo)
 CATALOGS = @CATALOGS@
 
-SUFFIXES = .po .gmo .mo .sed .sin .nop .po-create .po-update
-
-.po.mo:
-	@echo "$(MSGFMT) -c -o $@ $<"; \
-	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+SUFFIXES = .po .gmo .sed .sin .nop .po-create .po-update
 
 .po.gmo:
 	@lang=`echo $* | sed -e 's,.*/,,'`; \
@@ -325,8 +321,6 @@ MOSTLYCLEANFILES += stamp-poT
 MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
 MOSTLYCLEANFILES += *.o
 
-DISTCLEANFILES = *.mo
-
 MAINTAINERCLEANFILES = stamp-po $(GMOFILES)
 
 EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES)
diff --git a/gettext-tools/examples/hello-gawk/po/Makefile.am b/gettext-tools/examples/hello-gawk/po/Makefile.am
index 35c7f10ef..6ebcb8262 100644
--- a/gettext-tools/examples/hello-gawk/po/Makefile.am
+++ b/gettext-tools/examples/hello-gawk/po/Makefile.am
@@ -84,11 +84,7 @@ DUMMYPOFILES = @DUMMYPOFILES@
 # $(foreach lang, user-specified subset of $(LINGUAS), $(lang).gmo)
 CATALOGS = @CATALOGS@
 
-SUFFIXES = .po .gmo .mo .sed .sin .nop .po-create .po-update
-
-.po.mo:
-	@echo "$(MSGFMT) -c -o $@ $<"; \
-	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+SUFFIXES = .po .gmo .sed .sin .nop .po-create .po-update
 
 .po.gmo:
 	@lang=`echo $* | sed -e 's,.*/,,'`; \
@@ -325,8 +321,6 @@ MOSTLYCLEANFILES += stamp-poT
 MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
 MOSTLYCLEANFILES += *.o
 
-DISTCLEANFILES = *.mo
-
 MAINTAINERCLEANFILES = stamp-po $(GMOFILES)
 
 EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES)
diff --git a/gettext-tools/examples/hello-guile/po/Makefile.am b/gettext-tools/examples/hello-guile/po/Makefile.am
index 0a4a13433..642185ddf 100644
--- a/gettext-tools/examples/hello-guile/po/Makefile.am
+++ b/gettext-tools/examples/hello-guile/po/Makefile.am
@@ -84,11 +84,7 @@ DUMMYPOFILES = @DUMMYPOFILES@
 # $(foreach lang, user-specified subset of $(LINGUAS), $(lang).gmo)
 CATALOGS = @CATALOGS@
 
-SUFFIXES = .po .gmo .mo .sed .sin .nop .po-create .po-update
-
-.po.mo:
-	@echo "$(MSGFMT) -c -o $@ $<"; \
-	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+SUFFIXES = .po .gmo .sed .sin .nop .po-create .po-update
 
 .po.gmo:
 	@lang=`echo $* | sed -e 's,.*/,,'`; \
@@ -325,8 +321,6 @@ MOSTLYCLEANFILES += stamp-poT
 MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
 MOSTLYCLEANFILES += *.o
 
-DISTCLEANFILES = *.mo
-
 MAINTAINERCLEANFILES = stamp-po $(GMOFILES)
 
 EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES)
diff --git a/gettext-tools/examples/hello-librep/po/Makefile.am b/gettext-tools/examples/hello-librep/po/Makefile.am
index b99e81695..f0f4cf346 100644
--- a/gettext-tools/examples/hello-librep/po/Makefile.am
+++ b/gettext-tools/examples/hello-librep/po/Makefile.am
@@ -84,11 +84,7 @@ DUMMYPOFILES = @DUMMYPOFILES@
 # $(foreach lang, user-specified subset of $(LINGUAS), $(lang).gmo)
 CATALOGS = @CATALOGS@
 
-SUFFIXES = .po .gmo .mo .sed .sin .nop .po-create .po-update
-
-.po.mo:
-	@echo "$(MSGFMT) -c -o $@ $<"; \
-	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+SUFFIXES = .po .gmo .sed .sin .nop .po-create .po-update
 
 .po.gmo:
 	@lang=`echo $* | sed -e 's,.*/,,'`; \
@@ -325,8 +321,6 @@ MOSTLYCLEANFILES += stamp-poT
 MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
 MOSTLYCLEANFILES += *.o
 
-DISTCLEANFILES = *.mo
-
 MAINTAINERCLEANFILES = stamp-po $(GMOFILES)
 
 EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES)
diff --git a/gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile b/gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile
index 459dce0b7..cb8ad5576 100644
--- a/gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile
+++ b/gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile
@@ -91,7 +91,7 @@ STRINGSFILES = $(foreach lang, $(LINGUAS), $(top_srcdir)/$(NSLOCALE_$(lang)).lpr
 ENSTRINGSFILES = $(foreach lang, $(ENLINGUAS), $(top_srcdir)/$(NSLOCALE_$(lang)).lproj/Localizable.strings)
 CATALOGS = $(STRINGSFILES) $(ENSTRINGSFILES)
 
-.SUFFIXES: .po .mo .sed .sin .nop .po-create .po-update
+.SUFFIXES: .po .sed .sin .nop .po-create .po-update
 
 .sin.sed:
 	sed -e '/^#/d' $< > t-$@
diff --git a/gettext-tools/examples/hello-pascal/po/Makefile.am b/gettext-tools/examples/hello-pascal/po/Makefile.am
index dd2bb1ea3..9d5c70569 100644
--- a/gettext-tools/examples/hello-pascal/po/Makefile.am
+++ b/gettext-tools/examples/hello-pascal/po/Makefile.am
@@ -84,11 +84,7 @@ DUMMYPOFILES = @DUMMYPOFILES@
 # $(foreach lang, user-specified subset of $(LINGUAS), $(lang).gmo)
 CATALOGS = @CATALOGS@
 
-SUFFIXES = .po .gmo .mo .sed .sin .nop .po-create .po-update
-
-.po.mo:
-	@echo "$(MSGFMT) -c -o $@ $<"; \
-	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+SUFFIXES = .po .gmo .sed .sin .nop .po-create .po-update
 
 .po.gmo:
 	@lang=`echo $* | sed -e 's,.*/,,'`; \
@@ -325,8 +321,6 @@ MOSTLYCLEANFILES += stamp-poT
 MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
 MOSTLYCLEANFILES += *.o
 
-DISTCLEANFILES = *.mo
-
 MAINTAINERCLEANFILES = stamp-po $(GMOFILES)
 
 EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES)
diff --git a/gettext-tools/examples/hello-perl/po/Makefile.am b/gettext-tools/examples/hello-perl/po/Makefile.am
index 5d597fc49..3f8324fea 100644
--- a/gettext-tools/examples/hello-perl/po/Makefile.am
+++ b/gettext-tools/examples/hello-perl/po/Makefile.am
@@ -94,11 +94,7 @@ DUMMYPOFILES = @DUMMYPOFILES@
 # $(foreach lang, user-specified subset of $(LINGUAS), $(lang).gmo)
 CATALOGS = @CATALOGS@
 
-SUFFIXES = .po .gmo .mo .sed .sin .nop .po-create .po-update
-
-.po.mo:
-	@echo "$(MSGFMT) -c -o $@ $<"; \
-	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+SUFFIXES = .po .gmo .sed .sin .nop .po-create .po-update
 
 .po.gmo:
 	@lang=`echo $* | sed -e 's,.*/,,'`; \
@@ -335,8 +331,6 @@ MOSTLYCLEANFILES += stamp-poT
 MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
 MOSTLYCLEANFILES += *.o
 
-DISTCLEANFILES = *.mo
-
 MAINTAINERCLEANFILES = stamp-po $(GMOFILES)
 
 EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES)
diff --git a/gettext-tools/examples/hello-php/po/Makefile.am b/gettext-tools/examples/hello-php/po/Makefile.am
index 0ededf9d1..d4a059c12 100644
--- a/gettext-tools/examples/hello-php/po/Makefile.am
+++ b/gettext-tools/examples/hello-php/po/Makefile.am
@@ -84,11 +84,7 @@ DUMMYPOFILES = @DUMMYPOFILES@
 # $(foreach lang, user-specified subset of $(LINGUAS), $(lang).gmo)
 CATALOGS = @CATALOGS@
 
-SUFFIXES = .po .gmo .mo .sed .sin .nop .po-create .po-update
-
-.po.mo:
-	@echo "$(MSGFMT) -c -o $@ $<"; \
-	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+SUFFIXES = .po .gmo .sed .sin .nop .po-create .po-update
 
 .po.gmo:
 	@lang=`echo $* | sed -e 's,.*/,,'`; \
@@ -325,8 +321,6 @@ MOSTLYCLEANFILES += stamp-poT
 MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
 MOSTLYCLEANFILES += *.o
 
-DISTCLEANFILES = *.mo
-
 MAINTAINERCLEANFILES = stamp-po $(GMOFILES)
 
 EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES)
diff --git a/gettext-tools/examples/hello-python/po/Makefile.am b/gettext-tools/examples/hello-python/po/Makefile.am
index af3ef4620..d57984329 100644
--- a/gettext-tools/examples/hello-python/po/Makefile.am
+++ b/gettext-tools/examples/hello-python/po/Makefile.am
@@ -84,11 +84,7 @@ DUMMYPOFILES = @DUMMYPOFILES@
 # $(foreach lang, user-specified subset of $(LINGUAS), $(lang).gmo)
 CATALOGS = @CATALOGS@
 
-SUFFIXES = .po .gmo .mo .sed .sin .nop .po-create .po-update
-
-.po.mo:
-	@echo "$(MSGFMT) -c -o $@ $<"; \
-	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+SUFFIXES = .po .gmo .sed .sin .nop .po-create .po-update
 
 .po.gmo:
 	@lang=`echo $* | sed -e 's,.*/,,'`; \
@@ -325,8 +321,6 @@ MOSTLYCLEANFILES += stamp-poT
 MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
 MOSTLYCLEANFILES += *.o
 
-DISTCLEANFILES = *.mo
-
 MAINTAINERCLEANFILES = stamp-po $(GMOFILES)
 
 EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES)
diff --git a/gettext-tools/examples/hello-sh/po/Makefile.am b/gettext-tools/examples/hello-sh/po/Makefile.am
index 6519caadb..8d9a5ed19 100644
--- a/gettext-tools/examples/hello-sh/po/Makefile.am
+++ b/gettext-tools/examples/hello-sh/po/Makefile.am
@@ -84,11 +84,7 @@ DUMMYPOFILES = @DUMMYPOFILES@
 # $(foreach lang, user-specified subset of $(LINGUAS), $(lang).gmo)
 CATALOGS = @CATALOGS@
 
-SUFFIXES = .po .gmo .mo .sed .sin .nop .po-create .po-update
-
-.po.mo:
-	@echo "$(MSGFMT) -c -o $@ $<"; \
-	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+SUFFIXES = .po .gmo .sed .sin .nop .po-create .po-update
 
 .po.gmo:
 	@lang=`echo $* | sed -e 's,.*/,,'`; \
@@ -325,8 +321,6 @@ MOSTLYCLEANFILES += stamp-poT
 MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
 MOSTLYCLEANFILES += *.o
 
-DISTCLEANFILES = *.mo
-
 MAINTAINERCLEANFILES = stamp-po $(GMOFILES)
 
 EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES)
diff --git a/gettext-tools/examples/hello-smalltalk/po/Makefile.am b/gettext-tools/examples/hello-smalltalk/po/Makefile.am
index 7f8dbb61b..405e83d86 100644
--- a/gettext-tools/examples/hello-smalltalk/po/Makefile.am
+++ b/gettext-tools/examples/hello-smalltalk/po/Makefile.am
@@ -84,11 +84,7 @@ DUMMYPOFILES = @DUMMYPOFILES@
 # $(foreach lang, user-specified subset of $(LINGUAS), $(lang).gmo)
 CATALOGS = @CATALOGS@
 
-SUFFIXES = .po .gmo .mo .sed .sin .nop .po-create .po-update
-
-.po.mo:
-	@echo "$(MSGFMT) -c -o $@ $<"; \
-	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+SUFFIXES = .po .gmo .sed .sin .nop .po-create .po-update
 
 .po.gmo:
 	@lang=`echo $* | sed -e 's,.*/,,'`; \
@@ -325,8 +321,6 @@ MOSTLYCLEANFILES += stamp-poT
 MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
 MOSTLYCLEANFILES += *.o
 
-DISTCLEANFILES = *.mo
-
 MAINTAINERCLEANFILES = stamp-po $(GMOFILES)
 
 EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES)
diff --git a/gettext-tools/examples/hello-ycp/po/Makefile.am b/gettext-tools/examples/hello-ycp/po/Makefile.am
index f9f6e7ea8..d6a2444cd 100644
--- a/gettext-tools/examples/hello-ycp/po/Makefile.am
+++ b/gettext-tools/examples/hello-ycp/po/Makefile.am
@@ -84,11 +84,7 @@ DUMMYPOFILES = @DUMMYPOFILES@
 # $(foreach lang, user-specified subset of $(LINGUAS), $(lang).gmo)
 CATALOGS = @CATALOGS@
 
-SUFFIXES = .po .gmo .mo .sed .sin .nop .po-create .po-update
-
-.po.mo:
-	@echo "$(MSGFMT) -c -o $@ $<"; \
-	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+SUFFIXES = .po .gmo .sed .sin .nop .po-create .po-update
 
 .po.gmo:
 	@lang=`echo $* | sed -e 's,.*/,,'`; \
@@ -325,8 +321,6 @@ MOSTLYCLEANFILES += stamp-poT
 MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
 MOSTLYCLEANFILES += *.o
 
-DISTCLEANFILES = *.mo
-
 MAINTAINERCLEANFILES = stamp-po $(GMOFILES)
 
 EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES)