Re: [PATCH BlueZ] build: Fix out-of-tree builds

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Anderson,

> This commit makes a few changes that mostly affect "out-of-tree" builds:
> 
> * Fix symlink creation for profiles/sap/sap.c (should use build
>   directory, not source tree).
> * Remove useless -I$(builddir)/{tools,health} directives (these
>   build directories do not contain any headers).
> * Add -I$(srcdir)/profiles/sap (necessary because sap.c is a symlink
>   into the build directory, and refers to headers in the source tree).
> 
> Tested with:
> 
> ./bootstrap
> mkdir build
> cd build
> ../configure [...]
> ---
>  Makefile.am |    8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index c27eb01..257c18a 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -405,10 +405,10 @@ AM_CFLAGS += @DBUS_CFLAGS@ @GLIB_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)/tools \
> -			-I$(builddir)/tools -I$(srcdir)/monitor
> +			-I$(srcdir)/monitor
>  
> -if MCAP
> -INCLUDES += -I$(builddir)/health
> +if SAPPLUGIN
> +INCLUDES += -I$(srcdir)/profiles/sap
>  endif
>  
>  unit_objects =
> @@ -447,7 +447,7 @@ audio/telephony.c: audio/@TELEPHONY_DRIVER@
>  	$(AM_V_GEN)$(LN_S) $(abs_top_builddir)/$< $@
>  
>  profiles/sap/sap.c: profiles/sap/@SAP_DRIVER@
> -	$(AM_V_GEN)$(LN_S) $(abs_top_srcdir)/$< $@
> +	$(AM_V_GEN)$(LN_S) $(abs_top_builddir)/$< $@
>  
>  profiles/input/suspend.c: profiles/input/@HOG_SUSPEND_DRIVER@
>  	$(AM_V_GEN)$(LN_S) $(abs_top_srcdir)/$< $@

personally I am no longer a big fan of these selection of a specific
driver. We should be able to build all of them and make the selection at
runtime. So there is more work needed here.

Regards

Marcel


--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Bluez Devel]     [Linux Wireless Networking]     [Linux Wireless Personal Area Networking]     [Linux ATH6KL]     [Linux USB Devel]     [Linux Media Drivers]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux