Merge branch 'feature/build-system-improvements'.

7 files changed, 70 insertions, 225 deletions

diff --git a/lib/Makefile.in b/lib/Makefile.in
deleted file mode 100644
index 12cddc5..0000000
--- a/lib/Makefile.in
+++ /dev/null
@@ -1,80 +0,0 @@
-# opkbuild
-# 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 <http://www.gnu.org/licenses/>.
-
-package_name = @package_name@
-package_version= @package_version@
-
-srcdir = @srcdir@
-prefix = @prefix@
-libdir = @libdir@
-datadir = @datadir@
-localedir = @localedir@
-libopkbuild = @libopkbuild@
-metadata = @metadata@
-
-sed_script = s&@@PACKAGE_NAME@@&$(package_name)&;\
-             s&@@PACKAGE_VERSION@@&$(package_version)&;\
-             s&@@LOCALEDIR@@&$(localedir)&;\
-             s&@@LIBOPKBUILD@@&$(libopkbuild)&;\
-             s&@@METADATA@@&$(metadata)&;
-
-.SUFFIXES:
-.SUFFIXES: .sh .sm
-
-SRCS = load.sh                          common.sh                        \
-       locale.sh                        output.sh                        \
-       package.sh                                                        \
-       metadata.sh                                                       \
-       control.sh                       changelog.sh                     \
-       deps.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)/$(libopkbuild)'
-	@for obj in $(OBJS); do \
-		printf '  INSTALL lib/%s\n' "$${obj}"; \
-		cp "$${obj}" "$(DESTDIR)/$(libopkbuild)/$${obj}"; \
-		chmod 644 "$(DESTDIR)/$(libopkbuild)/$${obj}"; \
-	done
-
-uninstall:
-	@for obj in $(OBJS); do \
-		printf '  RM %s\n' "$${obj}"; \
-		rm -f "$(DESTDIR)/$(libopkbuild)/$${obj}"; \
-	done
-	@rmdir '$(DESTDIR)/$(libopkbuild)' 2>/dev/null || true
-
-$(distdir):
-	@mkdir -p '$(distdir)'
-	@cp -pR $(distfiles) '$(distdir)'
diff --git a/lib/load.sh b/lib/load.sh
index 9a425c1..ac38dbc 100644
--- a/lib/load.sh
+++ b/lib/load.sh
@@ -22,7 +22,7 @@ _OB_LOAD_SM='true'
 
 # The "common" module is used by this and all other modules.
 # We have to manually load the "common" module so we can use it in ob_use.
-. '@@LIBOPKBUILD@@/common.sm'
+. '@@PKGLIBDIR@@/common.sm'
 
 ob_use()
 {
@@ -35,7 +35,7 @@ ob_use()
 		return ${?}
 	fi
 
-	_obu_module='@@LIBOPKBUILD@@'"/${_obu_module}.sm"
+	_obu_module='@@PKGLIBDIR@@'"/${_obu_module}.sm"
 	if [ -r "${_obu_module}" ]; then
 		. "${_obu_module}"
 	else
diff --git a/lib/local.mk b/lib/local.mk
new file mode 100644
index 0000000..d0d5cbd
--- /dev/null
+++ b/lib/local.mk
@@ -0,0 +1,28 @@
+# opkbuild
+# 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 <http://www.gnu.org/licenses/>.
+
+pkglib_srcs = \
+	lib/load.sh \
+	lib/common.sh \
+	lib/locale.sh \
+	lib/output.sh \
+	lib/package.sh \
+	lib/metadata.sh \
+	lib/control.sh \
+	lib/changelog.sh \
+	lib/deps.sh
diff --git a/lib/metadata/Makefile.in b/lib/metadata/Makefile.in
deleted file mode 100644
index 28c4d48..0000000
--- a/lib/metadata/Makefile.in
+++ /dev/null
@@ -1,75 +0,0 @@
-# opkbuild
-# 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 <http://www.gnu.org/licenses/>.
-
-package_name = @package_name@
-package_version= @package_version@
-
-srcdir = @srcdir@
-prefix = @prefix@
-libdir = @libdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-opkhelper_3_0 = @opkhelper_3_0@
-
-sed_script = s&@@PACKAGE_NAME@@&$(package_name)&;\
-             s&@@PACKAGE_VERSION@@&$(package_version)&;\
-             s&@@LIBDIR@@&$(libdir)&;\
-             s&@@DATADIR@@&$(datadir)&;\
-             s&@@SYSCONFDIR@@&$(sysconfdir)&;\
-             s&@@OPKHELPER_3_0@@&$(opkhelper_3_0)&;
-
-.SUFFIXES:
-.SUFFIXES: .sh .sm
-
-SRCS = proteanos.sh
-OBJS = $(SRCS:.sh=.sm)
-
-distdir = ../../$(package_name)-$(package_version)/lib/metadata
-distfiles = Makefile.in $(SRCS)
-
-all: $(OBJS)
-
-$(OBJS):
-	@printf '  SED lib/metadata/%s\n' '$@'
-	@sed '$(sed_script)' '$(srcdir)/lib/metadata/$*.sh' >'$@'
-
-clean:
-	@for obj in $(OBJS); do \
-		printf '  RM lib/metadata/%s\n' "$${obj}"; \
-		rm -f "$${obj}"; \
-	done
-
-install: all
-	@mkdir -p '$(DESTDIR)/$(libopkbuild)/metadata'
-	@for obj in $(OBJS); do \
-		printf '  INSTALL lib/metadata/%s\n' "$${obj}"; \
-		cp "$${obj}" "$(DESTDIR)/$(libopkbuild)/metadata/$${obj}"; \
-		chmod 644 "$(DESTDIR)/$(libopkbuild)/metadata/$${obj}"; \
-	done
-
-uninstall:
-	@for obj in $(OBJS); do \
-		printf '  RM %s\n' "$${obj}"; \
-		rm -f "$(DESTDIR)/$(libopkbuild)/metadata/$${obj}"; \
-	done
-	@rmdir '$(DESTDIR)/$(libopkbuild)/metadata' 2>/dev/null || true
-
-$(distdir):
-	@mkdir -p '$(distdir)'
-	@cp -pR $(distfiles) '$(distdir)'
diff --git a/lib/metadata/local.mk b/lib/metadata/local.mk
new file mode 100644
index 0000000..9c32560
--- /dev/null
+++ b/lib/metadata/local.mk
@@ -0,0 +1,20 @@
+# opkbuild
+# lib/metadata/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 <http://www.gnu.org/licenses/>.
+
+pkglibmetadata_srcs = \
+	lib/metadata/proteanos.sh
diff --git a/lib/package/Makefile.in b/lib/package/Makefile.in
deleted file mode 100644
index c28c412..0000000
--- a/lib/package/Makefile.in
+++ /dev/null
@@ -1,68 +0,0 @@
-# opkbuild
-# 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 <http://www.gnu.org/licenses/>.
-
-package_name = @package_name@
-package_version= @package_version@
-
-srcdir = @srcdir@
-prefix = @prefix@
-libdir = @libdir@
-
-sed_script = s&@@PACKAGE_NAME@@&$(package_name)&;\
-             s&@@PACKAGE_VERSION@@&$(package_version)&;
-
-.SUFFIXES:
-.SUFFIXES: .sh .sm
-
-SRCS = 2.sh
-OBJS = $(SRCS:.sh=.sm)
-
-distdir = ../../$(package_name)-$(package_version)/lib/package
-distfiles = Makefile.in $(SRCS)
-
-all: $(OBJS)
-
-$(OBJS):
-	@printf '  SED lib/package/%s\n' '$@'
-	@sed '$(sed_script)' '$(srcdir)/lib/package/$*.sh' >'$@'
-
-clean:
-	@for obj in $(OBJS); do \
-		printf '  RM lib/package/%s\n' "$${obj}"; \
-		rm -f "$${obj}"; \
-	done
-
-install: all
-	@mkdir -p '$(DESTDIR)/$(libopkbuild)/package'
-	@for obj in $(OBJS); do \
-		printf '  INSTALL lib/package/%s\n' "$${obj}"; \
-		cp "$${obj}" "$(DESTDIR)/$(libopkbuild)/package/$${obj}"; \
-		chmod 644 "$(DESTDIR)/$(libopkbuild)/package/$${obj}"; \
-	done
-
-uninstall:
-	@for obj in $(OBJS); do \
-		printf '  RM %s\n' "$${obj}"; \
-		rm -f "$(DESTDIR)/$(libopkbuild)/package/$${obj}"; \
-	done
-	@rmdir '$(DESTDIR)/$(libopkbuild)/package' 2>/dev/null || true
-
-$(distdir):
-	@mkdir -p '$(distdir)'
-	@cp -pR $(distfiles) '$(distdir)'
diff --git a/lib/package/local.mk b/lib/package/local.mk
new file mode 100644
index 0000000..6839f77
--- /dev/null
+++ b/lib/package/local.mk
@@ -0,0 +1,20 @@
+# opkbuild
+# lib/package/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 <http://www.gnu.org/licenses/>.
+
+pkglibpackage_srcs = \
+	lib/package/2.sh