Disabled building of bluetooth by default

It doesn't build and I do not have time to solve why.

diff --git a/bluetooth/Makefile.omk b/bluetooth/Makefile.omk
index ae3373166106090d29290634ee9c7d853a1ef1f5..6654773bbe30946d767713d664fb79c19a41d976 100644 (file)
--- a/bluetooth/Makefile.omk
+++ b/bluetooth/Makefile.omk
@@ -1,14 +1,9 @@
 # -*- makefile -*-
 
-#bin_PROGRAMS  = bth_comp2 bth_comp1
-
-#bth_comp1_SOURCES = main.c bth_main.c bth_command.c bth_event_acc.c bth_error.c bth_cmd_complete_ev.c l2cap.c bth_inface.c h2638_pkt_controll.c
-#bth_comp1_LIBS = boot_fn arch_drivers excptvec misc pxmc m sci_channels
-#bth_comp1_MOREOBJS = $(USER_LIB_DIR)/system_stub.o
+default_CONFIG += CONFIG_BLUETOOTH=n
+default_CONFIG += CONFIG_BLUETOOTH_LINUX=n
 
-#bth_comp2_SOURCES = main.c 
-#bth_comp2_LIBS = boot_fn arch_drivers excptvec misc pxmc m sci_channels bluetooth
-#bth_comp2_MOREOBJS = $(USER_LIB_DIR)/system_stub.o
+ifeq (y,$(if $(filter y,$(CONFIG_BLUETOOTH) $(CONFIG_BLUETOOTH_LINUX)),y,n))
 
 lib_LIBRARIES = mirobt
 
@@ -22,8 +17,7 @@ mirobt_SOURCES += hci_sci.c h2638_pkt_controll.c
 endif
 include_HEADERS = bth_inface.h bth_fce_out.h bth_h8s2638.h
 
-default_CONFIG += CONFIG_BLUETOOTH=y
-default_CONFIG += CONFIG_BLUETOOTH_LINUX=n
-
 config_include_HEADERS = bth_config.h
 bth_config_DEFINES = $(default_CONFIG)
+
+endif

diff --git a/bth_tests/app/Makefile.omk b/bth_tests/app/Makefile.omk
index 4959b357bac009e9893c7e05746c6dd0c07b4e55..611a0ff0e2009298dd0c67f9b091742895df7015 100644 (file)
--- a/bth_tests/app/Makefile.omk
+++ b/bth_tests/app/Makefile.omk
@@ -1,5 +1,9 @@
 # -*- makefile -*-
 
+ifeq ($(CONFIG_BLUETOOTH_LINUX),y)
+
 bin_PROGRAMS = test
 test_SOURCES = test.c
 test_LIBS = bluetooth mirobt
+
+endif

diff --git a/bth_tests/bluetooth/Makefile.omk b/bth_tests/bluetooth/Makefile.omk
index ae3373166106090d29290634ee9c7d853a1ef1f5..6654773bbe30946d767713d664fb79c19a41d976 100644 (file)
--- a/bth_tests/bluetooth/Makefile.omk
+++ b/bth_tests/bluetooth/Makefile.omk
@@ -1,14 +1,9 @@
 # -*- makefile -*-
 
-#bin_PROGRAMS  = bth_comp2 bth_comp1
-
-#bth_comp1_SOURCES = main.c bth_main.c bth_command.c bth_event_acc.c bth_error.c bth_cmd_complete_ev.c l2cap.c bth_inface.c h2638_pkt_controll.c
-#bth_comp1_LIBS = boot_fn arch_drivers excptvec misc pxmc m sci_channels
-#bth_comp1_MOREOBJS = $(USER_LIB_DIR)/system_stub.o
+default_CONFIG += CONFIG_BLUETOOTH=n
+default_CONFIG += CONFIG_BLUETOOTH_LINUX=n
 
-#bth_comp2_SOURCES = main.c 
-#bth_comp2_LIBS = boot_fn arch_drivers excptvec misc pxmc m sci_channels bluetooth
-#bth_comp2_MOREOBJS = $(USER_LIB_DIR)/system_stub.o
+ifeq (y,$(if $(filter y,$(CONFIG_BLUETOOTH) $(CONFIG_BLUETOOTH_LINUX)),y,n))
 
 lib_LIBRARIES = mirobt
 
@@ -22,8 +17,7 @@ mirobt_SOURCES += hci_sci.c h2638_pkt_controll.c
 endif
 include_HEADERS = bth_inface.h bth_fce_out.h bth_h8s2638.h
 
-default_CONFIG += CONFIG_BLUETOOTH=y
-default_CONFIG += CONFIG_BLUETOOTH_LINUX=n
-
 config_include_HEADERS = bth_config.h
 bth_config_DEFINES = $(default_CONFIG)
+
+endif

diff --git a/testapp/Makefile.omk b/testapp/Makefile.omk
index 2362cb9847c4f5ecb55c3b90ee227ff950a877ab..ecf1560f4477581a60730d0b4dc3fa841bc9cb0f 100644 (file)
--- a/testapp/Makefile.omk
+++ b/testapp/Makefile.omk
@@ -1,8 +1,12 @@
 # -*- makefile -*-
 
+ifeq ($(CONFIG_BLUETOOTH),y)
+
 bin_PROGRAMS  = mirosot
 
 mirosot_SOURCES = mirosot_main.c cmd_pxmc.c cmd_bth.c
 
 mirosot_LIBS = boot_fn arch_drivers excptvec misc pxmc m sci_channels mirobt
 mirosot_MOREOBJS = $(USER_LIB_DIR)/system_stub.o
+
+endif