diff options
| author | P. 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) |
| commit | 2d4aad41b7f4b4f445e5d44f84d0509eac04a61f (patch) | |
| tree | 641012219d9a9a9c8bd1f3dcba70ba52f6cd223b | |
| parent | 881b84c54063112b54e7797e6a33146acd444262 (diff) | |
Make lib/package/ non-recursive.
| -rw-r--r-- | Makefile.in | 12 | ||||
| -rw-r--r-- | lib/package/local.mk | 20 |
2 files changed, 28 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 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 |