solenv: remove gdb Package and CustomTarget

Since it's necessary to call install-gdb-printers anyway (which is what
the CustomTarget_gdb does), just do it first thing in "build" target
so that unit tests running during a from-scratch build get the pretty
printers too.

Change-Id: I357dfb828a2e0eed675aa552d3256f96a312a890

4 files changed, 3 insertions, 71 deletions

diff --git a/Makefile.in b/Makefile.in
index 9c78dbf8fee1..a3af10711ddc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -233,11 +233,11 @@ bootstrap: compilerplugins
 # Note: if invoked as "make check" this will also run subsequentcheck!
 #
 build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
-	$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild \
-		all $(if $(filter check,$(MAKECMDGOALS)),subsequentcheck)
 ifneq ($(filter-out WNT MACOSX IOS ANDROID,$(OS)),)
-	install-gdb-printers -a $(INSTDIR)
+	mkdir -p $(INSTDIR) && install-gdb-printers -a $(INSTDIR) -c
 endif
+	$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild \
+		all $(if $(filter check,$(MAKECMDGOALS)),subsequentcheck)
 ifeq ($(OS),IOS)
 	$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) ios
 endif
diff --git a/solenv/CustomTarget_gdb.mk b/solenv/CustomTarget_gdb.mk
deleted file mode 100644
index 188445506b2e..000000000000
--- a/solenv/CustomTarget_gdb.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CustomTarget_CustomTarget,solenv/gdb))
-
-$(call gb_CustomTarget_get_target,solenv/gdb) : \
-	$(SRCDIR)/solenv/bin/install-gdb-printers \
-	$(SRCDIR)/solenv/gdb/autoload.template \
-	| $(call gb_CustomTarget_get_workdir,solenv/gdb)/.dir
-
-$(call gb_CustomTarget_get_target,solenv/gdb) :
-	$(call gb_Output_announce,solenv/gdb,$(true),SH ,1)
-	install-gdb-printers -a $(call gb_CustomTarget_get_workdir,solenv/gdb) -f && \
-	touch $@
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk
index 4e78021c5b32..78008984c89d 100644
--- a/solenv/Module_solenv.mk
+++ b/solenv/Module_solenv.mk
@@ -21,12 +21,4 @@ $(eval $(call gb_Module_add_targets,solenv,\
 ))
 endif
 
-
-ifneq ($(filter-out WNT IOS ANDROID,$(OS)),)
-$(eval $(call gb_Module_add_targets,solenv,\
-	CustomTarget_gdb \
-	Package_gdb \
-))
-endif
-
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/solenv/Package_gdb.mk b/solenv/Package_gdb.mk
deleted file mode 100644
index aca8286af4f9..000000000000
--- a/solenv/Package_gdb.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,solenv_gdb,$(call gb_CustomTarget_get_workdir,solenv/gdb)))
-
-$(eval $(call gb_Package_set_outdir,solenv_gdb,$(OUTDIR)))
-
-# keep in sync with solenv/bin/install-gdb-printers
-$(eval $(call gb_Package_add_files,solenv_gdb,lib,\
-	$(if $(MERGELIBS), \
-		$(call gb_Library_get_runtime_filename,merged)-gdb.py \
-		$(if $(filter ALL,$(MERGELIBS)), \
-			$(call gb_Library_get_runtime_filename,urelibs)-gdb.py \
-		, \
-			$(call gb_Library_get_runtime_filename,cppu)-gdb.py \
-			$(call gb_Library_get_runtime_filename,sal)-gdb.py \
-			$(call gb_Library_get_runtime_filename,sw)-gdb.py \
-		) \
-	, \
-		$(call gb_Library_get_runtime_filename,basegfx)-gdb.py \
-		$(call gb_Library_get_runtime_filename,cppu)-gdb.py \
-		$(call gb_Library_get_runtime_filename,sal)-gdb.py \
-		$(call gb_Library_get_runtime_filename,svl)-gdb.py \
-		$(call gb_Library_get_runtime_filename,sw)-gdb.py \
-		$(call gb_Library_get_runtime_filename,tl)-gdb.py \
-	) \
-	$(call gb_Library_get_runtime_filename,writerfilter)-gdb.py \
-))
-
-$(eval $(call gb_Package_use_custom_target,solenv_gdb,solenv/gdb))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab: