[PATCH] Mark ofono/*.h symbolink links as built sources

[PATCH] Mark ofono/*.h symbolink links as built sources

[=?unknown-8bit?q?R=C3=A9mi?= Denis-Courmont]

[-- Attachment #1: Type: text/plain, Size: 1175 bytes --]

This forces automake/make to build them first if needed (as before).
But it avoids marking every single header as a dependency of every
single object. Thus we do not need a bogus full rebuild of the tree
everytime a header is added.
---
 Makefile.am |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a4c47e8..ee7949d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -326,7 +326,8 @@ src_ofonod_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ @CAPNG_LIBS@ -ldl
 src_ofonod_LDFLAGS = -Wl,--export-dynamic \
 				-Wl,--version-script=$(srcdir)/src/ofono.ver
 
-CLEANFILES = src/builtin.h $(local_headers) $(rules_DATA)
+BUILT_SOURCES = $(local_headers)
+CLEANFILES = src/builtin.h $(BUILT_SOURCES) $(rules_DATA)
 
 plugindir = $(libdir)/ofono/plugins
 
@@ -512,8 +513,6 @@ src/builtin.h: src/genbuiltin $(builtin_sources)
 plugins/%.rules:
 	$(AM_V_GEN)cp $(srcdir)/$(subst 97-,,$@) $@
 
-$(src_ofonod_OBJECTS) $(unit_objects): $(local_headers)
-
 include/ofono/version.h: include/version.h
 	$(AM_V_at)$(MKDIR_P) include/ofono
 	$(AM_V_GEN)$(LN_S) $(abs_top_builddir)/$< $@
-- 
1.7.1

Re: [PATCH] Mark ofono/*.h symbolink links as built sources

[Marcel Holtmann]

[-- Attachment #1: Type: text/plain, Size: 399 bytes --]

Hi Remi,

> This forces automake/make to build them first if needed (as before).
> But it avoids marking every single header as a dependency of every
> single object. Thus we do not need a bogus full rebuild of the tree
> everytime a header is added.

I had this before, but it caused problems with make distcheck. So you
have double checked that this still works?

Regards

Marcel

Re: [PATCH] Mark ofono/*.h symbolink links as built sources

[=?unknown-8bit?q?R=C3=A9mi?= Denis-Courmont]

[-- Attachment #1: Type: text/plain, Size: 714 bytes --]

On Monday 29 November 2010 11:18:15 ext Marcel Holtmann, you wrote:
> Hi Remi,
> 
> > This forces automake/make to build them first if needed (as before).
> > But it avoids marking every single header as a dependency of every
> > single object. Thus we do not need a bogus full rebuild of the tree
> > everytime a header is added.
> 
> I had this before, but it caused problems with make distcheck. So you
> have double checked that this still works?

Yes, I get that:

============================================
ofono-0.36 archives ready for distribution: 
ofono-0.36.tar.gz
============================================

-- 
Rémi Denis-Courmont
Nokia Devices R&D, Maemo Software, Helsinki

[PATCH] Mark ofono/*.h symbolink links as built sources

[=?unknown-8bit?q?R=C3=A9mi?= Denis-Courmont]

[-- Attachment #1: Type: text/plain, Size: 1179 bytes --]

This forces automake/make to build them first if needed (as before).
But it avoids marking every single header as a dependency of every
single object. Thus we do not need a bogus full rebuild of the tree
everytime a header is added.
---
 Makefile.am |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a4c47e8..cdb3166 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -326,7 +326,9 @@ src_ofonod_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ @CAPNG_LIBS@ -ldl
 src_ofonod_LDFLAGS = -Wl,--export-dynamic \
 				-Wl,--version-script=$(srcdir)/src/ofono.ver
 
-CLEANFILES = src/builtin.h $(local_headers) $(rules_DATA)
+BUILT_SOURCES = $(local_headers)
+
+CLEANFILES = src/builtin.h $(BUILT_SOURCES) $(rules_DATA)
 
 plugindir = $(libdir)/ofono/plugins
 
@@ -512,8 +514,6 @@ src/builtin.h: src/genbuiltin $(builtin_sources)
 plugins/%.rules:
 	$(AM_V_GEN)cp $(srcdir)/$(subst 97-,,$@) $@
 
-$(src_ofonod_OBJECTS) $(unit_objects): $(local_headers)
-
 include/ofono/version.h: include/version.h
 	$(AM_V_at)$(MKDIR_P) include/ofono
 	$(AM_V_GEN)$(LN_S) $(abs_top_builddir)/$< $@
-- 
1.7.1

Re: [PATCH] Mark ofono/*.h symbolink links as built sources

[Marcel Holtmann]

[-- Attachment #1: Type: text/plain, Size: 407 bytes --]

Hi Remi,

> This forces automake/make to build them first if needed (as before).
> But it avoids marking every single header as a dependency of every
> single object. Thus we do not need a bogus full rebuild of the tree
> everytime a header is added.
> ---
>  Makefile.am |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)

patch has been applied. Thanks.

Regards

Marcel