5:20 a.m.
Hi,
I noticed there are some problems building with VPATH (if builddir and
srcdir are different from each other). E.g., make checkdist worked only
by accident. The following patches are supposed to fix the problems.
--Pekka
5:20 a.m.
New subject: [VPATH PATCH 1/2] Fix generating links in Makefile.am
From: Pekka Pessi <Pekka.Pessi(a)nokia.com>
In case relative dependency is in $(srcdir), $< already includes path to
$(srcdir).
---
Makefile.am | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 5019b7d..832c8ac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -666,9 +666,9 @@ include/ofono/version.h: include/version.h
$(AM_V_at)$(MKDIR_P) include/ofono
$(AM_V_GEN)$(LN_S) $(abs_top_builddir)/$< $@
-include/ofono/%.h: include/%.h
+include/ofono/%.h: $(abs_top_srcdir)/include/%.h
$(AM_V_at)$(MKDIR_P) include/ofono
- $(AM_V_GEN)$(LN_S) $(abs_top_srcdir)/$< $@
+ $(AM_V_GEN)$(LN_S) $< $@
clean-local:
@$(RM) -rf include/ofono
--
1.7.4.1
5:20 a.m.
New subject: [VPATH PATCH 2/2] Fix $(INCLUDE) in Makefile.am
From: Pekka Pessi <Pekka.Pessi(a)nokia.com>
Allow using directory names as namespaces.
---
Makefile.am | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 832c8ac..92ef72e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -447,7 +447,8 @@ AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@ @USB_CFLAGS@ \
-DOFONO_PLUGIN_BUILTIN \
-DPLUGINDIR=\""$(build_plugindir)"\"
-INCLUDES = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/src \
+INCLUDES = -I$(builddir) -I$(srcdir) -I$(builddir)/include \
+ -I$(builddir)/src -I$(srcdir)/src \
-I$(srcdir)/gdbus -I$(srcdir)/gisi -I$(srcdir)/gatchat \
-I$(srcdir)/btio
--
1.7.4.1
11:39 a.m.
New subject: [VPATH PATCH 2/2] Fix $(INCLUDE) in Makefile.am
Hi Pekka,
Allow using directory names as namespaces.
---
Makefile.am | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 832c8ac..92ef72e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -447,7 +447,8 @@ AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@ @USB_CFLAGS@
\
-DOFONO_PLUGIN_BUILTIN \
-DPLUGINDIR=\""$(build_plugindir)"\"
-INCLUDES = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/src \
+INCLUDES = -I$(builddir) -I$(srcdir) -I$(builddir)/include \
+ -I$(builddir)/src -I$(srcdir)/src \
-I$(srcdir)/gdbus -I$(srcdir)/gisi -I$(srcdir)/gatchat \
-I$(srcdir)/btio
what problem is this patch fixing?
Regards
Marcel
11:36 a.m.
New subject: [VPATH PATCH 1/2] Fix generating links in Makefile.am
Hi Pekka,
In case relative dependency is in $(srcdir), $< already includes
path to
$(srcdir).
---
Makefile.am | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
patch has been applied. Thanks.
Regards
Marcel
3199
days inactive
3200
days old
5 comments
3 participants
participants (3)
-
Marcel Holtmann -
Pekka Pessi -
Pekka.Pessi＠nokia.com