GNOME.org
 

[evolution-patches] EDS distcheck patch

Makes EDS pass distcheck.

-JP
-- 
JP Rosevear <jpr ximian com>
Ximian, Inc.

? distcheck.patch
? evolution-data-server-0.0.7.tar.gz
? new-ical.patch
? stamp-h1
? calendar/libical/src/libicalss/icalssyacc.output
? calendar/libical/src/test/clusterin.vcd
? calendar/libical/src/test/store
? calendar/libical/src/test/store-new
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/ChangeLog,v
retrieving revision 1.100
diff -u -r1.100 ChangeLog
--- ChangeLog	13 Feb 2004 20:09:05 -0000	1.100
+++ ChangeLog	23 Feb 2004 19:56:16 -0000
@@ -1,3 +1,18 @@
+2004-02-23  JP Rosevear <jpr ximian com>
+
+	* Makefile.am: make sure to distclean libdb
+
+	* autogen.sh: require automake 1.6
+	
+	* marshal.mk: make sure we use the srcdir as the location of the
+	list file
+
+	* libdb/dist/Makefile.in: add installcheck target that does
+	nothing, don't remove tags
+
+	* src/Makefile.am: add extra libical includes for srcdir !=
+	builddir
+
 2004-02-13  Chris Toshok  <toshok ximian com>
 
 	* libedataserver/Makefile.am (libedataserver_la_LIBADD): use
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- Makefile.am	6 Feb 2004 15:46:57 -0000	1.7
+++ Makefile.am	23 Feb 2004 19:56:17 -0000
@@ -1,3 +1,4 @@
+AUTOMAKE_OPTIONS = 1.6
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
 SUBDIRS = libdb libedataserver servers addressbook calendar src docs po
@@ -24,6 +25,10 @@
 	$(pkgconfig_DATA:.pc=.pc.in) \
 	$(LIBDB_FILES)
 
+CLEANFILES = intltool-extract intltool-merge intltool-update
+distclean-local:
+	(cd libdb && $(MAKE) $(AM_MAKEFLAGS) distclean)
+
 LIBDB_FILES= \
 $(srcdir)/libdb/Makefile.am \
 $(srcdir)/libdb/Makefile.in \
Index: autogen.sh
===================================================================
RCS file: /cvs/gnome/evolution-data-server/autogen.sh,v
retrieving revision 1.2
diff -u -r1.2 autogen.sh
--- autogen.sh	20 Nov 2003 19:22:47 -0000	1.2
+++ autogen.sh	23 Feb 2004 19:56:17 -0000
@@ -5,6 +5,7 @@
 test -z "$srcdir" && srcdir=.
 
 PKG_NAME="evolution-data-server"
+REQUIRED_AUTOMAKE_VERSION=1.6
 
 (test -f $srcdir/configure.in \
   && test -f $srcdir/ChangeLog \
Index: marshal.mk
===================================================================
RCS file: /cvs/gnome/evolution-data-server/marshal.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 marshal.mk
--- marshal.mk	3 Nov 2003 18:23:55 -0000	1.1.1.1
+++ marshal.mk	23 Feb 2004 19:56:17 -0000
@@ -1,7 +1,7 @@
 %.h: %.list
-	( $(GLIB_GENMARSHAL) --prefix=$(subst -,_,$*) $< --header > $  tmp \
+	( $(GLIB_GENMARSHAL) --prefix=$(subst -,_,$*) $(srcdir)/$< --header > $  tmp \
 	&& mv $  tmp $@ ) || ( rm -f $  tmp && exit 1 )
 
 %.c: %.list %.h
-	( (echo "#include \"$*.h\""; $(GLIB_GENMARSHAL) --prefix=$(subst -,_,$*) $*.list --body) > $  tmp \
+	( (echo "#include \"$*.h\""; $(GLIB_GENMARSHAL) --prefix=$(subst -,_,$*) $(srcdir)/$*.list --body) > $  tmp \
 	&& mv $  tmp $@ ) || ( rm -f $  tmp && exit 1 )
Index: addressbook/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/ChangeLog,v
retrieving revision 1.91
diff -u -r1.91 ChangeLog
--- addressbook/ChangeLog	23 Feb 2004 17:43:28 -0000	1.91
+++ addressbook/ChangeLog	23 Feb 2004 19:56:18 -0000
@@ -1,3 +1,20 @@
+2004-02-23  JP Rosevear <jpr ximian com>
+
+	* tests/vcard/Makefile.am: add extra includes for srcdir !=
+	builddir
+
+	* tests/ebook/Makefile.am: ditto
+
+	* libedata-book/Makefile.am: ditto
+
+	* libebook/Makefile.am: ditto
+
+	* backends/vcf/Makefile.am: ditto
+
+	* backends/ldap/Makefile.am: ditto
+
+	* backends/file/Makefile.am: ditto
+
 2004-02-23  Chris Toshok  <toshok ximian com>
 
 	* tests/ebook/test-search.c: add a utility so we can perform
Index: addressbook/backends/file/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/backends/file/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- addressbook/backends/file/Makefile.am	25 Nov 2003 22:38:17 -0000	1.2
+++ addressbook/backends/file/Makefile.am	23 Feb 2004 19:56:18 -0000
@@ -1,5 +1,7 @@
 INCLUDES =						\
 	-DG_LOG_DOMAIN=\"libebookbackend\"		\
+	-I$(top_srcdir)					\
+	-I$(top_builddir)				\
 	-I$(top_srcdir)/addressbook			\
 	-I$(top_builddir)/addressbook			\
 	-I$(top_srcdir)/libdb/dist			\
Index: addressbook/backends/ldap/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/backends/ldap/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- addressbook/backends/ldap/Makefile.am	6 Nov 2003 17:15:38 -0000	1.1
+++ addressbook/backends/ldap/Makefile.am	23 Feb 2004 19:56:18 -0000
@@ -1,5 +1,7 @@
 INCLUDES =						\
 	-DG_LOG_DOMAIN=\"libebookbackend\"		\
+	-I$(top_srcdir)					\
+	-I$(top_builddir)				\
 	-I$(top_srcdir)/addressbook			\
 	-I$(top_builddir)/addressbook			\
 	$(LDAP_CFLAGS)					\
Index: addressbook/backends/vcf/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/backends/vcf/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- addressbook/backends/vcf/Makefile.am	6 Nov 2003 17:15:39 -0000	1.1
+++ addressbook/backends/vcf/Makefile.am	23 Feb 2004 19:56:18 -0000
@@ -1,5 +1,7 @@
 INCLUDES =						\
 	-DG_LOG_DOMAIN=\"libebookbackend\"		\
+	-I$(top_srcdir)					\
+	-I$(top_builddir)				\
 	-I$(top_srcdir)/addressbook			\
 	-I$(top_builddir)/addressbook			\
         $(EVOLUTION_ADDRESSBOOK_CFLAGS)
Index: addressbook/libebook/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/libebook/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- addressbook/libebook/Makefile.am	7 Jan 2004 13:46:04 -0000	1.6
+++ addressbook/libebook/Makefile.am	23 Feb 2004 19:56:18 -0000
@@ -1,6 +1,8 @@
 INCLUDES =						\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DG_LOG_DOMAIN=\"libebook\"			\
+	-I$(top_srcdir)					\
+	-I$(top_builddir)				\
 	-I$(top_srcdir)/addressbook			\
 	-I$(top_builddir)/addressbook			\
         $(EVOLUTION_ADDRESSBOOK_CFLAGS)
Index: addressbook/libedata-book/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/libedata-book/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- addressbook/libedata-book/Makefile.am	7 Jan 2004 13:46:05 -0000	1.7
+++ addressbook/libedata-book/Makefile.am	23 Feb 2004 19:56:18 -0000
@@ -1,5 +1,7 @@
 INCLUDES =						\
 	-DG_LOG_DOMAIN=\"libedata-book\"		\
+	-I$(top_srcdir)					\
+	-I$(top_builddir)				\
 	-I$(top_srcdir)/addressbook			\
 	-I$(top_builddir)/addressbook			\
         $(EVOLUTION_ADDRESSBOOK_CFLAGS)
Index: addressbook/tests/ebook/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/tests/ebook/Makefile.am,v
retrieving revision 1.9
diff -u -r1.9 Makefile.am
--- addressbook/tests/ebook/Makefile.am	23 Feb 2004 18:38:53 -0000	1.9
+++ addressbook/tests/ebook/Makefile.am	23 Feb 2004 19:56:18 -0000
@@ -1,5 +1,8 @@
 INCLUDES = 				\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)		\
 	-I$(top_srcdir)/addressbook	\
+	-I$(top_builddir)/addressbook	\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
 TEST_LIBS=						\
Index: addressbook/tests/vcard/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/tests/vcard/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- addressbook/tests/vcard/Makefile.am	11 Nov 2003 21:29:40 -0000	1.2
+++ addressbook/tests/vcard/Makefile.am	23 Feb 2004 19:56:18 -0000
@@ -1,5 +1,8 @@
 INCLUDES = 				\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)		\
 	-I$(top_srcdir)/addressbook	\
+	-I$(top_builddir)/addressbook	\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
 noinst_PROGRAMS = dump-vcard
Index: calendar/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/ChangeLog,v
retrieving revision 1.192
diff -u -r1.192 ChangeLog
--- calendar/ChangeLog	17 Feb 2004 15:41:26 -0000	1.192
+++ calendar/ChangeLog	23 Feb 2004 19:56:18 -0000
@@ -1,3 +1,17 @@
+2004-02-13  JP Rosevear <jpr ximian com>
+
+	* backends/groupwise/Makefile.am: Add includes for srcdir != builddir
+
+	* backends/file/Makefile.am: ditto
+
+	* backends/contacts/Makefile.am: ditto
+
+	* libedata-cal/Makefile.am: ditto
+
+	* libecal/Makefile.am: ditto
+
+	* tests/ecal/Makefile.am: ditto
+
 2004-02-17 Harish K <kharish novell com>
 	* libecal/e-cal.c : 
 	(e_cal_new_system_calendar, e_cal_new_system_tasks) : arguments
Index: calendar/backends/contacts/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/contacts/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- calendar/backends/contacts/Makefile.am	9 Jan 2004 20:05:28 -0000	1.1
+++ calendar/backends/contacts/Makefile.am	23 Feb 2004 19:56:18 -0000
@@ -1,9 +1,13 @@
 INCLUDES =						\
 	-DG_LOG_DOMAIN=\"libecalbackendcontact\"	\
+	-I$(top_srcdir)					\
+	-I$(top_builddir)				\
 	-I$(top_srcdir)/calendar			\
 	-I$(top_builddir)/calendar			\
 	-I$(top_srcdir)/calendar/libical/src		\
 	-I$(top_builddir)/calendar/libical/src		\
+	-I$(top_srcdir)/calendar/libical/src/libical	\
+	-I$(top_builddir)/calendar/libical/src/libical	\
 	-I$(top_srcdir)/addressbook			\
 	-I$(top_builddir)/addressbook			\
 	$(EVOLUTION_CALENDAR_CFLAGS)
Index: calendar/backends/file/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/file/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- calendar/backends/file/Makefile.am	6 Nov 2003 15:51:29 -0000	1.1
+++ calendar/backends/file/Makefile.am	23 Feb 2004 19:56:18 -0000
@@ -1,9 +1,13 @@
 INCLUDES =						\
 	-DG_LOG_DOMAIN=\"libecalbackendfile\"		\
+	-I$(top_srcdir)					\
+	-I$(top_builddir)				\
 	-I$(top_srcdir)/calendar			\
 	-I$(top_builddir)/calendar			\
 	-I$(top_srcdir)/calendar/libical/src		\
 	-I$(top_builddir)/calendar/libical/src		\
+	-I$(top_srcdir)/calendar/libical/src/libical	\
+	-I$(top_builddir)/calendar/libical/src/libical	\
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
 noinst_LTLIBRARIES = libecalbackendfile.la
Index: calendar/backends/groupwise/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/groupwise/Makefile.am,v
retrieving revision 1.16
diff -u -r1.16 Makefile.am
--- calendar/backends/groupwise/Makefile.am	6 Feb 2004 16:31:09 -0000	1.16
+++ calendar/backends/groupwise/Makefile.am	23 Feb 2004 19:56:18 -0000
@@ -1,11 +1,15 @@
 INCLUDES =						\
 	-DG_LOG_DOMAIN=\"libecalbackendgroupwise\"	\
+	-I$(top_srcdir)					\
+	-I$(top_builddir)				\
 	-I$(top_srcdir)/calendar			\
 	-I$(top_builddir)/calendar			\
 	-I$(top_srcdir)/calendar/backends/file		\
 	-I$(top_builddir)/calendar/backends/file	\
 	-I$(top_srcdir)/calendar/libical/src		\
 	-I$(top_builddir)/calendar/libical/src		\
+	-I$(top_srcdir)/calendar/libical/src/libical	\
+	-I$(top_builddir)/calendar/libical/src/libical	\
 	-I$(top_srcdir)/servers/groupwise		\
 	-I$(top_builddir)/servers/groupwise		\
 	$(EVOLUTION_CALENDAR_CFLAGS)			\
Index: calendar/backends/http/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/http/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- calendar/backends/http/Makefile.am	30 Jan 2004 14:52:09 -0000	1.3
+++ calendar/backends/http/Makefile.am	23 Feb 2004 19:56:18 -0000
@@ -1,11 +1,15 @@
 INCLUDES =						\
 	-DG_LOG_DOMAIN=\"libecalbackendhttp\"		\
+	-I$(top_srcdir)					\
+	-I$(top_builddir)				\
 	-I$(top_srcdir)/calendar			\
 	-I$(top_builddir)/calendar			\
 	-I$(top_srcdir)/calendar/backends/file		\
 	-I$(top_builddir)/calendar/backends/file	\
 	-I$(top_srcdir)/calendar/libical/src		\
 	-I$(top_builddir)/calendar/libical/src		\
+	-I$(top_srcdir)/calendar/libical/src/libical	\
+	-I$(top_builddir)/calendar/libical/src/libical	\
 	$(EVOLUTION_CALENDAR_CFLAGS)			\
 	$(SOUP_CFLAGS)
 
Index: calendar/libecal/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/libecal/Makefile.am,v
retrieving revision 1.8
diff -u -r1.8 Makefile.am
--- calendar/libecal/Makefile.am	21 Jan 2004 19:10:53 -0000	1.8
+++ calendar/libecal/Makefile.am	23 Feb 2004 19:56:18 -0000
@@ -7,6 +7,9 @@
 	-I.. 						\
 	-I$(top_builddir)				\
 	-I$(top_srcdir)/calendar/libical/src		\
+	-I$(top_builddir)/calendar/libical/src		\
+	-I$(top_srcdir)/calendar/libical/src/libical	\
+	-I$(top_builddir)/calendar/libical/src/libical	\
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
 # The corba stubs and skels
Index: calendar/libedata-cal/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/libedata-cal/Makefile.am,v
retrieving revision 1.8
diff -u -r1.8 Makefile.am
--- calendar/libedata-cal/Makefile.am	7 Jan 2004 13:44:17 -0000	1.8
+++ calendar/libedata-cal/Makefile.am	23 Feb 2004 19:56:18 -0000
@@ -1,9 +1,13 @@
 INCLUDES =						\
 	-DG_LOG_DOMAIN=\"libedata-cal\"			\
+	-I$(top_srcdir)					\
+	-I$(top_builddir)				\
 	-I$(top_srcdir)/calendar			\
 	-I$(top_builddir)/calendar			\
 	-I$(top_srcdir)/calendar/libical/src		\
 	-I$(top_builddir)/calendar/libical/src		\
+	-I$(top_srcdir)/calendar/libical/src/libical	\
+	-I$(top_builddir)/calendar/libical/src/libical	\
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
 CORBA_GENERATED_H =				\
Index: calendar/libical/ChangeLog
===================================================================
RCS file: /cvs/gnome/libical/ChangeLog,v
retrieving revision 1.159
diff -u -r1.159 ChangeLog
--- calendar/libical/ChangeLog	12 Feb 2004 20:14:09 -0000	1.159
+++ calendar/libical/ChangeLog	23 Feb 2004 19:56:19 -0000
@@ -1,3 +1,30 @@
+2004-02-23  JP Rosevear <jpr ximian com>
+
+	* zoneinfo/Makefile.am: uninstall the zone files
+
+	* src/libical/Makefile.am: make sure icalversion.h gets cleaned
+	and icalrestrication is found in the builddir
+
+	* src/test/Makefile.am: add includes for srcdir != builddir, add
+	define to locate test source calendar, clean up files 
+
+	* src/test/process.c: make sure to load the sources from the right
+	spot
+
+	* src/test/regression-recur.c: ditto
+	
+	* src/test/regression-classify.c: ditto
+
+	* src/test/regression.c: ditto
+
+	* src/test/test-classify.c: ditto	
+
+	* src/libicalvcal/Makefile.am: add includes for srcdir != builddir
+
+	* Makefile.am: ditto
+
+	* examples/Makefile.am: ditto
+
 2004-02-12  Hans Petter Jansson  <hpj ximian com>
 
 	* src/libicalvcal/vcc.y (enterValues): Allocate space for the string
Index: calendar/libical/examples/Makefile.am
===================================================================
RCS file: /cvs/gnome/libical/examples/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- calendar/libical/examples/Makefile.am	9 Oct 2003 21:02:22 -0000	1.7
+++ calendar/libical/examples/Makefile.am	23 Feb 2004 19:56:19 -0000
@@ -9,7 +9,12 @@
 
 LIBS = @PTHREAD_LIBS@
 
-INCLUDES = -I. -I$(top_srcdir)/src
+INCLUDES = -I. 				\
+	-I$(top_srcdir)			\
+	-I$(top_srcdir)/src		\
+	-I$(top_builddir)/src		\
+	-I$(top_srcdir)/src/libical	\
+	-I$(top_builddir)/src/libical
 
 doesnothing_SOURCES = \
 	access_components.c \
Index: calendar/libical/src/libical/Makefile.am
===================================================================
RCS file: /cvs/gnome/libical/src/libical/Makefile.am,v
retrieving revision 1.44
diff -u -r1.44 Makefile.am
--- calendar/libical/src/libical/Makefile.am	5 Nov 2003 22:47:34 -0000	1.44
+++ calendar/libical/src/libical/Makefile.am	23 Feb 2004 19:56:19 -0000
@@ -40,10 +40,12 @@
 
 # CFLAGS = -g
 
-INCLUDES =			\
-	-I$(top_builddir)	\
-	-I$(top_srcdir)/src	\
-	-I$(top_builddir)/src	\
+INCLUDES =				\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)/src		\
+	-I$(top_builddir)/src		\
+	-I$(top_srcdir)/src/libical	\
+	-I$(top_builddir)/src/libical	\
 	-I$(srcdir)
 
 libical_evolution_la_LDFLAGS = -version-info 0:0:0
@@ -256,7 +258,7 @@
 # housekeeping
 CONFIG_CLEAN_FILES = y.output
 
-CLEANFILES = $(BUILT_SOURCES) $(BUILT_COMBINEDHEADERS)
+CLEANFILES = icalversion.h $(BUILT_SOURCES) $(BUILT_COMBINEDHEADERS)
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
@@ -282,6 +284,6 @@
 $(srcdir)/icalparameter.c: icalderivedvalue.h icalderivedproperty.h icalderivedparameter.h
 $(srcdir)/icalparser.c: icalderivedvalue.h icalderivedproperty.h icalderivedparameter.h
 $(srcdir)/icalproperty.c: icalderivedvalue.h icalderivedproperty.h icalderivedparameter.h
-$(srcdir)/icalrestriction.c: icalderivedvalue.h icalderivedproperty.h icalderivedparameter.h
+icalrestriction.c: icalderivedvalue.h icalderivedproperty.h icalderivedparameter.h
 $(srcdir)/icaltime.c: icalderivedvalue.h icalderivedproperty.h icalderivedparameter.h
 $(srcdir)/icalvalue.c: icalderivedvalue.h icalderivedproperty.h icalderivedparameter.h
Index: calendar/libical/src/libicalss/Makefile.am
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/Makefile.am,v
retrieving revision 1.24
diff -u -r1.24 Makefile.am
--- calendar/libical/src/libicalss/Makefile.am	5 Nov 2003 22:47:35 -0000	1.24
+++ calendar/libical/src/libicalss/Makefile.am	23 Feb 2004 19:56:19 -0000
@@ -56,6 +56,9 @@
 
 INCLUDES =			\
 	-I$(top_srcdir)/src	\
+	-I$(top_builddir)/src	\
+	-I$(top_srcdir)/src/libical	\
+	-I$(top_builddir)/src/libical	\
 	$(BDB_INCLUDE)
 
 libicalss_evolution_la_LDFLAGS = -version-info 0:0:0
Index: calendar/libical/src/libicalvcal/Makefile.am
===================================================================
RCS file: /cvs/gnome/libical/src/libicalvcal/Makefile.am,v
retrieving revision 1.13
diff -u -r1.13 Makefile.am
--- calendar/libical/src/libicalvcal/Makefile.am	5 Nov 2003 22:47:36 -0000	1.13
+++ calendar/libical/src/libicalvcal/Makefile.am	23 Feb 2004 19:56:19 -0000
@@ -1,8 +1,11 @@
 noinst_LTLIBRARIES = libicalvcal-evolution.la
 
-INCLUDES =			\
-	-I$(top_srcdir)		\
-	-I$(top_srcdir)/src
+INCLUDES =				\
+	-I$(top_srcdir)			\
+	-I$(top_srcdir)/src		\
+	-I$(top_builddir)/src		\
+	-I$(top_srcdir)/src/libical	\
+	-I$(top_builddir)/src/libical
 
 libicalvcal_evolution_la_LDFLAGS = -version-info 0:0:0
 
Index: calendar/libical/src/test/Makefile.am
===================================================================
RCS file: /cvs/gnome/libical/src/test/Makefile.am,v
retrieving revision 1.19
diff -u -r1.19 Makefile.am
--- calendar/libical/src/test/Makefile.am	9 Oct 2003 21:02:28 -0000	1.19
+++ calendar/libical/src/test/Makefile.am	23 Feb 2004 19:56:19 -0000
@@ -23,9 +23,13 @@
 
 LIBS = @PTHREAD_LIBS@
 
-INCLUDES = 				\
-	-I$(top_srcdir)			\
-	-I$(top_srcdir)/src		\
+INCLUDES = 						\
+	-I$(top_srcdir)					\
+	-I$(top_srcdir)/src				\
+	-I$(top_builddir)/src				\
+	-I$(top_srcdir)/src/libical			\
+	-I$(top_builddir)/src/libical			\
+	-DTEST_DATADIR=\"$(top_srcdir)/test-data\"	\
 	$(cxx_inc) $(bdb4_inc)
 
 TESTS=regression
@@ -46,3 +50,13 @@
 recur_SOURCES = recur.c 
 testmime_SOURCES = testmime.c
 process_SOURCES = process.c
+
+# clusterin.vcd should be a real file with data but it doesn't seem to be in cvs
+CLEANFILES = 				\
+	test_fileset.ics 		\
+	test_fileset_locktest.ics	\
+	filesetout.ics 			\
+	clusterin.vcd
+
+clean-local:
+	rm -rf calendar
\ No newline at end of file
Index: calendar/libical/src/test/process.c
===================================================================
RCS file: /cvs/gnome/libical/src/test/process.c,v
retrieving revision 1.4
diff -u -r1.4 process.c
--- calendar/libical/src/test/process.c	21 Oct 2003 18:28:06 -0000	1.4
+++ calendar/libical/src/test/process.c	23 Feb 2004 19:56:19 -0000
@@ -43,10 +43,11 @@
     int i=0;
     const char *class_string;
     int dont_remove;
-    
-    icalset* f = icalset_new_file("../../test-data/process-incoming.ics");
+    icalfileset_options options = {O_RDONLY, 0644, 0};
+
+    icalset* f = icalset_new(ICAL_FILE_SET, TEST_DATADIR "/process-incoming.ics", &options);
     icalset* trash = icalset_new_file("trash.ics");
-    icalset* cal = icalset_new_file("../../test-data/process-calendar.ics");
+    icalset* cal = icalset_new(ICAL_FILE_SET, TEST_DATADIR "/process-calendar.ics", &options);
     icalset* out = icalset_new_file("outgoing.ics");
 
     const char* this_user = "alice cal softwarestudio org";
Index: calendar/libical/src/test/regression-classify.c
===================================================================
RCS file: /cvs/gnome/libical/src/test/regression-classify.c,v
retrieving revision 1.3
diff -u -r1.3 regression-classify.c
--- calendar/libical/src/test/regression-classify.c	21 Oct 2003 18:28:05 -0000	1.3
+++ calendar/libical/src/test/regression-classify.c	23 Feb 2004 19:56:19 -0000
@@ -88,9 +88,10 @@
     int error_count = 0;
     /* Open up the two storage files, one for the incomming components, 
        one for the calendar */
-    icalset* incoming = icalset_new_file("../../test-data/incoming.ics");
-    icalset* cal = icalset_new_file("../../test-data/calendar.ics");
-    icalset* f = icalset_new_file("../../test-data/classify.ics");
+    icalfileset_options options = {O_RDONLY, 0644, 0};
+    icalset* incoming = icalset_new(ICAL_FILE_SET, TEST_DATADIR "/incoming.ics", &options);
+    icalset* cal = icalset_new(ICAL_FILE_SET, TEST_DATADIR "/calendar.ics", &options);
+    icalset* f = icalset_new(ICAL_FILE_SET, TEST_DATADIR "/classify.ics", &options);
 
     ok("opening file classify.ics", (f!=0));
     ok("opening file calendar.ics", (cal!=0));
Index: calendar/libical/src/test/regression-recur.c
===================================================================
RCS file: /cvs/gnome/libical/src/test/regression-recur.c,v
retrieving revision 1.2
diff -u -r1.2 regression-recur.c
--- calendar/libical/src/test/regression-recur.c	9 Oct 2003 21:02:28 -0000	1.2
+++ calendar/libical/src/test/regression-recur.c	23 Feb 2004 19:56:19 -0000
@@ -99,6 +99,7 @@
     time_t tt;
     char* file; 
     int num_recurs_found = 0;
+    icalfileset_options options = {O_RDONLY, 0644, 0};
 	
     icalerror_set_error_state(ICAL_PARSE_ERROR, ICAL_ERROR_NONFATAL);
 	
@@ -107,12 +108,12 @@
 #endif
     file = getenv("ICAL_RECUR_FILE");
     if (!file)
-      file = "../../test-data/recur.txt";
+      file = TEST_DATADIR "/recur.txt";
 	
 #ifndef WIN32
     alarm(15); /* to get file lock */
 #endif
-    cin = icalfileset_new(file);
+    cin = icalset_new(ICAL_FILE_SET, file, &options);
 #ifndef WIN32
     alarm(0);
 #endif
Index: calendar/libical/src/test/regression.c
===================================================================
RCS file: /cvs/gnome/libical/src/test/regression.c,v
retrieving revision 1.17
diff -u -r1.17 regression.c
--- calendar/libical/src/test/regression.c	21 Oct 2003 18:28:04 -0000	1.17
+++ calendar/libical/src/test/regression.c	23 Feb 2004 19:56:20 -0000
@@ -1883,8 +1883,9 @@
 			      Sat Nov  4 16:00:00 PST 2000 */
 
     time_t hh = 1800; /* one half hour */
+    icalfileset_options options = {O_RDONLY, 0644, 0};
 
-    set = icalset_new_file("../../test-data/overlaps.ics");
+    set = icalset_new(ICAL_FILE_SET, TEST_DATADIR "/overlaps.ics", &options);
 
     c = icalcomponent_vanew(
 	ICAL_VEVENT_COMPONENT,
@@ -1938,7 +1939,8 @@
 void test_fblist()
 {
     icalspanlist *sl, *new_sl;
-    icalset* set = icalset_new_file("../../test-data/spanlist.ics");
+    icalfileset_options options = {O_RDONLY, 0644, 0};
+    icalset *set = icalset_new(ICAL_FILE_SET, TEST_DATADIR "/spanlist.ics", &options);
     struct icalperiodtype period;
     icalcomponent *comp;
     int * foo;
@@ -3527,11 +3529,11 @@
 {
   VObject *vcal = 0;
   icalcomponent *comp;
-  char* file = "../../test-data/user-cal.vcf";
+  char* file = TEST_DATADIR "/user-cal.vcf";
 
   vcal = Parse_MIME_FromFileName(file);
     
-  ok("Parsing ../../test-data/user-cal.vcf", (vcal != 0));
+  ok("Parsing " TEST_DATADIR "/user-cal.vcf", (vcal != 0));
 
   comp = icalvcal_convert(vcal);
 
Index: calendar/libical/src/test/testclassify.c
===================================================================
RCS file: /cvs/gnome/libical/src/test/testclassify.c,v
retrieving revision 1.4
diff -u -r1.4 testclassify.c
--- calendar/libical/src/test/testclassify.c	21 Oct 2003 18:28:03 -0000	1.4
+++ calendar/libical/src/test/testclassify.c	23 Feb 2004 19:56:20 -0000
@@ -62,8 +62,9 @@
 
     /* Open up the two storage files, one for the incomming components, 
        one for the calendar */
-    icalset* incoming = icalset_new_file("../../test-data/incoming.ics");
-    icalset* cal = icalset_new_file("../../test-data/calendar.ics");
+    icalfileset_options options = {O_RDONLY, 0644, 0};
+    icalset* incoming = icalset_new(ICAL_FILE_SET, TEST_DATADIR "/incoming.ics", &options);
+    icalset* cal = icalset_new(ICAL_FILE_SET, TEST_DATADIR "/calendar.ics", &options);
 
     assert(incoming!= 0);
     assert(cal!=0);
Index: calendar/libical/zoneinfo/Makefile.am
===================================================================
RCS file: /cvs/gnome/libical/zoneinfo/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- calendar/libical/zoneinfo/Makefile.am	6 Feb 2003 18:13:57 -0000	1.5
+++ calendar/libical/zoneinfo/Makefile.am	23 Feb 2004 19:56:20 -0000
@@ -28,6 +28,15 @@
 	  done \
 	done
 
+uninstall-local:
+	@$(NORMAL_UNINSTALL)
+	for dir in $(DIRS); do \
+	  for tzpath in  $(srcdir)/$$dir/*.ics; do \
+	    tzfile=`basename $$tzpath`; \
+	    rm -f  $(DESTDIR)$(zoneinfodatadir)/$$dir/$$tzfile; \
+	  done \
+	done
+
 dist-hook:
 	for dir in $(DIRS); do \
 	  mkdir $(distdir)/$$dir; \
Index: calendar/tests/ecal/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/tests/ecal/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- calendar/tests/ecal/Makefile.am	21 Jan 2004 18:51:04 -0000	1.1
+++ calendar/tests/ecal/Makefile.am	23 Feb 2004 19:56:20 -0000
@@ -1,9 +1,13 @@
 INCLUDES =						\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
+	-I$(top_srcdir)					\
+	-I$(top_builddir)				\
 	-I$(top_srcdir)/calendar			\
 	-I$(top_builddir)/calendar			\
 	-I$(top_srcdir)/calendar/libical/src		\
 	-I$(top_builddir)/calendar/libical/src		\
+	-I$(top_srcdir)/calendar/libical/src/libical	\
+	-I$(top_builddir)/calendar/libical/src/libical	\
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
 # The test program
Index: libdb/dist/Makefile.in
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libdb/dist/Makefile.in,v
retrieving revision 1.3
diff -u -r1.3 Makefile.in
--- libdb/dist/Makefile.in	7 Dec 2003 19:39:08 -0000	1.3
+++ libdb/dist/Makefile.in	23 Feb 2004 19:56:21 -0000
@@ -539,8 +539,6 @@
 library_install: install_setup
 library_install: install_include install_lib install_utilities install_docs
 
-uninstall: uninstall_include uninstall_lib uninstall_utilities uninstall_docs
-
 install_setup:
 	@test -d $(prefix) || \
 	    ($(mkdir) -p $(prefix) && $(chmod) $(dmode) $(prefix))
@@ -656,7 +654,7 @@
 	$(rm) -rf $(RPC_CLIENT_OBJS) $(RPC_SRV_OBJS) $(RPC_CXXSRV_OBJS)
 	$(rm) -rf $(UTIL_PROGS) *.exe $(CLEAN_LIST)
 	$(rm) -rf $(JAVA_CLASSTOP) $(JAVA_RPCCLASSES) $(rpc_jarfile)
-	$(rm) -rf tags * o@ *.o *.o.lock *.lo core *.core
+	$(rm) -rf * o@ *.o *.o.lock *.lo core *.core
 	$(rm) -rf ALL.OUT.* BUILD PARALLEL_TESTDIR.* RPMS RPM_INSTALL
 	$(rm) -rf RUN_LOG RUNQUEUE SOURCES SPECS SRPMS TESTDIR TESTDIR.A
 	$(rm) -rf logtrack_seen.db tm .libs $(LIB_INSTALL_FILE_LIST)
@@ -670,7 +668,7 @@
 	$(rm) -rf $(REALCLEAN_LIST)
 	$(rm) -rf libtool
 
-check depend dvi info obj TAGS:
+check installcheck depend dvi info obj TAGS uninstall:
 	@echo "$@: make target not supported" && true
 
 dist:
Index: servers/groupwise/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/groupwise/ChangeLog,v
retrieving revision 1.6
diff -u -r1.6 ChangeLog
--- servers/groupwise/ChangeLog	18 Feb 2004 15:14:39 -0000	1.6
+++ servers/groupwise/ChangeLog	23 Feb 2004 19:56:21 -0000
@@ -1,3 +1,7 @@
+2004-02-13  JP Rosevear <jpr ximian com>
+
+	* Makefile.am: additional includes for builddir != srcdir
+
 2004-02-18  Rodrigo Moya <rodrigo ximian com>
 
 	* soap-test.c: added code to get the containers list and display all
Index: servers/groupwise/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/groupwise/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- servers/groupwise/Makefile.am	6 Feb 2004 18:52:25 -0000	1.3
+++ servers/groupwise/Makefile.am	23 Feb 2004 19:56:21 -0000
@@ -1,5 +1,7 @@
 INCLUDES =						\
 	-DG_LOG_DOMAIN=\"libegroupwise\"		\
+	-I$(top_srcdir)					\
+	-I$(top_builddir)				\
 	$(SOUP_CFLAGS)					\
 	$(E_DATA_SERVER_CFLAGS)				\
 	$(DEBUG_CFLAGS)
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/src/Makefile.am,v
retrieving revision 1.12
diff -u -r1.12 Makefile.am
--- src/Makefile.am	13 Feb 2004 20:08:03 -0000	1.12
+++ src/Makefile.am	23 Feb 2004 19:56:21 -0000
@@ -95,7 +95,7 @@
 	GNOME_Evolution_DataServerNOLDAP.server.in.in
 
 BUILT_SOURCES = $(IDL_GENERATED) $(server_DATA)
-CLEANFILES = $(BUILT_SOURCES)
+CLEANFILES = $(BUILT_SOURCES) GNOME_Evolution_DataServer.server.in.in
 
 install-exec-local: install-evolution-data-servers
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]