From 06c0c9b068bbc94eb82dc317ffc811d1c58d3e38 Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Thu, 09 May 2013 13:04:08 -0400 Subject: Merge branch 'feature/build-system-improvements'. --- (limited to 'lib') diff --git a/lib/Makefile.in b/lib/Makefile.in deleted file mode 100644 index f52a0b3..0000000 --- a/lib/Makefile.in +++ /dev/null @@ -1,78 +0,0 @@ -# opkhelper -# Makefile.in -# Input Makefile for configure. -# -# Copyright (C) 2012 Patrick "P. J." McDermott -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -package_name = @package_name@ -package_version= @package_version@ - -srcdir = @srcdir@ -prefix = @prefix@ -libdir = @libdir@ -datadir = @datadir@ -localedir = @localedir@ -libopkhelper = @libopkhelper@ -libopkbuild_1 = @libopkbuild_1@ -archtab = @archtab@ - -sed_script = s&@@PACKAGE_NAME@@&$(package_name)&;\ - s&@@PACKAGE_VERSION@@&$(package_version)&;\ - s&@@LOCALEDIR@@&$(localedir)&;\ - s&@@LIBOPKHELPER@@&$(libopkhelper)&;\ - s&@@LIBOPKBUILD_1@@&$(libopkbuild_1)&;\ - s&@@ARCHTAB@@&$(archtab)&; - -.SUFFIXES: -.SUFFIXES: .sh .sm - -SRCS = load.sh common.sh \ - buildsystem.sh -OBJS = $(SRCS:.sh=.sm) - -distdir = ../$(package_name)-$(package_version)/lib -distfiles = Makefile.in $(SRCS) - -all: $(OBJS) - -$(OBJS): - @printf ' SED lib/%s\n' '$@' - @sed '$(sed_script)' '$(srcdir)/lib/$*.sh' >'$@' - -clean: - @for obj in $(OBJS); do \ - printf ' RM lib/%s\n' "$${obj}"; \ - rm -f "$${obj}"; \ - done - -install: all - @mkdir -p '$(DESTDIR)/$(libopkhelper)' - @for obj in $(OBJS); do \ - printf ' INSTALL lib/%s\n' "$${obj}"; \ - cp "$${obj}" "$(DESTDIR)/$(libopkhelper)/$${obj}"; \ - chmod 644 "$(DESTDIR)/$(libopkhelper)/$${obj}"; \ - done - -uninstall: - @for obj in $(OBJS); do \ - printf ' RM %s\n' "$${obj}"; \ - rm -f "$(DESTDIR)/$(libopkhelper)/$${obj}"; \ - done - @rmdir '$(DESTDIR)/$(libopkhelper)' 2>/dev/null || true - -$(distdir): - @mkdir -p '$(distdir)' - @cp -pR $(distfiles) '$(distdir)' diff --git a/lib/buildsystem/Makefile.in b/lib/buildsystem/Makefile.in deleted file mode 100644 index a7b3c59..0000000 --- a/lib/buildsystem/Makefile.in +++ /dev/null @@ -1,71 +0,0 @@ -# opkhelper -# Makefile.in -# Input Makefile for configure. -# -# Copyright (C) 2012 Patrick "P. J." McDermott -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -package_name = @package_name@ -package_version= @package_version@ - -srcdir = @srcdir@ -prefix = @prefix@ -libdir = @libdir@ -libopkhelper = @libopkhelper@ -multiarch_libdir = @multiarch_libdir@ - -sed_script = s&@@PACKAGE_NAME@@&$(package_name)&;\ - s&@@PACKAGE_VERSION@@&$(package_version)&;\ - s&@@MULTIARCH_LIBDIR@@&$(multiarch_libdir)&; - -.SUFFIXES: -.SUFFIXES: .sh .sm - -SRCS = autoconf.sh make.sh kbuild.sh -OBJS = $(SRCS:.sh=.sm) - -distdir = ../../$(package_name)-$(package_version)/lib/buildsystem -distfiles = Makefile.in $(SRCS) - -all: $(OBJS) - -$(OBJS): - @printf ' SED lib/buildsystem/%s\n' '$@' - @sed '$(sed_script)' '$(srcdir)/lib/buildsystem/$*.sh' >'$@' - -clean: - @for obj in $(OBJS); do \ - printf ' RM lib/buildsystem/%s\n' "$${obj}"; \ - rm -f "$${obj}"; \ - done - -install: all - @mkdir -p '$(DESTDIR)/$(libopkhelper)/buildsystem' - @for obj in $(OBJS); do \ - printf ' INSTALL lib/buildsystem/%s\n' "$${obj}"; \ - cp "$${obj}" "$(DESTDIR)/$(libopkhelper)/buildsystem/$${obj}"; \ - chmod 644 "$(DESTDIR)/$(libopkhelper)/buildsystem/$${obj}"; \ - done - -uninstall: - @for obj in $(OBJS); do \ - printf ' RM %s\n' "$${obj}"; \ - rm -f "$(DESTDIR)/$(libopkhelper)/buildsystem/$${obj}"; \ - done - @rmdir '$(DESTDIR)/$(libopkhelper)/buildsystem' 2>/dev/null || true - -$(distdir): - @mkdir -p '$(distdir)' - @cp -pR $(distfiles) '$(distdir)' diff --git a/lib/buildsystem/local.mk b/lib/buildsystem/local.mk new file mode 100644 index 0000000..76cf972 --- /dev/null +++ b/lib/buildsystem/local.mk @@ -0,0 +1,22 @@ +# opkhelper +# lib/buildsystem/local.mk +# +# Copyright (C) 2012-2013 Patrick "P. J." McDermott +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +pkglibbuildsystem_srcs = \ + lib/buildsystem/autoconf.sh \ + lib/buildsystem/kbuild.sh \ + lib/buildsystem/make.sh diff --git a/lib/local.mk b/lib/local.mk new file mode 100644 index 0000000..e249963 --- /dev/null +++ b/lib/local.mk @@ -0,0 +1,23 @@ +# opkhelper +# lib/local.mk +# +# Copyright (C) 2012-2013 Patrick "P. J." McDermott +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +pkglib_srcs = \ + lib/load.sh \ + lib/common.sh \ + lib/buildsystem.sh \ + $(lib_buildsystem_srcs) -- cgit v0.9.1