2012-07-10 18:08:20

by Vinicius Costa Gomes

[permalink] [raw]
Subject: [PATCH BlueZ 1/5] build: Fix typo

"profiles_sap" should be "profiles/sap".
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index d922f2f..d65b28c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -168,7 +168,7 @@ builtin_nodist += profiles/sap/sap.c

noinst_LIBRARIES += profiles/sap/libsap.a

-profiles_sap_libsap_a_SOURCES = profiles_sap/sap.h profiles/sap/sap-dummy.c \
+profiles_sap_libsap_a_SOURCES = profiles/sap/sap.h profiles/sap/sap-dummy.c \
profiles/sap/sap-u8500.c
endif

--
1.7.10.4



2012-07-10 18:23:42

by Johan Hedberg

[permalink] [raw]
Subject: Re: [PATCH BlueZ 1/5] build: Fix typo

Hi Vinicius,

On Tue, Jul 10, 2012, Vinicius Costa Gomes wrote:
> "profiles_sap" should be "profiles/sap".
> ---
> Makefile.am | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

All patches have been applied. Thanks.

Johan

2012-07-10 18:08:24

by Vinicius Costa Gomes

[permalink] [raw]
Subject: [PATCH BlueZ 5/5] build: Fix make distcheck

The gstreamer module needs audio/rtp.h to exist in the distribution.
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 84bf695..ffb57e8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -337,7 +337,7 @@ audio_libgstbluetooth_la_SOURCES = audio/gstbluetooth.c audio/gstpragma.h \
audio/gstsbcparse.h audio/gstsbcparse.c \
audio/gstavdtpsink.h audio/gstavdtpsink.c \
audio/gsta2dpsink.h audio/gsta2dpsink.c \
- audio/gstsbcutil.h audio/gstsbcutil.c \
+ audio/gstsbcutil.h audio/gstsbcutil.c audio/rtp.h \
audio/gstrtpsbcpay.h audio/gstrtpsbcpay.c
audio_libgstbluetooth_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
audio_libgstbluetooth_la_LIBADD = sbc/libsbc.la lib/libbluetooth-private.la \
--
1.7.10.4


2012-07-10 18:08:23

by Vinicius Costa Gomes

[permalink] [raw]
Subject: [PATCH BlueZ 4/5] build: Fix make distcheck

"proximity/proximity.conf" doesn't exist anymore, it was moved to
"profiles/proximity/proximity.conf".
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index f9caeb8..84bf695 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -319,7 +319,7 @@ endif

EXTRA_DIST += src/genbuiltin src/bluetooth.conf src/org.bluez.service \
src/main.conf profiles/network/network.conf \
- profiles/input/input.conf proximity/proximity.conf \ \
+ profiles/input/input.conf profiles/proximity/proximity.conf \
audio/audio.conf audio/telephony-dummy.c \
audio/telephony-maemo5.c audio/telephony-ofono.c \
audio/telephony-maemo6.c profiles/sap/sap-dummy.c \
--
1.7.10.4


2012-07-10 18:08:22

by Vinicius Costa Gomes

[permalink] [raw]
Subject: [PATCH BlueZ 3/5] Build: Fix make distcheck

plugins/hal.c should not be present in the distribution.
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index db8e7ae..f9caeb8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -242,7 +242,7 @@ endif
builtin_modules += formfactor
builtin_sources += plugins/formfactor.c

-EXTRA_DIST += plugins/hal.c plugins/formfactor.c
+EXTRA_DIST += plugins/formfactor.c

builtin_modules += storage
builtin_sources += plugins/storage.c
--
1.7.10.4


2012-07-10 18:08:21

by Vinicius Costa Gomes

[permalink] [raw]
Subject: [PATCH BlueZ 2/5] build: Fix typo

"ptofiles" should have been "profiles"
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index d65b28c..db8e7ae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -128,7 +128,7 @@ mcap_sources =

if MCAP
mcap_sources += profiles/health/mcap_lib.h profiles/health/mcap_internal.h \
- ptofiles/health/mcap.h profiles/health/mcap.c \
+ profiles/health/mcap.h profiles/health/mcap.c \
profiles/health/mcap_sync.c
endif

--
1.7.10.4