[PATCH 1/2] list api docs alphabetically and one per line in EXTRA_DIST

[PATCH 1/2] list api docs alphabetically and one per line in EXTRA_DIST

[Uwe Kleine-König]

This makes further changes to the list easier to review

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 Makefile.am |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 65d4312..4bb82fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -309,11 +309,18 @@ udevdir = $(libexecdir)/udev
 dist_udev_SCRIPTS = scripts/bluetooth_serial
 endif
 
-EXTRA_DIST += doc/manager-api.txt \
-		doc/adapter-api.txt doc/device-api.txt \
-		doc/service-api.txt doc/agent-api.txt doc/attribute-api.txt \
-		doc/serial-api.txt doc/network-api.txt \
-		doc/input-api.txt doc/audio-api.txt doc/control-api.txt
+EXTRA_DIST += \
+	      doc/adapter-api.txt \
+	      doc/agent-api.txt \
+	      doc/attribute-api.txt \
+	      doc/audio-api.txt \
+	      doc/control-api.txt \
+	      doc/device-api.txt \
+	      doc/input-api.txt \
+	      doc/manager-api.txt \
+	      doc/network-api.txt \
+	      doc/serial-api.txt \
+	      doc/service-api.txt \
 
 AM_YFLAGS = -d
 
-- 
1.7.1

[PATCH 2/2] add three missing api documents to EXTRA_DIST

[Uwe Kleine-König]

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
Hello,

there are still a few files in bluez.git/doc that are not listed in EXTRA_DIST:

 - bluez-docs.xml
 - gtk-doc.make
 - version.xml.in

I didn't know if I should add these, too, so I just point that out.

Best regards
Uwe

 Makefile.am |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 4bb82fe..7007026 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -316,9 +316,12 @@ EXTRA_DIST += \
 	      doc/audio-api.txt \
 	      doc/control-api.txt \
 	      doc/device-api.txt \
+	      doc/health-api.txt \
+	      doc/hfp-api.txt \
 	      doc/input-api.txt \
 	      doc/manager-api.txt \
 	      doc/network-api.txt \
+	      doc/node-api.txt \
 	      doc/serial-api.txt \
 	      doc/service-api.txt \
 
-- 
1.7.1

Re: [PATCH 1/2] list api docs alphabetically and one per line in EXTRA_DIST

[Marcel Holtmann]

Hi Uwe,

> This makes further changes to the list easier to review
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
>  Makefile.am |   17 ++++++++++++-----
>  1 files changed, 12 insertions(+), 5 deletions(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index 65d4312..4bb82fe 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -309,11 +309,18 @@ udevdir = $(libexecdir)/udev
>  dist_udev_SCRIPTS = scripts/bluetooth_serial
>  endif
>  
> -EXTRA_DIST += doc/manager-api.txt \
> -		doc/adapter-api.txt doc/device-api.txt \
> -		doc/service-api.txt doc/agent-api.txt doc/attribute-api.txt \
> -		doc/serial-api.txt doc/network-api.txt \
> -		doc/input-api.txt doc/audio-api.txt doc/control-api.txt
> +EXTRA_DIST += \
> +	      doc/adapter-api.txt \
> +	      doc/agent-api.txt \
> +	      doc/attribute-api.txt \
> +	      doc/audio-api.txt \
> +	      doc/control-api.txt \
> +	      doc/device-api.txt \
> +	      doc/input-api.txt \
> +	      doc/manager-api.txt \
> +	      doc/network-api.txt \
> +	      doc/serial-api.txt \
> +	      doc/service-api.txt \

I prefer actually to not to do this and keep them in a bit more logical
order. The manager is the initial one, followed by adapter etc.

Regards

Marcel

Re: [PATCH 2/2] add three missing api documents to EXTRA_DIST

[Marcel Holtmann]

Hi Uwe,

> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
> Hello,
> 
> there are still a few files in bluez.git/doc that are not listed in EXTRA_DIST:
> 
>  - bluez-docs.xml
>  - gtk-doc.make
>  - version.xml.in

they are not suppose to be there. They are leftovers and might be should
removed since we don't really do gtk-doc generation anymore.

> I didn't know if I should add these, too, so I just point that out.
> 
> Best regards
> Uwe
> 
>  Makefile.am |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index 4bb82fe..7007026 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -316,9 +316,12 @@ EXTRA_DIST += \
>  	      doc/audio-api.txt \
>  	      doc/control-api.txt \
>  	      doc/device-api.txt \
> +	      doc/health-api.txt \
> +	      doc/hfp-api.txt \
>  	      doc/input-api.txt \
>  	      doc/manager-api.txt \
>  	      doc/network-api.txt \
> +	      doc/node-api.txt \
>  	      doc/serial-api.txt \
>  	      doc/service-api.txt \

please send a patch that just adds hfp-api.txt to EXTRA_DIST.

The node-api.txt has never been implemented and might become obsolete
soon. So that should not be in the distribution.

The health-api.txt will come soon, but until we merged the code for it,
I prefer not adding it into the distribution.

Regards

Marcel

[PATCH] Add hfp-api.txt to EXTRA_DIST

[Uwe Kleine-König]

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 Makefile.am |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index aa95ed7..83a90c9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -332,7 +332,8 @@ EXTRA_DIST += doc/manager-api.txt \
 		doc/adapter-api.txt doc/device-api.txt \
 		doc/service-api.txt doc/agent-api.txt doc/attribute-api.txt \
 		doc/serial-api.txt doc/network-api.txt \
-		doc/input-api.txt doc/audio-api.txt doc/control-api.txt
+		doc/input-api.txt doc/audio-api.txt doc/control-api.txt \
+		doc/hfp-api.txt
 
 AM_YFLAGS = -d
 
-- 
1.7.1

Re: [PATCH] Add hfp-api.txt to EXTRA_DIST

[Marcel Holtmann]

Hi Uwe,

> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
>  Makefile.am |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)

patch has been applied, but in the future stop using signed-off-by
lines. We are not using them. That is more for kernel patches.

Regards

Marcel