[evolution-ews] build: Fix srcdir != builddir from git
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-ews] build: Fix srcdir != builddir from git
- Date: Fri, 19 Apr 2013 09:06:58 +0000 (UTC)
commit 1fbf23d84a4859b289b6fc9547d1e9810bdeb64b
Author: Colin Walters <walters verbum org>
Date: Fri Apr 19 11:06:23 2013 +0200
build: Fix srcdir != builddir from git
We can't do (cd $(srcdir); ...) and inside reference $(top_srcdir)
because that variable uses a *relative* path. Thus we copy the
approach from gnome-shell of explicitly using addprefix to append the
source directory.
src/camel/Makefile.am | 8 ++++----
src/server/Makefile.am | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/src/camel/Makefile.am b/src/camel/Makefile.am
index 7d16f83..18bf995 100644
--- a/src/camel/Makefile.am
+++ b/src/camel/Makefile.am
@@ -6,15 +6,15 @@ camel_provider_DATA = libcamelews.urls
ENUM_TYPES = camel-ews-enums.h
camel-ews-enumtypes.h: $(top_srcdir)/enumtypes.h.template $(ENUM_TYPES)
- $(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template $(top_srcdir)/enumtypes.h.template \
+ $(AM_V_GEN) $(GLIB_MKENUMS) --template $(top_srcdir)/enumtypes.h.template \
--fhead "#ifndef CAMEL_EWS_ENUMTYPES_H\n#define CAMEL_EWS_ENUMTYPES_H\n" \
--ftail "#endif /* CAMEL_EWS_ENUMTYPES_H */\n" \
- $(ENUM_TYPES)) > $@
+ $(addprefix $(srcdir)/,$(ENUM_TYPES)) > $@
camel-ews-enumtypes.c: $(top_srcdir)/enumtypes.h.template $(ENUM_TYPES)
- $(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template $(top_srcdir)/enumtypes.c.template \
+ $(AM_V_GEN) $(GLIB_MKENUMS) --template $(top_srcdir)/enumtypes.c.template \
--fhead "#include \"camel-ews-enumtypes.h\"" \
- $(ENUM_TYPES)) > $@
+ $(addprefix $(srcdir)/,$(ENUM_TYPES)) > $@
ENUM_GENERATED = \
camel-ews-enumtypes.h \
diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 4bfaec2..e50ad41 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -7,15 +7,15 @@ privlib_LTLIBRARIES = libeews-1.2.la
ENUM_TYPES = e-ews-enums.h
e-ews-enumtypes.h: $(top_srcdir)/enumtypes.h.template $(ENUM_TYPES)
- $(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template $(top_srcdir)/enumtypes.h.template \
+ $(AM_V_GEN) $(GLIB_MKENUMS) --template $(top_srcdir)/enumtypes.h.template \
--fhead "#ifndef E_EWS_ENUMTYPES_H\n#define E_EWS_ENUMTYPES_H\n" \
--ftail "#endif /* E_EWS_ENUMTYPES_H */\n" \
- $(ENUM_TYPES)) > $@
+ $(addprefix $(srcdir)/,$(ENUM_TYPES)) > $@
e-ews-enumtypes.c: $(top_srcdir)/enumtypes.h.template $(ENUM_TYPES)
- $(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template $(top_srcdir)/enumtypes.c.template \
+ $(AM_V_GEN) $(GLIB_MKENUMS) --template $(top_srcdir)/enumtypes.c.template \
--fhead "#include \"e-ews-enumtypes.h\"" \
- $(ENUM_TYPES)) > $@
+ $(addprefix $(srcdir)/,$(ENUM_TYPES)) > $@
ENUM_GENERATED = \
e-ews-enumtypes.h \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]