From a1ffa59e136ba6ed554535ebf164de15ffe0cae8 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pj@pehjota.net>
Date: Mon, 07 Dec 2015 00:19:48 -0500
Subject: Makefile.am: Shuffle

---
diff --git a/Makefile.am b/Makefile.am
index 52d256c..f1e7d92 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
 MANUAL = ProteanOS Development Kit Manual
 TEXTDOMAIN = $$(printf '%s\n' '$(PACKAGE)' | sed -e 's|-|_|g')
 
-SUFFIXES = .sh .sho .1in .1 .8in .8 .ms
+SUFFIXES = .sh .sho .ms .1in .1 .8in .8
 
 bin_PROGRAMS = prokit
 
@@ -34,6 +34,8 @@ prokit_SHPPFLAGS = \
 prokit_LDADD = $(prokit_SOURCES:.sh=.sho)
 prokit_LINK = '$(srcdir)/tools/shld.sh' -I '$(SH)' -o $@ config.sh
 
+locale_MESSAGES = $(locale_sources:.sh=.ms)
+
 man1_MANS = $(man1_sources:.1in=.1)
 man8_MANS = $(man8_sources:.8in=.8)
 do_subst = sed \
@@ -41,20 +43,19 @@ do_subst = sed \
 	-e 's|[@]PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' \
 	-e 's|[@]MANUAL[@]|$(MANUAL)|g'
 
-locale_MESSAGES = $(locale_sources:.sh=.ms)
 noinst_DATA = $(locale_MESSAGES) .builddirstamp
 CLEANFILES = \
+	$(locale_MESSAGES) \
 	$(man1_MANS) \
 	$(man8_MANS) \
-	$(locale_MESSAGES) \
 	.builddirstamp
 uninstall_dirs = \
 	'$(DESTDIR)$(pkglocalstatedir)/mount' \
 	'$(DESTDIR)$(pkglocalstatedir)'
 sources = \
+	$(locale_sources) \
 	$(man1_sources) \
 	$(man8_sources) \
-	$(locale_sources) \
 	$(TESTS) \
 	tests/common.sh \
 	tests/parse_control.common.sh
@@ -188,6 +189,10 @@ release:
 	$(AM_V_GEN)$(MKDIR_P) "$$(dirname $@)"
 	$(AM_V_at)'$(srcdir)/tools/shpp.sh' $(prokit_SHPPFLAGS) $< $@
 
+.sh.ms:
+	$(AM_V_GEN)$(MKDIR_P) "$$(dirname $@)"
+	$(AM_V_at)cp $< $@
+
 .1in.1:
 	$(AM_V_GEN)$(MKDIR_P) "$$(dirname $@)"
 	$(AM_V_at)$(do_subst) $< >$@
@@ -196,11 +201,7 @@ release:
 	$(AM_V_GEN)$(MKDIR_P) "$$(dirname $@)"
 	$(AM_V_at)$(do_subst) $< >$@
 
-.sh.ms:
-	$(AM_V_GEN)$(MKDIR_P) "$$(dirname $@)"
-	$(AM_V_at)cp $< $@
-
 include $(top_srcdir)/src/local.mk
-include $(top_srcdir)/man/local.mk
 include $(top_srcdir)/locale/local.mk
+include $(top_srcdir)/man/local.mk
 include $(top_srcdir)/tests/local.mk
--
cgit v0.9.1