diff options
| -rw-r--r-- | Makefile.in | 12 | ||||
| -rw-r--r-- | lib/local.mk | 21 |
2 files changed, 10 insertions, 23 deletions
diff --git a/Makefile.in b/Makefile.in index 90eab0b..c262f35 100644 --- a/Makefile.in +++ b/Makefile.in @@ -43,11 +43,12 @@ archtab = @archtab@ include $(srcdir)/src/local.mk include $(srcdir)/lib/local.mk +include $(srcdir)/lib/buildsystem/local.mk include $(srcdir)/man/local.mk include $(srcdir)/locale/local.mk bin = $(bin_srcs:.sh=) -pkglib = $(lib_pkglib) +pkglib = $(pkglib_srcs:.sh=.sm) man1 = $(man_man1) locale = $(locale_locale) @@ -62,8 +63,9 @@ distfiles = \ ChangeLog \ TODO \ src/local.mk \ + lib/local.mk \ $(bin_srcs) \ - $(lib_distfiles) \ + $(pkglib_srcs) \ $(man_distfiles) \ $(locale_distfiles) @@ -76,12 +78,16 @@ script = \ s&@@LOCALEDIR@@&$(localedir)&;\ s&@@SH@@&$(sh)&; -.SUFFIXES: .sh +.SUFFIXES: .sh .sm .sh: @printf ' SED %s\n' '$*' @sed '$(script)' '$(srcdir)/$*.sh' >'$*' +.sh.sm: + @printf ' SED %s\n' '$*.sm' + @sed '$(script)' '$(srcdir)/$*.sh' >'$*.sm' + all: all-exec all-data all-exec: all-bin all-pkglib all-bin: $(bin) diff --git a/lib/local.mk b/lib/local.mk index ca3f65e..e249963 100644 --- a/lib/local.mk +++ b/lib/local.mk @@ -16,27 +16,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -include lib/buildsystem/local.mk - -lib_srcs = \ +pkglib_srcs = \ lib/load.sh \ lib/common.sh \ lib/buildsystem.sh \ $(lib_buildsystem_srcs) -lib_pkglib = $(lib_srcs:.sh=.sm) -lib_distfiles = lib/local.mk $(lib_srcs) $(lib_buildsystem_distfiles) - -# FIXME: libopkhelper is deprecated. Migrate code and remove this variable. -lib_script = \ - s&@@PACKAGE_NAME@@&$(package_name)&;\ - s&@@PACKAGE_VERSION@@&$(package_version)&;\ - s&@@PKGLIBDIR@@&$(pkglibdir)&;\ - s&@@LIBOPKHELPER@@&$(libopkhelper)&;\ - s&@@LOCALEDIR@@&$(localedir)&;\ - s&@@SH@@&$(sh)&; - -.SUFFIXES: .sh .sm - -.sh.sm: - @printf ' SED %s\n' '$*.sm' - @sed '$(lib_script)' '$(srcdir)/$*.sh' >'$*.sm' |