Make lib/ non-recursive.

3 files changed, 64 insertions, 88 deletions

diff --git a/Makefile.in b/Makefile.in
index 3c5085c..9e0d4bd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -48,8 +48,10 @@ MACROS = \
 .SUFFIXES:
 
 include $(srcdir)/src/local.mk
+include $(srcdir)/lib/local.mk
 
 bin = $(src_bin)
+lib = $(lib_lib)
 
 distdir = $(package_name)-$(package_version)
 distfiles = \
@@ -64,40 +66,41 @@ distfiles = \
 	$(src_distfiles)
 
 all: all-exec
-	@printf 'Making library files...\n'
-	@cd lib && $(MAKE) $(MACROS) all
 	@cd lib/buildsystem && $(MAKE) $(MACROS) all
 	@printf 'Making locales...\n'
 	@cd locale && $(MAKE) $(MACROS) all
 	@printf 'Making manual pages...\n'
 	@cd man && $(MAKE) $(MACROS) all
-all-exec: all-bin
+all-exec: all-bin all-lib
 all-bin: $(bin)
+all-lib: $(lib)
 
 clean: clean-exec
-	@printf 'Cleaning library files...\n'
-	@cd lib && $(MAKE) $(MACROS) clean
 	@cd lib/buildsystem && $(MAKE) $(MACROS) clean
 	@printf 'Cleaning locales...\n'
 	@cd locale && $(MAKE) $(MACROS) clean
 	@printf 'Cleaning manual pages...\n'
 	@cd man && $(MAKE) $(MACROS) clean
-clean-exec: clean-bin
+clean-exec: clean-bin clean-lib
 clean-bin:
 	@for f in $(bin); do \
 		printf '  RM %s\n' "$${f}"; \
 		rm -f "$${f}"; \
 	done
+clean-lib:
+	@for f in $(lib); do \
+		printf '  RM %s\n' "$${f}"; \
+		rm -f "$${f}"; \
+	done
 
 install: all install-exec
 	@printf 'Installing library files...\n'
-	@cd lib && $(MAKE) $(MACROS) install
 	@cd lib/buildsystem && $(MAKE) $(MACROS) install
 	@printf 'Installing locales...\n'
 	@cd locale && $(MAKE) $(MACROS) install
 	@printf 'Installing manual pages...\n'
 	@cd man && $(MAKE) $(MACROS) install
-install-exec: install-bin
+install-exec: install-bin install-lib
 install-bin:
 	@mkdir -p '$(DESTDIR)/$(bindir)'
 	@for f in $(bin); do \
@@ -106,22 +109,35 @@ install-bin:
 		cp "$${f}" "$(DESTDIR)/$(bindir)/$${ff}"; \
 		chmod 755 "$(DESTDIR)/$(bindir)/$${ff}"; \
 	done
+install-lib:
+	@mkdir -p '$(DESTDIR)/$(libdir)'
+	@for f in $(lib); do \
+		printf '  INSTALL %s\n' "$${f}"; \
+		ff="$$(basename "$${f}")"; \
+		cp "$${f}" "$(DESTDIR)/$(libdir)/$${ff}"; \
+		chmod 644 "$(DESTDIR)/$(libdir)/$${ff}"; \
+	done
 
 uninstall: uninstall-exec
 	@printf 'Uninstalling library files...\n'
 	@cd lib/buildsystem && $(MAKE) $(MACROS) uninstall
-	@cd lib && $(MAKE) $(MACROS) uninstall
 	@printf 'Uninstalling locales...\n'
 	@cd locale && $(MAKE) $(MACROS) uninstall
 	@printf 'Uninstalling manual pages...\n'
 	@cd man && $(MAKE) $(MACROS) uninstall
-uninstall-exec: uninstall-bin
+uninstall-exec: uninstall-bin uninstall-lib
 uninstall-bin:
 	@for f in $(bin); do \
 		printf '  RM %s\n' "$${f}"; \
 		ff="$$(basename "$${f}")"; \
 		rm -f "$(DESTDIR)/$(bindir)/$${ff}"; \
 	done
+uninstall-lib:
+	@for f in $(lib); do \
+		printf '  RM %s\n' "$${f}"; \
+		ff="$$(basename "$${f}")"; \
+		rm -f "$(DESTDIR)/$(libdir)/$${ff}"; \
+	done
 
 $(distdir):
 	@mkdir -p '$(distdir)'
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 <http://www.gnu.org/licenses/>.
-
-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/local.mk b/lib/local.mk
new file mode 100644
index 0000000..a1e80d0
--- /dev/null
+++ b/lib/local.mk
@@ -0,0 +1,38 @@
+# 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 <http://www.gnu.org/licenses/>.
+
+lib_srcs = \
+	lib/load.sh \
+	lib/common.sh \
+	lib/buildsystem.sh \
+	$(lib_buildsystem_srcs)
+lib_lib = $(lib_srcs:.sh=.sm)
+lib_distfiles = lib/local.mk $(lib_srcs)
+
+lib_script = \
+	s&@@PACKAGE_NAME@@&$(package_name)&;\
+	s&@@PACKAGE_VERSION@@&$(package_version)&;\
+	s&@@LOCALEDIR@@&$(localedir)&;\
+	s&@@LIBOPKHELPER@@&$(libopkhelper)&;\
+	s&@@SH@@&$(sh)&;
+
+.SUFFIXES: .sh .sm
+
+.sh.sm:
+	@printf '  SED %s\n' '$*.sm'
+	@sed '$(lib_script)' '$(srcdir)/$*.sh' >'$*.sm'