[Libreoffice-commits] core.git: Makefile.in
Stephan Bergmann
sbergman at redhat.com
Thu Sep 7 15:04:43 UTC 2017
Makefile.in | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 937df58daa6daa20d0ccffff7b15fe01b63761af
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Sep 7 17:01:43 2017 +0200
Allow to call 'make install-gdb-printers' individually
...in case you don't do a full 'make' but just some 'make CppunitTest...
CPPUNITTRACE="gdb --args"' and then wonder why the gdb pretty printers are not
available, so you can at least do a manual 'make install-gdb-printers' now.
Change-Id: Idd19ed1bba0fa196271cae9de80b4e7baf79ac2a
diff --git a/Makefile.in b/Makefile.in
index ccb4242615bb..475ec0aabe66 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 distro-pack-install-strip docs download etags fetch 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 get-submodules id install install-gdb-printers 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)\
@@ -261,11 +261,8 @@ bootstrap: check-if-root compilerplugins
# Note: this will pipe through all gbuild targets to ... gbuild
# with some translations like "build"->"all" for historic reasons
#
-build: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset)
-ifneq ($(filter-out WNT MACOSX IOS,$(OS)),)
- mkdir -p $(INSTDIR)
- $(SRCDIR)/solenv/bin/install-gdb-printers -a $(INSTDIR) -c
-endif
+build: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset) \
+ install-gdb-printers
$(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(build_goal)
ifeq ($(OS),IOS)
$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) ios
@@ -283,6 +280,12 @@ ifneq ($(OS),IOS)
endif
$(MAKE) gb_Side=build $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild build-tools
+install-gdb-printers:
+ifneq ($(filter-out WNT MACOSX IOS,$(OS)),)
+ mkdir -p $(INSTDIR)
+ $(SRCDIR)/solenv/bin/install-gdb-printers -a $(INSTDIR) -c
+endif
+
#
# Install
More information about the Libreoffice-commits
mailing list