From e7022914838b3a097e04edafcb4128dc502c0da1 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Sun, 05 May 2013 17:54:15 -0400
Subject: Make lib/ non-recursive.

---
(limited to 'Makefile.in')

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)'
--
cgit v0.9.1