summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-05-10 16:57:59 +0200
committerMichael Stahl <mstahl@redhat.com>2017-05-10 22:25:02 +0200
commit6b35505deabbfb9b00d9bc21fa31b95376a0aed0 (patch)
tree03bbc168c59d3e3a1482d8d8477bed225e8804de
parent9f827e21f68adace66caf8b7d8f0bec037e5f9b9 (diff)
Add distro-pack-install-strip target
...to be used by dev-tools' flatpak/build.sh Change-Id: Ie61edfc2aeddf10aa70dee07c3496fd6b2aebcc4 (cherry picked from commit 58891d589bd8da700f135b098dd50833277c65dc) Reviewed-on: https://gerrit.libreoffice.org/37473 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--Makefile.in17
1 files changed, 12 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in
index cf3e71fb1ff3..50d9dc0cfb09 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,7 +9,7 @@
gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck uicheck screenshot
-.PHONY : all check-if-root bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch findunusedcode get-submodules id install install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
+.PHONY : all check-if-root bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install distro-pack-install-strip docs download etags fetch findunusedcode get-submodules id install install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
MAKECMDGOALS?=all
build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\
@@ -362,11 +362,18 @@ else
@exit 1
endif
+define gb_Top_DistroPackInstall
+$(SRCDIR)/bin/distro-install-clean-up
+$(SRCDIR)/bin/distro-install-desktop-integration
+$(SRCDIR)/bin/distro-install-sdk
+$(SRCDIR)/bin/distro-install-file-lists
+endef
+
distro-pack-install: install
- $(SRCDIR)/bin/distro-install-clean-up
- $(SRCDIR)/bin/distro-install-desktop-integration
- $(SRCDIR)/bin/distro-install-sdk
- $(SRCDIR)/bin/distro-install-file-lists
+ $(gb_Top_DistroPackInstall)
+
+distro-pack-install-strip: install-strip
+ $(gb_Top_DistroPackInstall)
install-package-%:
$(MAKE) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@