sdext: factor out a static library to fix triple-linked objects

6 files changed, 85 insertions, 72 deletions

diff --git a/sdext/CppunitTest_pdfimport.mk b/sdext/CppunitTest_pdfimport.mk
index 77a0d2ae0107..5e8a91484213 100644
--- a/sdext/CppunitTest_pdfimport.mk
+++ b/sdext/CppunitTest_pdfimport.mk
@@ -58,10 +58,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sdext_pdfimport,\
 
 $(eval $(call gb_CppunitTest_add_linked_static_libs,sdext_pdfimport,\
     basegfx_s \
-))
-
-$(eval $(call gb_CppunitTest_add_library_objects,sdext_pdfimport,\
-    pdfimport \
+    pdfimport_s \
 ))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,sdext_pdfimport,\
diff --git a/sdext/Executable_pdf2xml.mk b/sdext/Executable_pdf2xml.mk
index 38fa4e6c018c..681d77fca12b 100644
--- a/sdext/Executable_pdf2xml.mk
+++ b/sdext/Executable_pdf2xml.mk
@@ -49,29 +49,12 @@ $(eval $(call gb_Executable_add_linked_libs,pdf2xml,\
     sal \
 ))
 
-$(eval $(call gb_Executable_add_exception_objects,pdf2xml,\
-    sdext/source/pdfimport/test/pdf2xml \
+$(eval $(call gb_Executable_add_linked_static_libs,pdf2xml,\
+    pdfimport_s \
 ))
 
-# additional objects we need to link in
 $(eval $(call gb_Executable_add_exception_objects,pdf2xml,\
-    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 \
+    sdext/source/pdfimport/test/pdf2xml \
 ))
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sdext/Executable_pdfunzip.mk b/sdext/Executable_pdfunzip.mk
index 8552a17caa08..d073c0548044 100644
--- a/sdext/Executable_pdfunzip.mk
+++ b/sdext/Executable_pdfunzip.mk
@@ -48,29 +48,12 @@ $(eval $(call gb_Executable_add_linked_libs,pdfunzip,\
     sal \
 ))
 
-$(eval $(call gb_Executable_add_exception_objects,pdfunzip,\
-    sdext/source/pdfimport/test/pdfunzip \
+$(eval $(call gb_Executable_add_linked_static_libs,pdfunzip,\
+    pdfimport_s \
 ))
 
-# additional objects we need to link in
 $(eval $(call gb_Executable_add_exception_objects,pdfunzip,\
-    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 \
+    sdext/source/pdfimport/test/pdfunzip \
 ))
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sdext/Library_pdfimport.mk b/sdext/Library_pdfimport.mk
index 485a14adf3f2..f8e47ad83392 100644
--- a/sdext/Library_pdfimport.mk
+++ b/sdext/Library_pdfimport.mk
@@ -25,8 +25,6 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk
-
 $(eval $(call gb_Library_Library,pdfimport))
 
 $(eval $(call gb_Library_add_api,pdfimport,\
@@ -34,15 +32,6 @@ $(eval $(call gb_Library_add_api,pdfimport,\
     udkapi \
 ))
 
-$(eval $(call gb_Library_add_defs,pdfimport,\
-    -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
-    -DPDFI_IMPL_IDENTIFIER=\"com.sun.star.PDFImport-$(sdext_PLATFORM)\" \
-))
-
-$(eval $(call gb_Library_add_package_headers,pdfimport,\
-    sdext_pdfimport_keywords \
-))
-
 $(eval $(call gb_Library_set_include,pdfimport,\
     -I$(WORKDIR)/CustomTarget/sdext/source/pdfimport/wrapper \
     -I$(SRCDIR)/sdext/source/pdfimport/inc \
@@ -57,6 +46,7 @@ $(eval $(call gb_Library_add_linked_libs,pdfimport,\
 
 $(eval $(call gb_Library_add_linked_static_libs,pdfimport,\
     basegfx_s \
+    pdfimport_s \
 ))
 
 $(eval $(call gb_Library_use_externals,pdfimport,\
@@ -64,24 +54,7 @@ $(eval $(call gb_Library_use_externals,pdfimport,\
 ))
 
 $(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 shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
index 8f496905f175..7827633f1fc8 100644
--- a/sdext/Module_sdext.mk
+++ b/sdext/Module_sdext.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Module_add_targets,sdext,\
     Executable_xpdfimport \
     Extension_pdfimport \
     Library_pdfimport \
+    StaticLibrary_pdfimport_s \
     Package_pdfimport_keywords \
 ))
 
diff --git a/sdext/StaticLibrary_pdfimport_s.mk b/sdext/StaticLibrary_pdfimport_s.mk
new file mode 100644
index 000000000000..5fd30722048d
--- /dev/null
+++ b/sdext/StaticLibrary_pdfimport_s.mk
@@ -0,0 +1,76 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., Michael Stahl <mstahl@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,pdfimport_s))
+
+$(eval $(call gb_StaticLibrary_add_api,pdfimport_s,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_StaticLibrary_use_externals,pdfimport_s,\
+    zlib \
+))
+
+$(eval $(call gb_StaticLibrary_add_package_headers,pdfimport_s,\
+    sdext_pdfimport_keywords \
+))
+
+$(eval $(call gb_StaticLibrary_set_include,pdfimport_s,\
+    -I$(WORKDIR)/CustomTarget/sdext/source/pdfimport/wrapper \
+    -I$(SRCDIR)/sdext/source/pdfimport/inc \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_StaticLibrary_add_defs,pdfimport_s,\
+    -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
+    -DPDFI_IMPL_IDENTIFIER=\"com.sun.star.PDFImport-$(sdext_PLATFORM)\" \
+))
+
+$(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 shiftwidth=4 softtabstop=4 expandtab: