diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2018-12-27 16:23:28 (EST) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2018-12-27 16:23:28 (EST) |
| commit | 9aaf515e1e6c301f487107002f366967686913a9 (patch) | |
| tree | 540d167925f4c35e3f3d5f07b89b7b09df8a72a7 | |
| parent | 9128234a6c5ba200f6fd8d6a80f094505748b6ab (diff) | |
Move code from Makefile.am to lib/local.mk
| -rw-r--r-- | Makefile.am | 16 | ||||
| -rw-r--r-- | lib/local.mk | 19 |
2 files changed, 18 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index cdc322d..5543ef7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,20 +52,11 @@ LINK = printf "PACKAGE_VERSION='%s'\n" "$(PACKAGE_VERSION_GIT)" | \ '$(srcdir)/tools/shld.sh' -I '$(SH)' -o $@ config.sh - LIBLINK = '$(srcdir)/tools/shld.sh' -o $@ -libdata_DATA = lib/libopkbuild.$(SHSOEXT).$(libopkbuild_shsoversion) -libopkbuild_sources = -EXTRA_libopkbuild_sources = -libopkbuild_ldadd = $(libopkbuild_sources:.sh=.sho) -libopkbuild_dependencies = $(libopkbuild_ldadd) -libopkbuild_shsoversion = 2 - locale_MESSAGES = $(locale_sources:.sh=.ms) dist_pkgdata_DATA = optstring CLEANFILES = \ - $(libdata_DATA) \ - $(libopkbuild_ldadd) \ $(locale_MESSAGES) libdatadir = $(datadir)/sh @@ -76,8 +67,6 @@ EXTRA_DIST = \ TODO \ autogen.sh \ mksysconf.in \ - $(libopkbuild_sources) \ - $(EXTRA_libopkbuild_sources) \ $(locale_sources) \ $(TESTS) \ tools/shpp.sh \ @@ -197,11 +186,6 @@ release: '$(srcdir)/scripts/announce-release.sh' \ $(PACKAGE) $(VERSION) '$(PACKAGE_NAME)' -lib/libopkbuild.$(SHSOEXT).$(libopkbuild_shsoversion): \ - $(libopkbuild_dependencies) - @rm -f lib/libopkbuild.$(SHSOEXT).$(libopkbuild_shsoversion) - $(AM_V_CCLD)$(LIBLINK) $(libopkbuild_ldadd) - .sh.sho: $(AM_V_GEN)$(MKDIR_P) "$$(dirname $@)" $(AM_V_at)$(SH) -n $< diff --git a/lib/local.mk b/lib/local.mk index 50a3669..8eaf8c5 100644 --- a/lib/local.mk +++ b/lib/local.mk @@ -1,4 +1,5 @@ -libopkbuild_sources += \ +libdata_DATA = %reldir%/libopkbuild.$(SHSOEXT).$(libopkbuild_shsoversion) +libopkbuild_sources = \ %reldir%/common.sh \ %reldir%/locale.sh \ %reldir%/output.sh \ @@ -7,6 +8,22 @@ libopkbuild_sources += \ %reldir%/control.sh \ %reldir%/changelog.sh \ %reldir%/deps.sh +EXTRA_libopkbuild_sources = +libopkbuild_ldadd = $(libopkbuild_sources:.sh=.sho) +libopkbuild_dependencies = $(libopkbuild_ldadd) +libopkbuild_shsoversion = 2 + +CLEANFILES += \ + $(libdata_DATA) \ + $(libopkbuild_ldadd) +EXTRA_DIST += \ + $(libopkbuild_sources) \ + $(EXTRA_libopkbuild_sources) + +%reldir%/libopkbuild.$(SHSOEXT).$(libopkbuild_shsoversion): \ + $(libopkbuild_dependencies) + @rm -f %reldir%/libopkbuild.$(SHSOEXT).$(libopkbuild_shsoversion) + $(AM_V_CCLD)$(LIBLINK) $(libopkbuild_ldadd) include %reldir%/package/local.mk include %reldir%/metadata/local.mk |