summaryrefslogtreecommitdiffstats
path: root/Makefile.in
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2013-06-15 14:14:21 (EDT)
committer P. J. McDermott <pjm@nac.net>2013-06-15 14:14:21 (EDT)
commit2d4aad41b7f4b4f445e5d44f84d0509eac04a61f (patch)
tree641012219d9a9a9c8bd1f3dcba70ba52f6cd223b /Makefile.in
parent881b84c54063112b54e7797e6a33146acd444262 (diff)
Make lib/package/ non-recursive.
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in12
1 files changed, 8 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in
index 43740cc..09ae4a5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -48,11 +48,15 @@ MACROS = \
'metadata=$(metadata)' \
'opkhelper_3_0=$(opkhelper_3_0)'
+pkglibpackagedir = $(pkglibdir)/package
+
include $(srcdir)/src/local.mk
include $(srcdir)/lib/local.mk
+include $(srcdir)/lib/package/local.mk
bin = $(bin_srcs:.sh=)
pkglib = $(pkglib_srcs:.sh=.sm)
+pkglibpackage = $(pkglibpackage_srcs:.sh=.sm)
distdir = $(package_name)-$(package_version)
distfiles = \
@@ -66,8 +70,10 @@ distfiles = \
TODO \
src/local.mk \
lib/local.mk \
+ lib/package/local.mk \
$(bin_srcs) \
- $(pkglib_srcs)
+ $(pkglib_srcs) \
+ $(pkglibpackage_srcs)
script = \
s&@@PACKAGE_NAME@@&$(package_name)&;\
@@ -95,9 +101,7 @@ all: all-exec all-data
all-exec: all-bin all-pkglib all-pkglibpackage all-pkglibmetadata
all-bin: $(bin)
all-pkglib: $(pkglib)
-all-pkglibpackage:
- @printf 'Making library files...\n'
- @cd lib/package && $(MAKE) $(MACROS) all
+all-pkglibpackage: $(pkglibpackage)
all-pkglibmetadata:
@printf 'Making library files...\n'
@cd lib/metadata && $(MAKE) $(MACROS) all