Skip to contentSkip to conversation

Makefile.am fixes

PATCH In review Marcel Mol 2 participants 3 messages Aug 20, 2010 – Aug 21, 2010

Subsystems (2)
lore
Share & tools
lore

Marcel Mol

author
#0 lore raw

PATCH 1/1 Makefile.am fixes

phonebook.h should not be under _nodist. vcard.[ch] is not related to pbap, but to phonebook backend

---
 Makefile.am |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Makefile.am +3 -3
index 07fc27d..fdc4f7e 100644
@@ -52,8 +52,7 @@ builtin_modules += ftp
 builtin_sources += plugins/ftp.c
 
 builtin_modules += pbap
-builtin_sources += plugins/pbap.c plugins/phonebook.h \
-			plugins/vcard.h plugins/vcard.c
+builtin_sources += plugins/pbap.c
 
 builtin_modules += irmc
 builtin_sources += plugins/irmc.c
@@ -61,6 +60,8 @@ builtin_sources += plugins/irmc.c
 builtin_modules += syncevolution
 builtin_sources += plugins/syncevolution.c
 
+builtin_sources += plugins/phonebook.h plugins/vcard.h plugins/vcard.c
+
 builtin_nodist += plugins/phonebook.c
 
 libexec_PROGRAMS += src/obexd
@@ -99,7 +100,6 @@ src/plugin.$(OBJEXT): src/builtin.h
 
 src/builtin.h: src/genbuiltin $(builtin_sources)
 	$(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@
-
 endif
 
 if CLIENT
Signature · 1 line
1.7.2.1
maintainer
#1 lore raw

Hi Marcel,

Quoted 1 line

phonebook.h should not be under _nodist.

yes it should. It is auto-generated.

Quoted 4 lines

vcard.[ch] is not related to pbap, but to phonebook backend

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

Did you verify that "fakeroot make distcheck" still works properly after your changes?

Regards

Marcel

#2 lore raw
Quoted 5 lines · Marcel Holtmann

Hi Marcel,

Quoted 1 line

phonebook.h should not be under _nodist.

yes it should. It is auto-generated.

Hm, I don't think phonebook.h is generated, phonebook.c more or less is.... But anyway, this part of the change message is bogus. Phonebook.h was not part of builtin_nodist.
Sorry about that. I'll resend the patch without this sentence.

Quoted 7 lines
Quoted 4 lines

vcard.[ch] is not related to pbap, but to phonebook backend

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

Did you verify that "fakeroot make distcheck" still works properly after your changes?

This fails with an error message about builtin.h. But the same error happens without the Makefile.am patch.
(probably because distcheck builds in a separate builddir apart from the actual source tree and builtin.h is generated in the builddir tree)

Thanks,

-Marcel

Signature · 6 lines
     ======--------         Marcel J.E. Mol                MESA Consulting B.V.
    =======---------        ph. +31-(0)6-54724868          P.O. Box 112
    =======---------        [email protected]                 2630 AC  Nootdorp
__==== www.mesa.nl ---____U_n_i_x______I_n_t_e_r_n_e_t____ The Netherlands ____
 They couldn't think of a number,           Linux user 1148  --  counter.li.org
    so they gave me a name!  -- Rupert Hine  --  www.ruperthine.com