diff options
| -rw-r--r-- | common.each.head.mk | 18 | ||||
| -rw-r--r-- | common.each.tail.mk | 32 | ||||
| -rw-r--r-- | src/chroot-tools/Makefile | 10 | ||||
| -rw-r--r-- | src/devtools/Makefile | 6 | ||||
| -rw-r--r-- | src/lib/Makefile | 2 | ||||
| -rw-r--r-- | src/librefetch/Makefile | 10 | ||||
| -rw-r--r-- | src/xbs-abs/Makefile | 4 | ||||
| -rw-r--r-- | src/xbs-abslibre/Makefile | 4 |
8 files changed, 43 insertions, 43 deletions
diff --git a/common.each.head.mk b/common.each.head.mk index 937c13a..e3a269e 100644 --- a/common.each.head.mk +++ b/common.each.head.mk @@ -23,13 +23,13 @@ detect-ignore-sh = devtools-files = -install-srcs = $(detect-all) -install-mans = $(patsubst %.ronn,%,$(detect-ronn)) -install-bins = $(detect-exec) -install-libexecs = -install-libs = $(detect-sh) -install-docs = $(detect-md) $(detect-ronn) -install-confs = $(detect-conf) +libretools-srcs = $(detect-all) +libretools-mans = $(patsubst %.ronn,%,$(detect-ronn)) +libretools-bins = $(detect-exec) +libretools-libexecs = +libretools-libs = $(detect-sh) +libretools-docs = $(detect-md) $(detect-ronn) +libretools-confs = $(detect-conf) -install-files = $(install-mans) $(install-bins) $(install-libexecs) $(install-libs) $(install-docs) $(install-confs) -pots = $(install-bins) $(install-libexecs) $(install-libs) +libretools-files = $(libretools-mans) $(libretools-bins) $(libretools-libexecs) $(libretools-libs) $(libretools-docs) $(libretools-confs) +pots = $(libretools-bins) $(libretools-libexecs) $(libretools-libs) diff --git a/common.each.tail.mk b/common.each.tail.mk index c149555..58dfa8e 100644 --- a/common.each.tail.mk +++ b/common.each.tail.mk @@ -13,25 +13,25 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -am_src_files += $(install-srcs) +am_src_files += $(libretools-srcs) am_gen_files += .srcfiles.mk $(devtools-files) -am_out_files += $(filter-out $(am_src_files) $(am_gen_files),$(install-files)) \ +am_out_files += $(filter-out $(am_src_files) $(am_gen_files),$(libretools-files)) \ $(if $(pots),everything.pot) -am_sys_files += $(addprefix $(bindir)/,$(install-bins)) \ - $(addprefix $(pkgconfdir)/,$(install-confs)) \ - $(addprefix $(pkglibexecdir)/,$(install-libexecs) $(install-libs)) \ - $(addprefix $(pkgdocdir)/,$(install-docs)) \ - $(addprefix $(mandir)/man1/,$(filter %.1,$(install-mans))) \ - $(addprefix $(mandir)/man2/,$(filter %.2,$(install-mans))) \ - $(addprefix $(mandir)/man3/,$(filter %.3,$(install-mans))) \ - $(addprefix $(mandir)/man4/,$(filter %.4,$(install-mans))) \ - $(addprefix $(mandir)/man5/,$(filter %.5,$(install-mans))) \ - $(addprefix $(mandir)/man6/,$(filter %.6,$(install-mans))) \ - $(addprefix $(mandir)/man7/,$(filter %.7,$(install-mans))) \ - $(addprefix $(mandir)/man8/,$(filter %.8,$(install-mans))) +am_sys_files += $(addprefix $(bindir)/,$(libretools-bins)) \ + $(addprefix $(pkgconfdir)/,$(libretools-confs)) \ + $(addprefix $(pkglibexecdir)/,$(libretools-libexecs) $(libretools-libs)) \ + $(addprefix $(pkgdocdir)/,$(libretools-docs)) \ + $(addprefix $(mandir)/man1/,$(filter %.1,$(libretools-mans))) \ + $(addprefix $(mandir)/man2/,$(filter %.2,$(libretools-mans))) \ + $(addprefix $(mandir)/man3/,$(filter %.3,$(libretools-mans))) \ + $(addprefix $(mandir)/man4/,$(filter %.4,$(libretools-mans))) \ + $(addprefix $(mandir)/man5/,$(filter %.5,$(libretools-mans))) \ + $(addprefix $(mandir)/man6/,$(filter %.6,$(libretools-mans))) \ + $(addprefix $(mandir)/man7/,$(filter %.7,$(libretools-mans))) \ + $(addprefix $(mandir)/man8/,$(filter %.8,$(libretools-mans))) am_clean_files += *.pot *.ugly .tmp* -exec_$(outdir) := $(exec_$(outdir)) $(install-bins) $(install-libexecs) +exec_$(outdir) := $(exec_$(outdir)) $(libretools-bins) $(libretools-libexecs) _is_executable = $(filter $(exec_$(@D)),$(@F)) @@ -77,7 +77,7 @@ $(DESTDIR)$(bindir)/% : $(outdir)/% ; install -T -Dm755 '$<' '$@' # Repeat the last two rules again with explicit targets because # otherwise it would try to do src/xbs->/bin/xbs instead of # src/xbs/xbs->/bin/xbs -ifneq ($(filter $(notdir $(outdir)),$(install-files)),) +ifneq ($(filter $(notdir $(outdir)),$(libretools-files)),) $(DESTDIR)$(pkglibexecdir)/$(notdir $(outdir)): $(DESTDIR)$(pkglibexecdir)/%: $(outdir)/% ; mkdir -p '$(@D)' && cp -T '$<' '$@' $(DESTDIR)$(bindir)/$(notdir $(outdir)): $(DESTDIR)$(bindir)/% : $(outdir)/% ; install -T -Dm755 '$<' '$@' endif diff --git a/src/chroot-tools/Makefile b/src/chroot-tools/Makefile index a11e69c..48a1631 100644 --- a/src/chroot-tools/Makefile +++ b/src/chroot-tools/Makefile @@ -2,11 +2,11 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/automake.head.mk pkglibexecdir = $(libexecdir)/libretools/chroot -install-bins = chcleanup librechroot libremakepkg -install-libexecs += arch-nspawn chcleanup distcc-tool indent mkarchroot -install-libs += makechrootpkg.sh -devtools-files = makechrootpkg.sh.in mkarchroot.in arch-nspawn.in -am_clean_files += chcleanup.lib +libretools-bins = chcleanup librechroot libremakepkg +libretools-libexecs += arch-nspawn chcleanup distcc-tool indent mkarchroot +libretools-libs += makechrootpkg.sh +devtools-files = makechrootpkg.sh.in mkarchroot.in arch-nspawn.in +am_clean_files += chcleanup.lib $(srcdir)/makechrootpkg.sh.in: $(srcdir)/%.sh.in: $(devtoolsdir)/%.in cp $< $@ diff --git a/src/devtools/Makefile b/src/devtools/Makefile index 7ccbbcc..72907f0 100644 --- a/src/devtools/Makefile +++ b/src/devtools/Makefile @@ -1,9 +1,9 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/automake.head.mk -install-bins += checkpkg find-libdeps finddeps lddd -devtools-files = $(addsuffix .in,$(install-bins)) -am_sys_files += $(bindir)/find-libprovides +libretools-bins += checkpkg find-libdeps finddeps lddd +devtools-files = $(addsuffix .in,$(libretools-bins)) +am_sys_files += $(bindir)/find-libprovides $(DESTDIR)$(bindir)/find-libprovides: install -d $(@D) diff --git a/src/lib/Makefile b/src/lib/Makefile index ec5a438..9e9b4a8 100644 --- a/src/lib/Makefile +++ b/src/lib/Makefile @@ -1,7 +1,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/automake.head.mk -install-libs += common.sh conf.sh +libretools-libs += common.sh conf.sh devtools-files = common.sh.in # Build ############################################################## diff --git a/src/librefetch/Makefile b/src/librefetch/Makefile index b28e96e..26ee2ee 100644 --- a/src/librefetch/Makefile +++ b/src/librefetch/Makefile @@ -1,11 +1,11 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/automake.head.mk -install-bins = librefetch librefetch-install -install-confs += librefetch-makepkg.conf -install-libexecs += $(filter librefetchdir/%,$(detect-exec)) -install-libs += $(filter-out $(install-libexecs),$(filter librefetchdir/%,$(detect-all))) -pots = $(install-bins) +libretools-bins = librefetch librefetch-install +libretools-confs += librefetch-makepkg.conf +libretools-libexecs += $(filter librefetchdir/%,$(detect-exec)) +libretools-libs += $(filter-out $(libretools-libexecs),$(filter librefetchdir/%,$(detect-all))) +pots = $(libretools-bins) $(outdir)/librefetch-install: $(var)pkgconfdir $(outdir)/librefetch-makepkg.conf: $(var)bindir diff --git a/src/xbs-abs/Makefile b/src/xbs-abs/Makefile index 81e1b4f..248848f 100644 --- a/src/xbs-abs/Makefile +++ b/src/xbs-abs/Makefile @@ -4,8 +4,8 @@ pkgconfdir = $(sysconfdir)/xbs pkglibexecdir = $(libexecdir)/xbs _helpers = archrelease commitpkg -install-bins = -install-libexecs = helper-abs +libretools-bins = +libretools-libexecs = helper-abs pots += $(_helpers) devtools-files += $(addsuffix .in,$(_helpers)) am_out_files += $(_helpers) diff --git a/src/xbs-abslibre/Makefile b/src/xbs-abslibre/Makefile index 6c61803..c946d5d 100644 --- a/src/xbs-abslibre/Makefile +++ b/src/xbs-abslibre/Makefile @@ -2,7 +2,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/automake.head.mk pkglibexecdir = $(libexecdir)/xbs -install-bins = -install-libexecs = helper-abslibre +libretools-bins = +libretools-libexecs = helper-abslibre include $(topsrcdir)/automake.tail.mk |