diff options
| author | David Tardon <dtardon@redhat.com> | 2013-11-05 06:53:49 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-11-05 06:53:49 +0100 |
| commit | 8fa06c85daea3c9899991a5f38f7d72c483cf5cd (patch) | |
| tree | 732bb0e05ccad633b1399ca3cbb90304baf6557b | |
| parent | 217eae4f1f7d6f5c6d8efd3d86aa45e70ebee93f (diff) | |
add an external for bluez_bluetooth_headers
Change-Id: Idf48f9a5c2245f6696688a17a0fa3809ae751582
| -rw-r--r-- | RepositoryExternal.mk | 16 | ||||
| -rw-r--r-- | sd/Library_sd.mk | 8 |
2 files changed, 18 insertions, 6 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 72604a140d0c..9220df7450c4 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 249cb4ea6df9..bafb8201b56c 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 \ |