[Libreoffice-commits] .: sdext/CppunitTest_pdfimport.mk sdext/Executable_pdf2xml.mk sdext/Executable_pdfunzip.mk sdext/Executable_xpdfimport.mk sdext/Library_minimizer.mk sdext/Library_presenter.mk sdext/StaticLibrary_pdfimport_s.mk

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Sun Dec 2 14:07:47 PST 2012


 sdext/CppunitTest_pdfimport.mk     |    1 +
 sdext/Executable_pdf2xml.mk        |    1 +
 sdext/Executable_pdfunzip.mk       |    1 +
 sdext/Executable_xpdfimport.mk     |    5 +----
 sdext/Library_minimizer.mk         |    4 ++++
 sdext/Library_presenter.mk         |    4 ++++
 sdext/StaticLibrary_pdfimport_s.mk |    1 +
 7 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 2be88223b930c704a358abfcababc6cf64184e1c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Sun Dec 2 23:05:39 2012 +0100

    sdext: there is a severe shortage of boost dependencies here
    
    Change-Id: Ide652d073edc3321995b787b01ea9c0bf1920827

diff --git a/sdext/CppunitTest_pdfimport.mk b/sdext/CppunitTest_pdfimport.mk
index 9b82dad..3f41b8e 100644
--- a/sdext/CppunitTest_pdfimport.mk
+++ b/sdext/CppunitTest_pdfimport.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_CppunitTest_set_include,sdext_pdfimport,\
 ))
 
 $(eval $(call gb_CppunitTest_use_externals,sdext_pdfimport,\
+    boost_headers \
     zlib \
 ))
 
diff --git a/sdext/Executable_pdf2xml.mk b/sdext/Executable_pdf2xml.mk
index a73135b..600e979 100644
--- a/sdext/Executable_pdf2xml.mk
+++ b/sdext/Executable_pdf2xml.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Executable_Executable,pdf2xml))
 $(eval $(call gb_Executable_use_sdk_api,pdf2xml))
 
 $(eval $(call gb_Executable_use_externals,pdf2xml,\
+    boost_headers \
     zlib \
 ))
 
diff --git a/sdext/Executable_pdfunzip.mk b/sdext/Executable_pdfunzip.mk
index 79fedde..c3bd395 100644
--- a/sdext/Executable_pdfunzip.mk
+++ b/sdext/Executable_pdfunzip.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Executable_Executable,pdfunzip))
 $(eval $(call gb_Executable_use_sdk_api,pdfunzip))
 
 $(eval $(call gb_Executable_use_externals,pdfunzip,\
+    boost_headers \
     zlib \
 ))
 
diff --git a/sdext/Executable_xpdfimport.mk b/sdext/Executable_xpdfimport.mk
index f333ef9..0d7757d 100644
--- a/sdext/Executable_xpdfimport.mk
+++ b/sdext/Executable_xpdfimport.mk
@@ -33,14 +33,11 @@ $(eval $(call gb_Executable_use_packages,xpdfimport,\
 ))
 
 $(eval $(call gb_Executable_use_externals,xpdfimport,\
+    boost_headers \
     poppler \
     zlib \
 ))
 
-$(eval $(call gb_Executable_set_include,xpdfimport,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_add_exception_objects,xpdfimport,\
     sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl \
     sdext/source/pdfimport/xpdfwrapper/pnghelper \
diff --git a/sdext/Library_minimizer.mk b/sdext/Library_minimizer.mk
index 409b146..e5b4518 100644
--- a/sdext/Library_minimizer.mk
+++ b/sdext/Library_minimizer.mk
@@ -29,6 +29,10 @@ $(eval $(call gb_Library_Library,SunPresentationMinimizer))
 
 $(eval $(call gb_Library_set_componentfile,SunPresentationMinimizer,sdext/source/minimizer/minimizer))
 
+$(eval $(call gb_Library_use_externals,SunPresentationMinimizer,\
+	boost_headers \
+))
+
 $(eval $(call gb_Library_use_sdk_api,SunPresentationMinimizer))
 
 $(eval $(call gb_Library_use_libraries,SunPresentationMinimizer,\
diff --git a/sdext/Library_presenter.mk b/sdext/Library_presenter.mk
index 8741815..b0950cb 100644
--- a/sdext/Library_presenter.mk
+++ b/sdext/Library_presenter.mk
@@ -29,6 +29,10 @@ $(eval $(call gb_Library_Library,PresenterScreen))
 
 $(eval $(call gb_Library_set_componentfile,PresenterScreen,sdext/source/presenter/presenter))
 
+$(eval $(call gb_Library_use_externals,PresenterScreen,\
+	boost_headers \
+))
+
 $(eval $(call gb_Library_use_sdk_api,PresenterScreen))
 
 $(eval $(call gb_Library_use_libraries,PresenterScreen,\
diff --git a/sdext/StaticLibrary_pdfimport_s.mk b/sdext/StaticLibrary_pdfimport_s.mk
index 5a78ecb..2f9d06d 100644
--- a/sdext/StaticLibrary_pdfimport_s.mk
+++ b/sdext/StaticLibrary_pdfimport_s.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_StaticLibrary_use_api,pdfimport_s,\
 ))
 
 $(eval $(call gb_StaticLibrary_use_externals,pdfimport_s,\
+    boost_headers \
     zlib \
 ))
 


More information about the Libreoffice-commits mailing list