RepositoryExternal.mk | 11 +++++++++++ sc/CppunitTest_sc_filters_test.mk | 1 + sc/CppunitTest_sc_subsequent_export_test.mk | 1 + sc/CppunitTest_sc_subsequent_filters_test.mk | 1 + sc/CppunitTest_sc_ucalc.mk | 1 + sc/Library_scfilt.mk | 1 + 6 files changed, 16 insertions(+)
New commits: commit f415e43c43a7599f30b536147ac07e28f659c0b5 Author: Kohei Yoshida <[email protected]> Date: Thu Apr 11 23:11:21 2013 -0400 Get sc to build. Change-Id: Ia5a73ec2acd3663a35632f268b59c0646cd356ea diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d4e4426..3531328 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2275,6 +2275,10 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ orcus \ )) +$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ + orcus-parser \ +)) + define gb_LinkTarget__use_orcus $(call gb_LinkTarget_use_unpacked,$(1),orcus) $(call gb_LinkTarget_set_include,$(1),\ @@ -2290,6 +2294,13 @@ $(if $(filter YES,$(SYSTEM_BOOST)), \ endef +define gb_LinkTarget__use_orcus-parser +$(call gb_LinkTarget_use_static_libraries,$(1),\ + orcus-parser \ +) + +endef + endif # SYSTEM_LIBORCUS diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index a3235e6..521b6e0 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -41,6 +41,7 @@ $(eval $(call gb_CppunitTest_use_externals,sc_filters_test, \ boost_headers \ mdds_headers \ orcus \ + orcus-parser \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \ diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk b/sc/CppunitTest_sc_subsequent_export_test.mk index e63caf2..56fd35d 100644 --- a/sc/CppunitTest_sc_subsequent_export_test.mk +++ b/sc/CppunitTest_sc_subsequent_export_test.mk @@ -35,6 +35,7 @@ $(eval $(call gb_CppunitTest_use_externals,sc_subsequent_export_test, \ boost_headers \ mdds_headers \ orcus \ + orcus-parser \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_export_test, \ diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk index a200dac..f6ea862 100644 --- a/sc/CppunitTest_sc_subsequent_filters_test.mk +++ b/sc/CppunitTest_sc_subsequent_filters_test.mk @@ -35,6 +35,7 @@ $(eval $(call gb_CppunitTest_use_externals,sc_subsequent_filters_test, \ boost_headers \ mdds_headers \ orcus \ + orcus-parser \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_filters_test, \ diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index 00dc942..3ee4a57 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -45,6 +45,7 @@ $(eval $(call gb_CppunitTest_use_externals,sc_ucalc,\ boost_headers \ mdds_headers \ orcus \ + orcus-parser \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \ diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index 5c8c8ef..dfb98f7 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -70,6 +70,7 @@ $(eval $(call gb_Library_use_libraries,scfilt,\ $(eval $(call gb_Library_use_externals,scfilt,\ orcus \ + orcus-parser \ zlib \ )) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
