connectivity/Library_file.mk | 4 ++++ connectivity/Library_jdbc.mk | 4 ++++ connectivity/Library_mork.mk | 4 ++++ connectivity/Library_odbcbase.mk | 4 ++++ dbaccess/Library_dba.mk | 3 ++- odk/CustomTarget_check.mk | 2 +- solenv/gbuild/LinkTarget.mk | 2 +- tubes/Executable_liboapprover.mk | 5 ----- tubes/Library_tubes.mk | 5 ----- 9 files changed, 20 insertions(+), 13 deletions(-)
New commits: commit 11e2981c4c635bd6e8a1d3d32889e6cd2ea7cdd1 Author: David Tardon <[email protected]> Date: Thu Apr 25 10:17:54 2013 +0200 change warning to error It seems that the nonexistent include paths introduced by the headers move have been cleaned up. We do not want to introduce new ones. Change-Id: Ife53bbf0c63e12a41f6b447357472ad41eed5cbe diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index b2fb19c..66c8719 100755 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -722,7 +722,7 @@ endef define gb_LinkTarget__check_srcdir_paths $(if $(filter-out $(wildcard $(2)),$(2)),\ - $(call gb_Output_warn,gb_LinkTarget_set_include: include paths $(filter-out $(wildcard $(2)),$(2)) do not exist) \ + $(call gb_Output_error,gb_LinkTarget_set_include: include paths $(filter-out $(wildcard $(2)),$(2)) do not exist) \ ) endef commit ee16e337474edac43f16425747431cefcbbab59c Author: David Tardon <[email protected]> Date: Thu Apr 25 10:17:14 2013 +0200 drop nonexistent include paths Change-Id: I3b2686cb04b7945a12f43b344ed56b39a321b51b diff --git a/tubes/Executable_liboapprover.mk b/tubes/Executable_liboapprover.mk index feb9bca..5d5994a 100644 --- a/tubes/Executable_liboapprover.mk +++ b/tubes/Executable_liboapprover.mk @@ -26,11 +26,6 @@ $(eval $(call gb_Executable_Executable,liboapprover)) -$(eval $(call gb_Executable_set_include,liboapprover,\ - -I$(SRCDIR)/tubes/inc \ - $$(INCLUDE) \ -)) - $(eval $(call gb_Executable_use_externals,liboapprover,\ gtk \ telepathy \ diff --git a/tubes/Library_tubes.mk b/tubes/Library_tubes.mk index f294e1a..96e9356 100644 --- a/tubes/Library_tubes.mk +++ b/tubes/Library_tubes.mk @@ -10,11 +10,6 @@ $(eval $(call gb_Library_Library,tubes)) -$(eval $(call gb_Library_set_include,tubes,\ - -I$(SRCDIR)/tubes/inc \ - $$(INCLUDE) \ -)) - $(eval $(call gb_Library_use_sdk_api,tubes)) $(eval $(call gb_Library_add_defs,tubes,\ commit 162ef53d441c4eb56a51f48b29b54c3915ba9da5 Author: David Tardon <[email protected]> Date: Thu Apr 25 09:42:40 2013 +0200 fix dep on doxygen CustomTarget Change-Id: Id53ab5de54ff8e86a39685b370b1114666755cfe diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index ab515c9..50a124d 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -29,7 +29,7 @@ odk_PLATFORM := $(if $(filter WNT,$(OS)),\ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(SRCDIR)/odk/util/check.pl \ $(call gb_CustomTarget_get_target,odk/odkcommon/classes) \ - $(if $(DOXYGEN),$(call gb_CustomTarget_get_target,odk/odkcommon/docs/cpp/ref)) \ + $(if $(DOXYGEN),$(call gb_CustomTarget_get_target,odk/odkcommon/docs/cpp)) \ $(call gb_Package_get_target,odk_bin) \ $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) \ $(call gb_Package_get_target,odk_config) \ commit 79c20b265479232871bcd4aea37400243e09bb99 Author: David Tardon <[email protected]> Date: Thu Apr 25 09:38:49 2013 +0200 add missing deps on sqlbison.hxx Change-Id: I098a4514b9b32b1ecf96b1f2275f77bac540d557 diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk index 47a3f07..6ced91c 100644 --- a/connectivity/Library_file.mk +++ b/connectivity/Library_file.mk @@ -27,6 +27,10 @@ $(eval $(call gb_Library_Library,file)) +$(eval $(call gb_Library_use_packages,file,\ + connectivity_generated \ +)) + $(eval $(call gb_Library_add_defs,file,\ -DOOO_DLLIMPLEMENTATION_FILE \ )) diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk index 2484704..dd1472f 100644 --- a/connectivity/Library_jdbc.mk +++ b/connectivity/Library_jdbc.mk @@ -29,6 +29,10 @@ $(eval $(call gb_Library_Library,jdbc)) $(eval $(call gb_Library_set_componentfile,jdbc,connectivity/source/drivers/jdbc/jdbc)) +$(eval $(call gb_Library_use_packages,jdbc,\ + connectivity_generated \ +)) + $(eval $(call gb_Library_use_external,jdbc,boost_headers)) $(eval $(call gb_Library_use_sdk_api,jdbc)) diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk index be18dec..c7c80cf 100644 --- a/connectivity/Library_mork.mk +++ b/connectivity/Library_mork.mk @@ -11,6 +11,10 @@ $(eval $(call gb_Library_Library,mork)) $(eval $(call gb_Library_set_componentfile,mork,connectivity/source/drivers/mork/mork)) +$(eval $(call gb_Library_use_packages,mork,\ + connectivity_generated \ +)) + $(eval $(call gb_Library_add_defs,mork,\ -DLO_DLLIMPLEMENTATION_MORK \ )) diff --git a/connectivity/Library_odbcbase.mk b/connectivity/Library_odbcbase.mk index 3e4066c..fc8f11b 100644 --- a/connectivity/Library_odbcbase.mk +++ b/connectivity/Library_odbcbase.mk @@ -29,6 +29,10 @@ $(eval $(call gb_Library_Library,odbcbase)) $(eval $(call gb_Library_set_warnings_not_errors,odbcbase)) +$(eval $(call gb_Library_use_packages,odbcbase,\ + connectivity_generated \ +)) + $(eval $(call gb_Library_use_sdk_api,odbcbase)) $(eval $(call gb_Library_set_include,odbcbase,\ diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk index fd2895a..fa9eb6d 100644 --- a/dbaccess/Library_dba.mk +++ b/dbaccess/Library_dba.mk @@ -9,7 +9,8 @@ $(eval $(call gb_Library_Library,dba)) -$(eval $(call gb_Library_use_package,dba,\ +$(eval $(call gb_Library_use_packages,dba,\ + connectivity_generated \ dbaccess_inc \ )) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
