diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-12-11 17:54:43 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-12-11 19:27:43 +0000 |
| commit | f2876214d9566b61301f04c3e65cbbd21b25d07f (patch) | |
| tree | 7b444f78e82d998094d75f76862d9820eec48883 /sdext/CppunitTest_sdext_pdfimport.mk | |
| parent | a643222794fa0d0e76d18fc59cf9ef3c5ea5188f (diff) | |
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>
Diffstat (limited to 'sdext/CppunitTest_sdext_pdfimport.mk')
| -rw-r--r-- | sdext/CppunitTest_sdext_pdfimport.mk | 4 |
1 files changed, 1 insertions, 3 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 \ |