Make lib/ non-recursive.

2 files changed, 45 insertions, 7 deletions

diff --git a/Makefile.in b/Makefile.in
index f0e7278..43740cc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,10 +24,11 @@ srcdir = @srcdir@
 prefix = @prefix@
 bindir = @bindir@
 libdir = @libdir@
+pkglibdir = @pkglibdir@
+libopkbuild = @libopkbuild@
 datadir = @datadir@
 mandir = @mandir@
 sysconfdir = @sysconfdir@
-libopkbuild = @libopkbuild@
 metadata = @metadata@
 opkhelper_3_0 = @opkhelper_3_0@
 
@@ -48,8 +49,10 @@ MACROS = \
 	'opkhelper_3_0=$(opkhelper_3_0)'
 
 include $(srcdir)/src/local.mk
+include $(srcdir)/lib/local.mk
 
 bin = $(bin_srcs:.sh=)
+pkglib = $(pkglib_srcs:.sh=.sm)
 
 distdir = $(package_name)-$(package_version)
 distfiles = \
@@ -62,29 +65,36 @@ distfiles = \
 	ChangeLog \
 	TODO \
 	src/local.mk \
-	$(bin_srcs)
+	lib/local.mk \
+	$(bin_srcs) \
+	$(pkglib_srcs)
 
 script = \
 	s&@@PACKAGE_NAME@@&$(package_name)&;\
 	s&@@PACKAGE_VERSION@@&$(package_version)&;\
 	s&@@BINDIR@@&$(bindir)&;\
+	s&@@PKGLIBDIR@@&$(pkglibdir)&;\
 	s&@@LIBOPKBUILD@@&$(libopkbuild)&;\
-	s&@@SH@@&$(sh)&;
+	s&@@LOCALEDIR@@&$(localedir)&;\
+	s&@@SH@@&$(sh)&;\
+	s&@@METADATA@@&$(metadata)&;
 
 .SUFFIXES:
-.SUFFIXES: .sh
+.SUFFIXES: .sh .sm
 
 .sh:
 	@printf '  SED %s\n' '$@'
 	@sed '$(script)' '$(srcdir)/$?' >'$@'
 	@chmod 755 '$@'
+.sh.sm:
+	@printf '  SED %s\n' '$@'
+	@sed '$(script)' '$(srcdir)/$?' >'$@'
+	@chmod 644 '$@'
 
 all: all-exec all-data
 all-exec: all-bin all-pkglib all-pkglibpackage all-pkglibmetadata
 all-bin: $(bin)
-all-pkglib:
-	@printf 'Making library files...\n'
-	@cd lib && $(MAKE) $(MACROS) all
+all-pkglib: $(pkglib)
 all-pkglibpackage:
 	@printf 'Making library files...\n'
 	@cd lib/package && $(MAKE) $(MACROS) all
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