[evolution-data-server/gnome-3-8] build: Fix srcdir != builddir from git

From: Matthew Barnes <mbarnes src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-data-server/gnome-3-8] build: Fix srcdir != builddir from git
Date: Thu, 18 Apr 2013 15:37:21 +0000 (UTC)
commit e65e6aa1cad8b495bdccf9620f4b3416cefc258f
Author: Colin Walters <walters verbum org>
Date:   Fri Apr 12 09:23:53 2013 -0400

    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.
    
    (cherry picked from commit fb9b02e43251b7f4004eb41791f0a3553eeb2b4c)

 addressbook/libebook-contacts/Makefile.am | 8 ++++----
 addressbook/libebook/Makefile.am          | 8 ++++----
 calendar/libecal/Makefile.am              | 8 ++++----
 camel/Makefile.am                         | 8 ++++----
 libebackend/Makefile.am                   | 8 ++++----
 libedataserver/Makefile.am                | 8 ++++----
 6 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/addressbook/libebook-contacts/Makefile.am b/addressbook/libebook-contacts/Makefile.am
index dcb5af1..58afc88 100644
--- a/addressbook/libebook-contacts/Makefile.am
+++ b/addressbook/libebook-contacts/Makefile.am
@@ -4,15 +4,15 @@ BUILT_SOURCES=
 ENUM_TYPES = e-book-contacts-types.h
 
 e-book-contacts-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_BOOK_CONTACTS_ENUMTYPES_H\n#define E_BOOK_CONTACTS_ENUMTYPES_H\n" \
                --ftail "#endif /* E_BOOK_CONTACTS_ENUMTYPES_H */\n" \
-               $(ENUM_TYPES)) > $@
+               $(addprefix $(srcdir)/,$(ENUM_TYPES)) > $@
 
 e-book-contacts-enumtypes.c: $(top_srcdir)/enumtypes.c.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-book-contacts-enumtypes.h\"" \
-               $(ENUM_TYPES)) > $@
+               $(addprefix $(srcdir)/,$(ENUM_TYPES)) > $@
 
 ENUM_GENERATED = e-book-contacts-enumtypes.h e-book-contacts-enumtypes.c
 
diff --git a/addressbook/libebook/Makefile.am b/addressbook/libebook/Makefile.am
index 3de6721c..817caca 100644
--- a/addressbook/libebook/Makefile.am
+++ b/addressbook/libebook/Makefile.am
@@ -4,15 +4,15 @@ BUILT_SOURCES=
 ENUM_TYPES = e-book-types.h
 
 e-book-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_BOOK_ENUMTYPES_H\n#define E_BOOK_ENUMTYPES_H\n" \
                --ftail "#endif /* E_BOOK_ENUMTYPES_H */\n" \
-               $(ENUM_TYPES)) > $@
+               $(addprefix $(srcdir)/,$(ENUM_TYPES)) > $@
 
 e-book-enumtypes.c: $(top_srcdir)/enumtypes.c.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-book-enumtypes.h\"" \
-               $(ENUM_TYPES)) > $@
+               $(addprefix $(srcdir)/,$(ENUM_TYPES)) > $@
 
 ENUM_GENERATED = e-book-enumtypes.h e-book-enumtypes.c
 
diff --git a/calendar/libecal/Makefile.am b/calendar/libecal/Makefile.am
index 6060d21..9705d3b 100644
--- a/calendar/libecal/Makefile.am
+++ b/calendar/libecal/Makefile.am
@@ -1,15 +1,15 @@
 ENUM_TYPES = e-cal-types.h
 
 e-cal-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_CAL_ENUMTYPES_H\n#define E_CAL_ENUMTYPES_H\n" \
                --ftail "#endif /* E_CAL_ENUMTYPES_H */\n" \
-               $(ENUM_TYPES)) > $@
+               $(addprefix $(srcdir)/,$(ENUM_TYPES)) > $@
 
 e-cal-enumtypes.c: $(top_srcdir)/enumtypes.c.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-cal-enumtypes.h\"" \
-               $(ENUM_TYPES)) > $@
+               $(addprefix $(srcdir)/,$(ENUM_TYPES)) > $@
 
 ENUM_GENERATED = e-cal-enumtypes.h e-cal-enumtypes.c
 
diff --git a/camel/Makefile.am b/camel/Makefile.am
index 6645e0c..c8e00d0 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -35,15 +35,15 @@ lib_LTLIBRARIES = libcamel-1.2.la
 ENUM_TYPES = camel-enums.h
 
 camel-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_ENUMTYPES_H\n#define CAMEL_ENUMTYPES_H\n" \
                --ftail "#endif /* CAMEL_ENUMTYPES_H */\n" \
-               $(ENUM_TYPES)) > $@
+               $(addprefix $(srcdir)/,$(ENUM_TYPES)) > $@
 
 camel-enumtypes.c: $(top_srcdir)/enumtypes.c.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-enumtypes.h\"" \
-               $(ENUM_TYPES)) > $@
+               $(addprefix $(srcdir)/,$(ENUM_TYPES)) > $@
 
 ENUM_GENERATED = camel-enumtypes.h camel-enumtypes.c camel-imapx-tokenise.h
 
diff --git a/libebackend/Makefile.am b/libebackend/Makefile.am
index dac8a82..c77b470 100644
--- a/libebackend/Makefile.am
+++ b/libebackend/Makefile.am
@@ -1,15 +1,15 @@
 ENUM_TYPES = e-backend-enums.h
 
 e-backend-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_BACKEND_ENUMTYPES_H\n#define E_BACKEND_ENUMTYPES_H\n" \
                --ftail "#endif /* E_BACKEND_ENUMTYPES_H */\n" \
-               $(ENUM_TYPES)) > $@
+               $(addprefix $(srcdir)/,$(ENUM_TYPES)) > $@
 
 e-backend-enumtypes.c: $(top_srcdir)/enumtypes.c.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-backend-enumtypes.h\"" \
-               $(ENUM_TYPES)) > $@
+               $(addprefix $(srcdir)/,$(ENUM_TYPES)) > $@
 
 ENUM_GENERATED = e-backend-enumtypes.h e-backend-enumtypes.c
 
diff --git a/libedataserver/Makefile.am b/libedataserver/Makefile.am
index bbb276b..cfa2882 100644
--- a/libedataserver/Makefile.am
+++ b/libedataserver/Makefile.am
@@ -1,15 +1,15 @@
 ENUM_TYPES = e-source-enums.h
 
 e-source-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_SOURCE_ENUMTYPES_H\n#define E_SOURCE_ENUMTYPES_H\n" \
                --ftail "#endif /* E_SOURCE_ENUMTYPES_H */\n" \
-               $(ENUM_TYPES)) > $@
+               $(addprefix $(srcdir)/,$(ENUM_TYPES)) > $@
 
 e-source-enumtypes.c: $(top_srcdir)/enumtypes.c.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-source-enumtypes.h\"" \
-               $(ENUM_TYPES)) > $@
+               $(addprefix $(srcdir)/,$(ENUM_TYPES)) > $@
 
 ENUM_GENERATED = e-source-enumtypes.h e-source-enumtypes.c
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]