From ff51d4b0937617d791b1460f8fa0d94b7decd393 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Sat, 22 Dec 2018 13:40:53 -0500
Subject: Rewrite libopkbuild sources list building

---
diff --git a/Makefile.am b/Makefile.am
index 32e6d66..ff9ee39 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,9 +18,6 @@
 # along with opkbuild.  If not, see <http://www.gnu.org/licenses/>.
 
 include $(top_srcdir)/src/local.mk
-include $(top_srcdir)/lib/local.mk
-include $(top_srcdir)/lib/package/local.mk
-include $(top_srcdir)/lib/metadata/local.mk
 include $(top_srcdir)/man/local.mk
 include $(top_srcdir)/locale/local.mk
 include $(top_srcdir)/tests/local.mk
@@ -38,10 +35,7 @@ LINKLIB = '$(srcdir)/tools/shld.sh' -o $@
 
 bin_SCRIPTS = $(bin_sources:.sh=)
 libdata_DATA = lib/libopkbuild$(SHSOEXT)$(libopkbuild_shsoversion)
-libopkbuild_sources = \
-	$(pkgdata_sources) \
-	$(pkgdatapackage_sources) \
-	$(pkgdatametadata_sources)
+libopkbuild_sources =
 libopkbuild_ldadd = $(libopkbuild_sources:.sh=.sho)
 libopkbuild_dependencies = $(libopkbuild_ldadd)
 libopkbuild_shsoversion = .1
@@ -189,3 +183,5 @@ lib/libopkbuild$(SHSOEXT)$(libopkbuild_shsoversion): $(libopkbuild_dependencies)
 .sh.ms:
 	$(AM_V_GEN)$(MKDIR_P) "$$(dirname $@)"
 	$(AM_V_at)cp $< $@
+
+include $(top_srcdir)/lib/local.mk
diff --git a/lib/local.mk b/lib/local.mk
index 21aa786..d0c66e3 100644
--- a/lib/local.mk
+++ b/lib/local.mk
@@ -1,9 +1,12 @@
-pkgdata_sources = \
-	lib/common.sh \
-	lib/locale.sh \
-	lib/output.sh \
-	lib/package.sh \
-	lib/metadata.sh \
-	lib/control.sh \
-	lib/changelog.sh \
-	lib/deps.sh
+ libopkbuild_sources += \
+	%reldir%/common.sh \
+	%reldir%/locale.sh \
+	%reldir%/output.sh \
+	%reldir%/package.sh \
+	%reldir%/metadata.sh \
+	%reldir%/control.sh \
+	%reldir%/changelog.sh \
+	%reldir%/deps.sh
+
+include %reldir%/package/local.mk
+include %reldir%/metadata/local.mk
diff --git a/lib/metadata/local.mk b/lib/metadata/local.mk
index 4340160..a4095df 100644
--- a/lib/metadata/local.mk
+++ b/lib/metadata/local.mk
@@ -1,2 +1,2 @@
-pkgdatametadata_sources = \
-	lib/metadata/proteanos.sh
+ libopkbuild_sources += \
+	%reldir%/proteanos.sh
diff --git a/lib/package/local.mk b/lib/package/local.mk
index aee6eca..61dce60 100644
--- a/lib/package/local.mk
+++ b/lib/package/local.mk
@@ -1,2 +1,2 @@
-pkgdatapackage_sources = \
-	lib/package/2.sh
+ libopkbuild_sources += \
+	%reldir%/2.sh
--
cgit v0.9.1