Get rid of StaticLibrary_pdfimport_s

...which contained the bulk of .cxx files that should logically go into
Library_pdfimport.  It was likely (only) used so that check_targets
CppunitTest_sdext_pdfimport, Executable_pdf2xml, and Executable_pdfunip could
access the library's internals without exporting them.  For the CppunitTest, use
the standard gb_CppunitTest_use_library_objects hack instead.  For the two
Executables, make that _use_library_objects hack available for Executables, too.
(It is a bit unclear whether those two Executables are really needed, they are
only referenced from the dead dmake-based
sdext/source/pdfimport/test/testdocs/makefile.mk and from vcl/README,
respectively; but just keep them alive for now.)

Change-Id: Ia2478508de216678be7a2302aba0c48f80de9d91
Reviewed-on: https://gerrit.libreoffice.org/20645
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

7 files changed, 32 insertions, 67 deletions

diff --git a/sdext/CppunitTest_sdext_pdfimport.mk b/sdext/CppunitTest_sdext_pdfimport.mk
index 56680f2e56c2..d218b361654b 100644
--- a/sdext/CppunitTest_sdext_pdfimport.mk
+++ b/sdext/CppunitTest_sdext_pdfimport.mk
@@ -36,9 +36,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sdext_pdfimport,\
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_static_libraries,sdext_pdfimport,\
-    pdfimport_s \
-))
+$(eval $(call gb_CppunitTest_use_library_objects,sdext_pdfimport,pdfimport))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,sdext_pdfimport,\
     sdext/source/pdfimport/test/tests \
diff --git a/sdext/Executable_pdf2xml.mk b/sdext/Executable_pdf2xml.mk
index b9c93921f16b..6dcb26f9fc2a 100644
--- a/sdext/Executable_pdf2xml.mk
+++ b/sdext/Executable_pdf2xml.mk
@@ -33,9 +33,7 @@ $(eval $(call gb_Executable_use_libraries,pdf2xml,\
     sal \
 ))
 
-$(eval $(call gb_Executable_use_static_libraries,pdf2xml,\
-    pdfimport_s \
-))
+$(eval $(call gb_Executable_use_library_objects,pdf2xml,pdfimport))
 
 $(eval $(call gb_Executable_add_exception_objects,pdf2xml,\
     sdext/source/pdfimport/test/pdf2xml \
diff --git a/sdext/Executable_pdfunzip.mk b/sdext/Executable_pdfunzip.mk
index ec94503ef6fa..74b1a964b0f1 100644
--- a/sdext/Executable_pdfunzip.mk
+++ b/sdext/Executable_pdfunzip.mk
@@ -22,12 +22,15 @@ $(eval $(call gb_Executable_set_include,pdfunzip,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,pdfunzip,\
+    basegfx \
+    comphelper \
+    cppu \
+    cppuhelper \
     sal \
+    vcl \
 ))
 
-$(eval $(call gb_Executable_use_static_libraries,pdfunzip,\
-    pdfimport_s \
-))
+$(eval $(call gb_Executable_use_library_objects,pdfunzip,pdfimport))
 
 $(eval $(call gb_Executable_add_exception_objects,pdfunzip,\
     sdext/source/pdfimport/test/pdfunzip \
diff --git a/sdext/Library_pdfimport.mk b/sdext/Library_pdfimport.mk
index dec3c3aa75c1..d181ae15682a 100644
--- a/sdext/Library_pdfimport.mk
+++ b/sdext/Library_pdfimport.mk
@@ -13,6 +13,8 @@ $(eval $(call gb_Library_set_componentfile,pdfimport,sdext/source/pdfimport/pdfi
 
 $(eval $(call gb_Library_use_sdk_api,pdfimport))
 
+$(eval $(call gb_Library_use_custom_headers,pdfimport,sdext/pdfimport))
+
 $(eval $(call gb_Library_set_include,pdfimport,\
     -I$(SRCDIR)/sdext/source/pdfimport/inc \
     $$(INCLUDE) \
@@ -27,18 +29,35 @@ $(eval $(call gb_Library_use_libraries,pdfimport,\
     sal \
 ))
 
-$(eval $(call gb_Library_use_static_libraries,pdfimport,\
-    pdfimport_s \
-))
-
 $(eval $(call gb_Library_use_externals,pdfimport,\
 	boost_headers \
     zlib \
     $(if $(filter-out WNT MACOSX,$(OS)),fontconfig) \
 ))
 
+$(eval $(call gb_Library_add_defs,pdfimport, \
+    -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
+))
+
 $(eval $(call gb_Library_add_exception_objects,pdfimport,\
+    sdext/source/pdfimport/filterdet \
+    sdext/source/pdfimport/misc/pdfihelper \
+    sdext/source/pdfimport/misc/pwdinteract \
+    sdext/source/pdfimport/odf/odfemitter \
+    sdext/source/pdfimport/pdfiadaptor \
+    sdext/source/pdfimport/pdfparse/pdfentries \
+    sdext/source/pdfimport/pdfparse/pdfparse \
+    sdext/source/pdfimport/sax/emitcontext \
+    sdext/source/pdfimport/sax/saxattrlist \
     sdext/source/pdfimport/services \
+    sdext/source/pdfimport/tree/drawtreevisiting \
+    sdext/source/pdfimport/tree/genericelements \
+    sdext/source/pdfimport/tree/imagecontainer \
+    sdext/source/pdfimport/tree/pdfiprocessor \
+    sdext/source/pdfimport/tree/style \
+    sdext/source/pdfimport/tree/treevisitorfactory \
+    sdext/source/pdfimport/tree/writertreevisiting \
+    sdext/source/pdfimport/wrapper/wrapper \
 ))
 
 # vim:set noet sw=4 ts=4:
diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
index f706e9cfd9fb..44ccba59a754 100644
--- a/sdext/Module_sdext.mk
+++ b/sdext/Module_sdext.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_Module_add_targets,sdext,\
     Executable_xpdfimport \
     Library_pdfimport \
     Package_pdfimport_xpdfimport \
-    StaticLibrary_pdfimport_s \
 ))
 
 $(eval $(call gb_Module_add_check_targets,sdext,\
diff --git a/sdext/StaticLibrary_pdfimport_s.mk b/sdext/StaticLibrary_pdfimport_s.mk
deleted file mode 100644
index 8c13e3246ff5..000000000000
--- a/sdext/StaticLibrary_pdfimport_s.mk
+++ /dev/null
@@ -1,53 +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_StaticLibrary_StaticLibrary,pdfimport_s))
-
-$(eval $(call gb_StaticLibrary_use_api,pdfimport_s,\
-    offapi \
-    udkapi \
-))
-
-$(eval $(call gb_StaticLibrary_use_externals,pdfimport_s,\
-    boost_headers \
-    zlib \
-))
-
-$(eval $(call gb_StaticLibrary_use_custom_headers,pdfimport_s,sdext/pdfimport))
-
-$(eval $(call gb_StaticLibrary_set_include,pdfimport_s,\
-    -I$(SRCDIR)/sdext/source/pdfimport/inc \
-    $$(INCLUDE) \
-))
-
-$(eval $(call gb_StaticLibrary_add_defs,pdfimport_s,\
-    -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
-))
-
-$(eval $(call gb_StaticLibrary_add_exception_objects,pdfimport_s,\
-    sdext/source/pdfimport/filterdet \
-    sdext/source/pdfimport/misc/pdfihelper \
-    sdext/source/pdfimport/misc/pwdinteract \
-    sdext/source/pdfimport/odf/odfemitter \
-    sdext/source/pdfimport/pdfiadaptor \
-    sdext/source/pdfimport/pdfparse/pdfentries \
-    sdext/source/pdfimport/pdfparse/pdfparse \
-    sdext/source/pdfimport/sax/emitcontext \
-    sdext/source/pdfimport/sax/saxattrlist \
-    sdext/source/pdfimport/tree/drawtreevisiting \
-    sdext/source/pdfimport/tree/genericelements \
-    sdext/source/pdfimport/tree/imagecontainer \
-    sdext/source/pdfimport/tree/pdfiprocessor \
-    sdext/source/pdfimport/tree/style \
-    sdext/source/pdfimport/tree/treevisitorfactory \
-    sdext/source/pdfimport/tree/writertreevisiting \
-    sdext/source/pdfimport/wrapper/wrapper \
-))
-
-# vim:set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index a3767b5cca72..cef95d554205 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -126,6 +126,7 @@ $(eval $(foreach method,\
 	use_internal_api \
 	use_internal_bootstrap_api \
 	use_internal_comprehensive_api \
+	use_library_objects \
 	use_libraries \
 	use_static_libraries \
 	use_external \