From dc9339b5699ee3b0d48145a1389f93e9e09d02a6 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Mon, 30 Jan 2017 14:46:36 -0500
Subject: Update and tidy the build system for autothing v3.

---
 src/lib/GNUmakefile | 1 +
 src/lib/Makefile    | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)
 create mode 120000 src/lib/GNUmakefile

(limited to 'src/lib')

diff --git a/src/lib/GNUmakefile b/src/lib/GNUmakefile
new file mode 120000
index 0000000..54fdd42
--- /dev/null
+++ b/src/lib/GNUmakefile
@@ -0,0 +1 @@
+../../GNUmakefile
\ No newline at end of file
diff --git a/src/lib/Makefile b/src/lib/Makefile
index 9d52440..eb2ffde 100644
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -1,12 +1,12 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-libretools-libs += common.sh conf.sh
-devtools-files = common.sh.in
+libretools.src.devtools  = common.sh.in
+libretools.out.libs     += common.sh conf.sh
 
 # Build ##############################################################
 
-$(outdir)/conf.sh: $(var)sysconfdir $(var)pkgconfdir
+$(outdir)/conf.sh: $(var.)sysconfdir $(var.)pkgconfdir
 
 $(outdir)/common.sh: $(outdir)/%: $(srcdir)/%.in $(srcdir)/%.head $(srcdir)/%.tail $(outdir)/Makefile
 	@echo "OUT $@"
@@ -33,7 +33,7 @@ $(outdir)/blacklist.sh.pot: $(srcdir)/blacklist.sh $(srcdir)/librexgettext
 			sed -r -e 's/^# (.*)/msgid "\1"\nmsgstr ""\n/' \
 			       -e 's|^[0-9]*$$|#. embedded usage text\n#: $<:&|' && \
 		$(<D)/librexgettext --simple=_l:2 $< && \
-	:; } | $(pofmt) > $@
+	:; } | $(libretools.pofmt) > $@
 $(outdir)/common.sh.pot    : LIBREXGETTEXT_FLAGS += --simple=_l:2
 $(outdir)/conf.sh.pot      : LIBREXGETTEXT_FLAGS += --simple=_l:2
 $(outdir)/librelib.pot     : LIBREXGETTEXT_FLAGS += --simple=_l:2
-- 
cgit v1.2.3-54-g00ecf