RepositoryExternal.mk | 84 +++++++++++++++++++++++++++++--------------------- sd/Library_sd.mk | 15 -------- 2 files changed, 50 insertions(+), 49 deletions(-)
New commits: commit c69941fc45717398a870a9c479dd62e06f4733ef Author: David Tardon <[email protected]> Date: Tue Nov 5 06:56:18 2013 +0100 this must be in lowercase letters Change-Id: I58e4824156b1646d000a39ba196068efbe10425e diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 9220df7..8ca76f5 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1809,9 +1809,7 @@ endef else # ENABLE_AVAHI -define gb_LinkTarget__use_AVAHI - -endef +define gb_LinkTarget__use_avahi := endif # ENABLE_AVAHI commit 7fbf0ef60c7c0a33aa480e0820f576687dec1e7a Author: David Tardon <[email protected]> Date: Tue Nov 5 06:55:52 2013 +0100 there is no need for the condition Change-Id: Icf3e0fbafdff39e5ad9c8eb7699820e2c0204bd6 diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index bafb820..3f93c75 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -93,7 +93,6 @@ $(eval $(call gb_Library_use_libraries,sd,\ $(gb_UWINAPI) \ )) -ifeq ($(OS), LINUX) $(eval $(call gb_Library_use_externals,sd,\ bluez_bluetooth_headers \ boost_headers \ @@ -103,14 +102,6 @@ $(eval $(call gb_Library_use_externals,sd,\ avahi \ ) \ )) -else -$(eval $(call gb_Library_use_externals,sd,\ - bluez_bluetooth_headers \ - boost_headers \ - libxml2 \ - dbus \ -)) -endif ifeq ($(OS),WNT) $(eval $(call gb_Library_use_system_win32_libs,sd,\ commit 8fa06c85daea3c9899991a5f38f7d72c483cf5cd Author: David Tardon <[email protected]> Date: Tue Nov 5 06:53:49 2013 +0100 add an external for bluez_bluetooth_headers Change-Id: Idf48f9a5c2245f6696688a17a0fa3809ae751582 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 72604a1..9220df7 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -142,6 +142,22 @@ gb_LinkTarget__use_sane_headers := endif +ifeq ($(SYSTEM_BLUEZ),YES) + +gb_LinkTarget__use_bluez_bluetooth_headers := + +else # !SYSTEM_BLUEZ + +define gb_LinkTarget__use_bluez_bluetooth_headers +$(call gb_LinkTarget_set_include,$(1),\ + -I$(SRCDIR)/external/bluez_bluetooth/inc \ + $$(INCLUDE) \ +) + +endef + +endif # SYSTEM_BLUEZ + # External libraries ifeq ($(SYSTEM_CPPUNIT),YES) diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 249cb4e..bafb820 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -44,12 +44,6 @@ $(eval $(call gb_Library_set_include,sd,\ -I$(WORKDIR)/SdiTarget/sd/sdi \ )) -ifneq ($(SYSTEM_BLUEZ),YES) -$(eval $(call gb_Library_add_cxxflags,sd,\ - -I$(SRCDIR)/external/bluez_bluetooth/inc \ -)) -endif - $(eval $(call gb_Library_add_defs,sd,\ -DSD_DLLIMPLEMENTATION \ )) @@ -101,6 +95,7 @@ $(eval $(call gb_Library_use_libraries,sd,\ ifeq ($(OS), LINUX) $(eval $(call gb_Library_use_externals,sd,\ + bluez_bluetooth_headers \ boost_headers \ libxml2 \ dbus \ @@ -110,6 +105,7 @@ $(eval $(call gb_Library_use_externals,sd,\ )) else $(eval $(call gb_Library_use_externals,sd,\ + bluez_bluetooth_headers \ boost_headers \ libxml2 \ dbus \ commit 217eae4f1f7d6f5c6d8efd3d86aa45e70ebee93f Author: David Tardon <[email protected]> Date: Tue Nov 5 06:49:33 2013 +0100 move mariadb to libs section Change-Id: Ie78ea961a32e96c90bb674766b24a0c44d27412c diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index b633fa0..72604a1 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -29,38 +29,6 @@ # External headers -ifeq ($(SYSTEM_MARIADB),YES) - -define gb_LinkTarget__use_mariadb -$(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - $(MARIADB_CFLAGS) \ -) -$(call gb_LinkTarget_add_libs,$(1),$(MARIADB_LIBS)) - -endef -gb_ExternalProject__use_mariadb := - -else # !SYSTEM_MARIADB - -define gb_LinkTarget__use_mariadb -$(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - $(MARIADB_CFLAGS) \ -) -$(call gb_LinkTarget_use_static_libraries,$(1),\ - mariadblib \ -) - -endef -define gb_ExternalProject__use_mariadb -$(call gb_ExternalProject_use_static_libraries,$(1),mariadblib) - -endef - -endif # SYSTEM_MARIADB - - ifeq ($(SYSTEM_MESA_HEADERS),YES) gb_LinkTarget__use_mesa_headers := @@ -221,6 +189,38 @@ endef ifeq ($(SYSTEM_MARIADB),YES) +define gb_LinkTarget__use_mariadb +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(MARIADB_CFLAGS) \ +) +$(call gb_LinkTarget_add_libs,$(1),$(MARIADB_LIBS)) + +endef +gb_ExternalProject__use_mariadb := + +else # !SYSTEM_MARIADB + +define gb_LinkTarget__use_mariadb +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(MARIADB_CFLAGS) \ +) +$(call gb_LinkTarget_use_static_libraries,$(1),\ + mariadblib \ +) + +endef +define gb_ExternalProject__use_mariadb +$(call gb_ExternalProject_use_static_libraries,$(1),mariadblib) + +endef + +endif # SYSTEM_MARIADB + + +ifeq ($(SYSTEM_MARIADB),YES) + define gb_LinkTarget__use_mysql $(call gb_LinkTarget_add_defs,$(1),\ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
