opkbuild, ob-*: Build with shpp and shld

2 files changed, 43 insertions, 19 deletions

diff --git a/Makefile.am b/Makefile.am
index c020d83..de6c6ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,9 +40,10 @@ SHPPFLAGS = \
 	-DSYSCONFDIR="$(sysconfdir)" \
 	-DMETADATA="$(METADATA)"
 SHSOEXT = .shso
+LINK = printf "PACKAGE_VERSION='%s'\n" "$(PACKAGE_VERSION_GIT)" | \
+	'$(srcdir)/tools/shld.sh' -I '$(SH)' -o $@ config.sh -
 LIBLINK = '$(srcdir)/tools/shld.sh' -o $@
 
-bin_SCRIPTS = $(bin_sources:.sh=)
 libdata_DATA = lib/libopkbuild$(SHSOEXT)$(libopkbuild_shsoversion)
 libopkbuild_sources =
 EXTRA_libopkbuild_sources =
@@ -54,7 +55,6 @@ man3_MANS = $(man3_sources:.3in=.3)
 locale_MESSAGES = $(locale_sources:.sh=.ms)
 dist_pkgdata_DATA = optstring
 CLEANFILES = \
-	$(bin_SCRIPTS) \
 	$(libdata_DATA) \
 	$(libopkbuild_ldadd) \
 	$(man1_MANS) \
@@ -69,7 +69,6 @@ EXTRA_DIST = \
 	TODO \
 	autogen.sh \
 	mksysconf.in \
-	$(bin_sources) \
 	$(libopkbuild_sources) \
 	$(man1_sources) \
 	$(man3_sources) \
@@ -160,11 +159,6 @@ lib/libopkbuild$(SHSOEXT)$(libopkbuild_shsoversion): $(libopkbuild_dependencies)
 	@rm -f lib/libopkbuild$(SHSOEXT)$(libopkbuild_shsoversion)
 	$(AM_V_CCLD)$(LIBLINK) $(libopkbuild_ldadd)
 
-.sh:
-	$(AM_V_GEN)$(MKDIR_P) "$$(dirname $@)"
-	$(AM_V_at)$(do_subst) $< >$@
-	$(AM_V_at)chmod a+x $@
-
 .sh.sho:
 	$(AM_V_GEN)$(MKDIR_P) "$$(dirname $@)"
 	$(AM_V_at)$(SH) -n $<
diff --git a/src/local.mk b/src/local.mk
index c33fee0..1491be1 100644
--- a/src/local.mk
+++ b/src/local.mk
@@ -1,11 +1,41 @@
-bin_sources = \
-	src/opkbuild.sh \
-	src/ob-checkbuilddeps.sh \
-	src/ob-buildenv.sh \
-	src/ob-unpacksource.sh \
-	src/ob-applypatches.sh \
-	src/ob-installplatconf.sh \
-	src/ob-installdocs.sh \
-	src/ob-gencontrol.sh \
-	src/ob-buildopk.sh \
-	src/ob-genchanges.sh
+bin_PROGRAMS = \
+	src/opkbuild \
+	src/ob-checkbuilddeps \
+	src/ob-buildenv \
+	src/ob-unpacksource \
+	src/ob-applypatches \
+	src/ob-installplatconf \
+	src/ob-installdocs \
+	src/ob-gencontrol \
+	src/ob-buildopk \
+	src/ob-genchanges
+
+src_opkbuild_SOURCES = src/opkbuild.sh
+src_opkbuild_LDADD = $(src_opkbuild_SOURCES:.sh=.sho)
+
+src_ob_checkbuilddeps_SOURCES = src/ob-checkbuilddeps.sh
+src_ob_checkbuilddeps_LDADD = $(src_ob_checkbuilddeps_SOURCES:.sh=.sho)
+
+src_ob_buildenv_SOURCES = src/ob-buildenv.sh
+src_ob_buildenv_LDADD = $(src_ob_buildenv_SOURCES:.sh=.sho)
+
+src_ob_unpacksource_SOURCES = src/ob-unpacksource.sh
+src_ob_unpacksource_LDADD = $(src_ob_unpacksource_SOURCES:.sh=.sho)
+
+src_ob_applypatches_SOURCES = src/ob-applypatches.sh
+src_ob_applypatches_LDADD = $(src_ob_applypatches_SOURCES:.sh=.sho)
+
+src_ob_installplatconf_SOURCES = src/ob-installplatconf.sh
+src_ob_installplatconf_LDADD = $(src_ob_installplatconf_SOURCES:.sh=.sho)
+
+src_ob_installdocs_SOURCES = src/ob-installdocs.sh
+src_ob_installdocs_LDADD = $(src_ob_installdocs_SOURCES:.sh=.sho)
+
+src_ob_gencontrol_SOURCES = src/ob-gencontrol.sh
+src_ob_gencontrol_LDADD = $(src_ob_gencontrol_SOURCES:.sh=.sho)
+
+src_ob_buildopk_SOURCES = src/ob-buildopk.sh
+src_ob_buildopk_LDADD = $(src_ob_buildopk_SOURCES:.sh=.sho)
+
+src_ob_genchanges_SOURCES = src/ob-genchanges.sh
+src_ob_genchanges_LDADD = $(src_ob_genchanges_SOURCES:.sh=.sho)