[Libreoffice-commits] core.git: Makefile.in
Stephan Bergmann
sbergman at redhat.com
Wed May 10 14:58:50 UTC 2017
Makefile.in | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
New commits:
commit 58891d589bd8da700f135b098dd50833277c65dc
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed May 10 16:57:59 2017 +0200
Add distro-pack-install-strip target
...to be used by dev-tools' flatpak/build.sh
Change-Id: Ie61edfc2aeddf10aa70dee07c3496fd6b2aebcc4
diff --git a/Makefile.in b/Makefile.in
index 73ae05882579..1e7d79214e7c 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)\
@@ -363,11 +363,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 $@
More information about the Libreoffice-commits
mailing list