evolution-data-server r8463 - in trunk: . camel servers/exchange servers/exchange/lib servers/exchange/storage
- From: mbarnes svn gnome org
- To: svn-commits-list gnome org
- Subject: evolution-data-server r8463 - in trunk: . camel servers/exchange servers/exchange/lib servers/exchange/storage
- Date: Wed, 6 Feb 2008 19:34:45 +0000 (GMT)
Author: mbarnes
Date: Wed Feb 6 19:34:45 2008
New Revision: 8463
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8463&view=rev
Log:
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).
Modified:
trunk/ChangeLog
trunk/camel/ChangeLog
trunk/camel/Makefile.am
trunk/configure.in
trunk/marshal.mk
trunk/servers/exchange/ChangeLog
trunk/servers/exchange/lib/Makefile.am
trunk/servers/exchange/storage/Makefile.am
Modified: trunk/camel/Makefile.am
==============================================================================
--- trunk/camel/Makefile.am (original)
+++ trunk/camel/Makefile.am Wed Feb 6 19:34:45 2008
@@ -311,8 +311,8 @@
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 \
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Wed Feb 6 19:34:45 2008
@@ -253,7 +253,7 @@
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"
Modified: trunk/marshal.mk
==============================================================================
--- trunk/marshal.mk (original)
+++ trunk/marshal.mk Wed Feb 6 19:34:45 2008
@@ -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 )
Modified: trunk/servers/exchange/lib/Makefile.am
==============================================================================
--- trunk/servers/exchange/lib/Makefile.am (original)
+++ trunk/servers/exchange/lib/Makefile.am Wed Feb 6 19:34:45 2008
@@ -15,7 +15,7 @@
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
Modified: trunk/servers/exchange/storage/Makefile.am
==============================================================================
--- trunk/servers/exchange/storage/Makefile.am (original)
+++ trunk/servers/exchange/storage/Makefile.am Wed Feb 6 19:34:45 2008
@@ -18,6 +18,7 @@
$(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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]