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.

diff --git a/addressbook/libebook-contacts/Makefile.am b/addressbook/libebook-contacts/Makefile.am
index ab1e3c2..23144d5 100644 (file)
--- 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 5bba184..9fe5ef4 100644 (file)
--- 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 04f70e7..009e149 100644 (file)
--- 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 395c92c..68a2a17 100644 (file)
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -32,15 +32,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 (file)
--- 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 c601a50..0dc50c4 100644 (file)
--- 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