All of lore.kernel.org
 help / color / mirror / Atom feed
* Fix out-of-source build breakage
@ 2011-12-28  9:53 yegorslists
  2011-12-28  9:53 ` [PATCH 1/2] fix link creation for out-of-source builds yegorslists
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: yegorslists @ 2011-12-28  9:53 UTC (permalink / raw)
  To: linux-bluetooth; +Cc: 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

Yegor

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [PATCH 1/2] fix link creation for out-of-source builds
  2011-12-28  9:53 Fix out-of-source build breakage yegorslists
@ 2011-12-28  9:53 ` yegorslists
  2011-12-28  9:53 ` [PATCH 2/2] add tools to include folder list yegorslists
  2011-12-28 17:41 ` Fix out-of-source build breakage Marcel Holtmann
  2 siblings, 0 replies; 5+ messages in thread
From: yegorslists @ 2011-12-28  9:53 UTC (permalink / raw)
  To: linux-bluetooth; +Cc: marcel, Yegor Yefremov

From: Yegor Yefremov <yegorslists@googlemail.com>

---
 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

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH 2/2] add tools to include folder list
  2011-12-28  9:53 Fix out-of-source build breakage yegorslists
  2011-12-28  9:53 ` [PATCH 1/2] fix link creation for out-of-source builds yegorslists
@ 2011-12-28  9:53 ` yegorslists
  2011-12-28 17:41 ` Fix out-of-source build breakage Marcel Holtmann
  2 siblings, 0 replies; 5+ messages in thread
From: yegorslists @ 2011-12-28  9:53 UTC (permalink / raw)
  To: linux-bluetooth; +Cc: marcel, Yegor Yefremov

From: Yegor Yefremov <yegorslists@googlemail.com>

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

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: Fix out-of-source build breakage
  2011-12-28  9:53 Fix out-of-source build breakage yegorslists
  2011-12-28  9:53 ` [PATCH 1/2] fix link creation for out-of-source builds yegorslists
  2011-12-28  9:53 ` [PATCH 2/2] add tools to include folder list yegorslists
@ 2011-12-28 17:41 ` Marcel Holtmann
  2011-12-29  8:10   ` Yegor Yefremov
  2 siblings, 1 reply; 5+ messages in thread
From: Marcel Holtmann @ 2011-12-28 17:41 UTC (permalink / raw)
  To: yegorslists; +Cc: linux-bluetooth

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



^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: Fix out-of-source build breakage
  2011-12-28 17:41 ` Fix out-of-source build breakage Marcel Holtmann
@ 2011-12-29  8:10   ` Yegor Yefremov
  0 siblings, 0 replies; 5+ messages in thread
From: Yegor Yefremov @ 2011-12-29  8:10 UTC (permalink / raw)
  To: Marcel Holtmann; +Cc: linux-bluetooth

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

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-12-29  8:10 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-28  9:53 Fix out-of-source build breakage yegorslists
2011-12-28  9:53 ` [PATCH 1/2] fix link creation for out-of-source builds yegorslists
2011-12-28  9:53 ` [PATCH 2/2] add tools to include folder list yegorslists
2011-12-28 17:41 ` Fix out-of-source build breakage Marcel Holtmann
2011-12-29  8:10   ` Yegor Yefremov

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.