From b36b381587c9ec892f86d7bbd6dbc79c6914c991 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 10 May 2017 16:57:59 +0200 Subject: 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 Reviewed-by: Michael Stahl (cherry picked from commit 6b35505deabbfb9b00d9bc21fa31b95376a0aed0) --- Makefile.in | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'Makefile.in') 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 $@ -- cgit