Fix some compilation errors that occur when building in a remote object

2008-02-06  Matthew Barnes  <mbarnes@redhat.com>

	* configure.in:
	* marshal.mk:
	* camel/Makefile.am:
	* servers/exchange/lib/Makefile.am:
	* servers/exchange/storage/Makefile.am:
	Fix some compilation errors that occur when building in a
	remote object directory (#514682, patch by Paul Smith).

svn path=/trunk/; revision=8463

diff --git a/ChangeLog b/ChangeLog
index 6494a83..838478c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-06  Matthew Barnes  <mbarnes@redhat.com>
+
+       * configure.in:
+       * marshal.mk:
+       Fix a compilation error that occurs when building in a
+       remote object directory (#514682, patch by Paul Smith).
+
 2008-02-06  Tor Lillqvist  <tml@novell.com>
 
        * evolution-data-server-zip.in: Look for catalogs in share/locale

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 2758b86..c6c9f84 100644 (file)
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-06  Matthew Barnes  <mbarnes@redhat.com>
+
+       * Makefile.am:
+       Fix a compilation error that occurs when building in a
+       remote object directory (#514682, patch by Paul Smith).
+
 2008-02-04  Milan Crha  <mcrha@redhat.com>
 
        ** Fix for bug #513389

diff --git a/camel/Makefile.am b/camel/Makefile.am
index 1833b09..b047532 100644 (file)
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -311,8 +311,8 @@ camel_index_control_1_2_LDADD =                     \
        libcamel-1.2.la                         \
        $(libcamel_1_2_la_LIBADD)
 
-camel-mime-tables.c: gentables.pl
-       perl gentables.pl > $@
+camel-mime-tables.c: $(srcdir)/gentables.pl
+       perl $(srcdir)/gentables.pl > $@
 
 install-exec-hook:
        @if test -n "$(CAMEL_LOCK_HELPER_USER)"; then \

diff --git a/configure.in b/configure.in
index c9b2b21..7fd9e43 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -253,7 +253,7 @@ if test "x${dynamic_libdb}" = "xyes"; then
 
         msg_libdb="dynamically linked"
 else
-        DB_CFLAGS="-I\$(top_srcdir)/libdb/dist"
+        DB_CFLAGS="-I\$(top_builddir)/libdb/dist"
         DB_LIBS="\$(top_builddir)/libdb/dist/libdb-4.1.la"
         AC_MSG_NOTICE(Using local libdb)
         msg_libdb="statically linked to local copy"

diff --git a/marshal.mk b/marshal.mk
index 91fac93..5aa50f8 100644 (file)
--- a/marshal.mk
+++ b/marshal.mk
@@ -1,7 +1,7 @@
 %.h: %.list
-       ( $(GLIB_GENMARSHAL) --prefix=$(subst -,_,$*) $(srcdir)/$< --header > $@.tmp \
+       ( $(GLIB_GENMARSHAL) --prefix=$(subst -,_,$*) $< --header > $@.tmp \
        && mv $@.tmp $@ ) || ( rm -f $@.tmp && exit 1 )
 
 %.c: %.list %.h
-       ( (echo "#include \"$*.h\""; $(GLIB_GENMARSHAL) --prefix=$(subst -,_,$*) $(srcdir)/$*.list --body) > $@.tmp \
+       ( (echo "#include \"$*.h\""; $(GLIB_GENMARSHAL) --prefix=$(subst -,_,$*) $< --body) > $@.tmp \
        && mv $@.tmp $@ ) || ( rm -f $@.tmp && exit 1 )

diff --git a/servers/exchange/ChangeLog b/servers/exchange/ChangeLog
index 20a57a0..3ad1682 100644 (file)
--- a/servers/exchange/ChangeLog
+++ b/servers/exchange/ChangeLog
@@ -1,3 +1,12 @@
+2008-02-06  Matthew Barnes  <mbarnes@redhat.com>
+
+       ** Fixes part of bug #514682
+
+       * lib/Makefile.am:
+       * storage/Makefile.am:
+       Fix a compilation error that occurs when building in a
+       remote object directory (#514682, patch by Paul Smith).
+
 2008-02-04  Dan Winship  <danw@gnome.org>
 
        * lib/e2k-context.c (session_authenticate): Only authenticate the

diff --git a/servers/exchange/lib/Makefile.am b/servers/exchange/lib/Makefile.am
index 7ef6a70..9338bad 100644 (file)
--- a/servers/exchange/lib/Makefile.am
+++ b/servers/exchange/lib/Makefile.am
@@ -15,7 +15,7 @@ noinst_LTLIBRARIES =                                          \
 
 PROP_GENERATED = e2k-propnames.h e2k-propnames.c e2k-proptags.h
 
-mapi_properties    = mapi-properties
+mapi_properties    = $(srcdir)/mapi-properties
 e2k_propnames_h_in = $(srcdir)/e2k-propnames.h.in 
 e2k_propnames_c_in = $(srcdir)/e2k-propnames.c.in 
 e2k_proptags_h_in  = $(srcdir)/e2k-proptags.h.in 

diff --git a/servers/exchange/storage/Makefile.am b/servers/exchange/storage/Makefile.am
index 3c32990..19fcf6d 100644 (file)
--- a/servers/exchange/storage/Makefile.am
+++ b/servers/exchange/storage/Makefile.am
@@ -18,6 +18,7 @@ INCLUDES =                                                    \
        $(SOUP_CFLAGS)                                          \
        $(E_DATA_SERVER_CFLAGS)                                 \
        $(E_DATA_SERVER_UI_CFLAGS)                              \
+       -I$(top_builddir)/servers/exchange/lib                  \
        -I$(top_srcdir)                                         \
        -I$(top_srcdir)/servers/exchange/lib                    \
        -I$(top_srcdir)/servers/exchange/xntlm