2011-12-28 09:53:35

by Yegor Yefremov

Subject: Fix out-of-source build breakage

These patches fix out-of-source build breakage. The first one fixes
link creation and the second one adds tools to includ folder list.

The patches were tested for both in-source and out-of-source scenarios.

Following patch was included in this patch set and can be ignored:
[PATCH] fix lib header linking for out-of-source build

Yegor

2011-12-29 08:10:29

by Yegor Yefremov

Subject: Re: Fix out-of-source build breakage

Hi Marcel,

>> These patches fix out-of-source build breakage. The first one fixes
>> link creation and the second one adds tools to includ folder list.
>>
>> The patches were tested for both in-source and out-of-source scenarios.
>>
>> Following patch was included in this patch set and can be ignored:
>> [PATCH] fix lib header linking for out-of-source build
>
> I pushed both patches now.

Thanks.

What is going on with
http://git.kernel.org/?p=bluetooth/bluez-gnome.git;a=summary? Are you
planning to revive it?

Regards,
Yegor

2011-12-28 17:41:45

by Marcel Holtmann

Subject: Re: Fix out-of-source build breakage

Hi Yegor,

> These patches fix out-of-source build breakage. The first one fixes
> link creation and the second one adds tools to includ folder list.
>
> The patches were tested for both in-source and out-of-source scenarios.
>
> Following patch was included in this patch set and can be ignored:
> [PATCH] fix lib header linking for out-of-source build

I pushed both patches now.

Regards

Marcel

2011-12-28 09:53:37

by Yegor Yefremov

Subject: [PATCH 2/2] add tools to include folder list

From: Yegor Yefremov <[email protected]>

adding tools to include folder list avoids out-of-source build
breakage
---
Makefile.am | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9f26b06..8bc6cfe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -441,7 +441,8 @@ AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@

INCLUDES = -I$(builddir)/lib -I$(builddir)/src -I$(srcdir)/src \
-I$(srcdir)/audio -I$(srcdir)/sbc -I$(srcdir)/gdbus \
- -I$(srcdir)/attrib -I$(srcdir)/btio
+ -I$(srcdir)/attrib -I$(srcdir)/btio -I$(srcdir)/tools \
+ -I$(builddir)/tools

if MCAP
INCLUDES += -I$(builddir)/health
--
1.7.5.4

2011-12-28 09:53:36

by Yegor Yefremov

Subject: [PATCH 1/2] fix link creation for out-of-source builds

From: Yegor Yefremov <[email protected]>

---
Makefile.am | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5cf287c..9f26b06 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -480,7 +480,7 @@ src/builtin.h: src/genbuiltin $(builtin_sources)
$(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@

audio/telephony.c: audio/@TELEPHONY_DRIVER@
- $(AM_V_GEN)$(LN_S) $(abs_top_srcdir)/$< $@
+ $(AM_V_GEN)$(LN_S) $(abs_top_builddir)/$< $@

sap/sap.c: sap/@SAP_DRIVER@
$(AM_V_GEN)$(LN_S) $(abs_top_srcdir)/$< $@
@@ -492,7 +492,7 @@ $(lib_libbluetooth_la_OBJECTS): $(local_headers)

lib/bluetooth/%.h: lib/%.h
$(AM_V_at)$(MKDIR_P) lib/bluetooth
- $(AM_V_GEN)$(LN_S) $(abs_top_srcdir)/$< $@
+ $(AM_V_GEN)$(LN_S) $(abs_top_builddir)/$< $@

clean-local:
$(RM) -r lib/bluetooth
--
1.7.5.4