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/Library_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/Library_pdfimport.mk')
| -rw-r--r-- | sdext/Library_pdfimport.mk | 27 |
1 files changed, 23 insertions, 4 deletions
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: |