GNOME.org
 

[evolution-patches] fixes for libical build

I've gotten pretty sick of the libical build being so fucked, so I've
fixed it to play nice (you know, billions of redefinitions of enums,
config.h macros, and the like...)

seems the ical devs decided to cat all the src/libical/*.h files into
ical.h and similar for src/libicalss/*.h into icalss.h

their Makefiles were also pretty broken, adding every path under the sun
to the INCLUDES. fixed that as well.

Jeff

? ical-suckage-fixes.patch
? examples/foo2.sh
? src/libical/foo.sh
? src/libical/ical-all.h
? src/libicalss/foo.sh
? src/libicalss/foo2.sh
? src/libicalss/icalss-all.h
? src/libicalss/icalssyacc.output
? src/libicalvcal/vcc.c
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/libical/ChangeLog,v
retrieving revision 1.148
diff -u -r1.148 ChangeLog
--- ChangeLog	7 Oct 2003 14:28:17 -0000	1.148
+++ ChangeLog	9 Oct 2003 18:33:44 -0000
@@ -1,3 +1,31 @@
+2003-10-09  Jeffrey Stedfast  <fejj ximian com>
+
+	* src/libical/Makefile.am: Fixed INCLUDES and don't autogenerate
+	ical.h, no need to. Plus it caused problems anyways.
+
+	* src/libical/*.[c,h]: Fixed the #includes
+
+	* src/libicalss/Makefile.am: Fixed INCLUDES and don't autogenerate
+	icalss.h, no need to. Plus it caused problems anyways.
+
+	* src/libicalss/*.[c,h]: Fixed the #includes
+
+	* tests/*.c: #include <libical/ical.h> rather
+	than "ical.h"
+
+	* tests/Makefile.am: Fixed INCLUDES
+
+	* examples/*.c: #include <libical/ical.h> rather
+	than "ical.h"
+
+	* examples/Makefile.am: Fixed INCLUDES
+
+	* src/libicalvcal/icalvcal.h: #include <libical/ical.h> which is
+	no longer autogenerated.
+
+	* src/libicalvcal/icalvcal.c (icalvcal_convert_with_defaults): Use
+	the proper macro names from config.h
+
 2003-10-07  Dan Winship  <danw ximian com>
 
 	* src/libical/Makefile.am: Remove libical-static
Index: examples/Makefile.am
===================================================================
RCS file: /cvs/gnome/libical/examples/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- examples/Makefile.am	22 Sep 2003 07:32:28 -0000	1.6
+++ examples/Makefile.am	9 Oct 2003 18:33:44 -0000
@@ -9,7 +9,7 @@
 
 LIBS = @PTHREAD_LIBS@
 
-INCLUDES = -I. -I../src/libical -I$(srcdir)/../src/libical -I../src/libicalss -I../src/libicalvcal 
+INCLUDES = -I. -I$(top_srcdir)/src
 
 doesnothing_SOURCES = \
 	access_components.c \
Index: examples/access_components.c
===================================================================
RCS file: /cvs/gnome/libical/examples/access_components.c,v
retrieving revision 1.2
diff -u -r1.2 access_components.c
--- examples/access_components.c	11 Sep 2003 22:04:02 -0000	1.2
+++ examples/access_components.c	9 Oct 2003 18:33:44 -0000
@@ -1,6 +1,6 @@
 /* Access_component.c */
 
-#include "ical.h"
+#include <libical/ical.h>
 
 #include <assert.h>
 #include <string.h> /* for strdup */
Index: examples/access_properties_and_parameters.c
===================================================================
RCS file: /cvs/gnome/libical/examples/access_properties_and_parameters.c,v
retrieving revision 1.4
diff -u -r1.4 access_properties_and_parameters.c
--- examples/access_properties_and_parameters.c	23 Jan 2001 20:22:32 -0000	1.4
+++ examples/access_properties_and_parameters.c	9 Oct 2003 18:33:44 -0000
@@ -1,6 +1,6 @@
 /* access_properties_and_parameters.c */
 
-#include "ical.h"
+#include <libical/ical.h>
 #include <string.h>
 
 /* Get a particular parameter out of a component. This routine will
Index: examples/errors.c
===================================================================
RCS file: /cvs/gnome/libical/examples/errors.c,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 errors.c
--- examples/errors.c	11 Dec 2000 22:07:15 -0000	1.1.1.2
+++ examples/errors.c	9 Oct 2003 18:33:44 -0000
@@ -1,6 +1,6 @@
 /* errors.c */
 
-#include "ical.h"
+#include <libical/ical.h>
 #include <stdio.h>
 
 void program_errors()
Index: examples/main.c
===================================================================
RCS file: /cvs/gnome/libical/examples/main.c,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 main.c
--- examples/main.c	11 Dec 2000 22:07:15 -0000	1.1.1.2
+++ examples/main.c	9 Oct 2003 18:33:44 -0000
@@ -1,5 +1,5 @@
 /* This is just to make the code in the example directory link properly. */
-#include "ical.h"
+#include <libical/ical.h>
 
 int main()
 {
Index: examples/parse_text.c
===================================================================
RCS file: /cvs/gnome/libical/examples/parse_text.c,v
retrieving revision 1.1.1.3
diff -u -r1.1.1.3 parse_text.c
--- examples/parse_text.c	23 Jan 2001 19:20:44 -0000	1.1.1.3
+++ examples/parse_text.c	9 Oct 2003 18:33:44 -0000
@@ -5,7 +5,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-#include "ical.h"
+#include <libical/ical.h>
 
 #include <stdlib.h>
 
Index: examples/usecases.c
===================================================================
RCS file: /cvs/gnome/libical/examples/usecases.c,v
retrieving revision 1.1
diff -u -r1.1 usecases.c
--- examples/usecases.c	11 Sep 2003 22:04:02 -0000	1.1
+++ examples/usecases.c	9 Oct 2003 18:33:44 -0000
@@ -27,7 +27,7 @@
     
   ======================================================================*/
 
-#include "ical.h"
+#include <libical/ical.h>
 #include <assert.h>
 #include <string.h> /* for strdup */
 #include <stdlib.h> /* for malloc */
Index: src/libical/Makefile.am
===================================================================
RCS file: /cvs/gnome/libical/src/libical/Makefile.am,v
retrieving revision 1.39
diff -u -r1.39 Makefile.am
--- src/libical/Makefile.am	7 Oct 2003 14:28:18 -0000	1.39
+++ src/libical/Makefile.am	9 Oct 2003 18:33:44 -0000
@@ -40,8 +40,6 @@
 
 # CFLAGS = -g
 
-all: ical.h
-
 INCLUDES =			\
 	-I$(top_builddir)	\
 	-I$(top_srcdir)/src	\
@@ -161,23 +159,6 @@
 	icalrestriction.c	\
 	icalderivedvalue.c
 
-ical.h: $(COMBINEDHEADERS)
-	echo '#ifdef __cplusplus'         >  ical.h
-	echo 'extern "C" {'               >> ical.h
-	echo '#endif'                     >> ical.h
-	echo '/*'                         >> ical.h
-	echo ' $$''Id''$$'                >> ical.h
-	echo '*/'                         >> ical.h
-	cat $(COMBINEDHEADERS)				\
-	| egrep -v "#include.*\"ical"			\
-	| egrep -v "#include.*\"config"			\
-	| egrep -v "#include.*\"pvl\.h\""		\
-	| egrep -v '\$$(Id|Locker): .+\$$'>> ical.h
-	echo '#ifdef __cplusplus'         >> ical.h
-	echo '};'                         >> ical.h
-	echo '#endif'                     >> ical.h
-
-
 # parameters
 
 PARAMETERDEPS =	\
@@ -253,7 +234,7 @@
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
-	cd $(distdir); rm -f ical.h icalversion.h 
+	cd $(distdir); rm -f icalversion.h 
 
 EXTRA_DIST =			\
 	icalderivedparameter.c.in \
Index: src/libical/ical.h
===================================================================
RCS file: src/libical/ical.h
diff -N src/libical/ical.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/libical/ical.h	9 Oct 2003 18:33:44 -0000
@@ -0,0 +1,31 @@
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
+#include <libical/icaltime.h>
+#include <libical/icalduration.h>
+#include <libical/icalperiod.h>
+#include <libical/icalenums.h>
+#include <libical/icaltypes.h>
+#include <libical/icalrecur.h>
+#include <libical/icalattach.h>
+#include <libical/icalvalue.h>
+#include <libical/icalparameter.h>
+#include <libical/icalderivedproperty.h>
+#include <libical/icalproperty.h>
+#include <libical/pvl.h>
+#include <libical/icalarray.h>
+#include <libical/icalcomponent.h>
+#include <libical/icaltimezone.h>
+#include <libical/icalparser.h>
+#include <libical/icalmemory.h>
+#include <libical/icalerror.h>
+#include <libical/icalrestriction.h>
+#include <libical/sspm.h>
+#include <libical/icalmime.h>
+#include <libical/icallangbind.h>
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
Index: src/libicalss/Makefile.am
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/Makefile.am,v
retrieving revision 1.20
diff -u -r1.20 Makefile.am
--- src/libicalss/Makefile.am	22 Sep 2003 07:32:31 -0000	1.20
+++ src/libicalss/Makefile.am	9 Oct 2003 18:33:44 -0000
@@ -27,8 +27,6 @@
 AM_LFLAGS = -Pss 
 LEX_OUTPUT_ROOT = lex.ss
 
-all: icalss.h
-
 # just to get it built
 $(srcdir)/icalgauge.c: icalssyacc.h
 $(srcdir)/icalsslexer.c: icalssyacc.h 
@@ -58,9 +56,6 @@
 
 INCLUDES =			\
 	-I$(top_srcdir)/src	\
-	-I$(top_builddir)/src	\
-	-I$(top_srcdir)/src/libical	\
-	-I$(top_builddir)/libical \
 	$(BDB_INCLUDE)
 
 libicalss_evolution_la_LDFLAGS = -version-info 0:0:0
@@ -113,31 +108,11 @@
 	$(srcdir)/icalspanlist.h	\
 	$(srcdir)/icalmessage.h
 
-
-icalss.h: $(COMBINEDHEADERS)
-	echo '#ifdef __cplusplus'         >  icalss.h
-	echo 'extern "C" {'               >> icalss.h
-	echo '#endif'                     >> icalss.h
-	echo '/*'                         >> icalss.h
-	echo ' $$''Id''$$'                >> icalss.h
-	echo '*/'                         >> icalss.h
-	cat $(COMBINEDHEADERS)				\
-	| egrep -v "#include.*\"ical"			\
-	| egrep -v "#include.*\"pvl\.h\""		\
-	| egrep -v '\$$(Id|Locker): .+\$$'>> icalss.h
-	echo '#ifdef __cplusplus'         >> icalss.h
-	echo '};'                         >> icalss.h
-	echo '#endif'                     >> icalss.h
-
-
 if WITH_CXX_BINDINGS
 libicalss_evolution_cxx_la_SOURCES =	\
 	$(libicalss_evolution_la_SOURCES)	\
 	icalspanlist_cxx.h	\
 	icalspanlist_cxx.cpp
-
-# c++ needs ical.h auto-generated.
-icalspanlist_cxx.lo: icalss.h
 
 endif
 
Index: src/libicalss/icalbdbset.h
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalbdbset.h,v
retrieving revision 1.1
diff -u -r1.1 icalbdbset.h
--- src/libicalss/icalbdbset.h	11 Sep 2003 22:04:30 -0000	1.1
+++ src/libicalss/icalbdbset.h	9 Oct 2003 18:33:44 -0000
@@ -11,9 +11,9 @@
 #ifndef ICALBDBSET_H
 #define ICALBDBSET_H
 
-#include "ical.h"
-#include "icalset.h"
-#include "icalgauge.h"
+#include <libical/ical.h>
+#include <libicalss/icalset.h>
+#include <libicalss/icalgauge.h>
 #include <db.h>
 
 typedef struct icalbdbset_impl icalbdbset;
Index: src/libicalss/icalbdbset_cxx.h
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalbdbset_cxx.h,v
retrieving revision 1.1
diff -u -r1.1 icalbdbset_cxx.h
--- src/libicalss/icalbdbset_cxx.h	11 Sep 2003 22:04:30 -0000	1.1
+++ src/libicalss/icalbdbset_cxx.h	9 Oct 2003 18:33:44 -0000
@@ -10,8 +10,8 @@
 
 
 extern "C" {
-#include "ical.h"
-#include "icalgauge.h"
+#include <libical/ical.h>
+#include <libicalss/icalgauge.h>
 }
 
 #include "vcomponent.h"
Index: src/libicalss/icalbdbsetimpl.h
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalbdbsetimpl.h,v
retrieving revision 1.1
diff -u -r1.1 icalbdbsetimpl.h
--- src/libicalss/icalbdbsetimpl.h	11 Sep 2003 22:04:30 -0000	1.1
+++ src/libicalss/icalbdbsetimpl.h	9 Oct 2003 18:33:44 -0000
@@ -15,7 +15,7 @@
 #include "config.h"
 #endif
 
-#include "icalgauge.h"
+#include <libicalss/icalgauge.h>
 #include <db.h>
 
 /* This definition is in its own file so it can be kept out of the
Index: src/libicalss/icalcalendar.h
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalcalendar.h,v
retrieving revision 1.8
diff -u -r1.8 icalcalendar.h
--- src/libicalss/icalcalendar.h	11 Sep 2003 22:04:30 -0000	1.8
+++ src/libicalss/icalcalendar.h	9 Oct 2003 18:33:44 -0000
@@ -29,8 +29,8 @@
 #ifndef ICALCALENDAR_H
 #define ICALCALENDAR_H
 
-#include "ical.h"
-#include "icalset.h"
+#include <libical/ical.h>
+#include <libicalss/icalset.h>
 
 /* icalcalendar
  * Routines for storing calendar data in a file system. The calendar 
Index: src/libicalss/icalclassify.c
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalclassify.c,v
retrieving revision 1.2
diff -u -r1.2 icalclassify.c
--- src/libicalss/icalclassify.c	11 Sep 2003 22:04:30 -0000	1.2
+++ src/libicalss/icalclassify.c	9 Oct 2003 18:33:44 -0000
@@ -26,9 +26,9 @@
 #include "config.h"
 #endif
 
-#include "ical.h"
+#include <libical/ical.h>
 #include "icalclassify.h"
-#include "icalmemory.h"
+#include <libical/icalmemory.h>
 
 #include <ctype.h>   /* For tolower() */
 #include <string.h> /* for index() */
Index: src/libicalss/icalclassify.h
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalclassify.h,v
retrieving revision 1.2
diff -u -r1.2 icalclassify.h
--- src/libicalss/icalclassify.h	11 Sep 2003 22:04:30 -0000	1.2
+++ src/libicalss/icalclassify.h	9 Oct 2003 18:33:44 -0000
@@ -26,8 +26,8 @@
 #ifndef ICALCLASSIFY_H
 #define ICALCLASSIFY_H
 
-#include "ical.h"
-#include "icalset.h"
+#include <libical/ical.h>
+#include <libicalss/icalset.h>
 
 icalproperty_xlicclass icalclassify(icalcomponent* c,icalcomponent* match, 
 			      const char* user);
Index: src/libicalss/icalcluster.h
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalcluster.h,v
retrieving revision 1.7
diff -u -r1.7 icalcluster.h
--- src/libicalss/icalcluster.h	11 Sep 2003 22:04:30 -0000	1.7
+++ src/libicalss/icalcluster.h	9 Oct 2003 18:33:44 -0000
@@ -29,8 +29,8 @@
 #ifndef ICALCLUSTER_H
 #define ICALCLUSTER_H
 
-#include "ical.h"
-#include "icalset.h"
+#include <libical/ical.h>
+#include <libicalss/icalset.h>
 
 typedef struct icalcluster_impl icalcluster;
 
Index: src/libicalss/icalcomponent.h
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalcomponent.h,v
retrieving revision 1.3
diff -u -r1.3 icalcomponent.h
--- src/libicalss/icalcomponent.h	15 May 2000 06:18:19 -0000	1.3
+++ src/libicalss/icalcomponent.h	9 Oct 2003 18:33:44 -0000
@@ -25,9 +25,9 @@
 #ifndef ICALCOMPONENT_H
 #define ICALCOMPONENT_H
 
-#include "icalproperty.h"
-#include "icalvalue.h"
-#include "icalenums.h" /* defines icalcomponent_kind */
+#include <libicalss/icalproperty.h>
+#include <libicalss/icalvalue.h>
+#include <libicalss/icalenums.h> /* defines icalcomponent_kind */
 
 typedef void icalcomponent;
 
Index: src/libicalss/icalcsdb.h
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalcsdb.h,v
retrieving revision 1.4
diff -u -r1.4 icalcsdb.h
--- src/libicalss/icalcsdb.h	11 Sep 2003 22:04:30 -0000	1.4
+++ src/libicalss/icalcsdb.h	9 Oct 2003 18:33:44 -0000
@@ -26,7 +26,7 @@
 #ifndef ICALCSDB_H
 #define ICALCSDB_H
 
-#include "ical.h"
+#include <libical/ical.h>
 
 typedef void icalcsdb;
 
Index: src/libicalss/icalcstp.c
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalcstp.c,v
retrieving revision 1.1.1.3
diff -u -r1.1.1.3 icalcstp.c
--- src/libicalss/icalcstp.c	17 Apr 2001 17:23:20 -0000	1.1.1.3
+++ src/libicalss/icalcstp.c	9 Oct 2003 18:33:45 -0000
@@ -26,7 +26,7 @@
 #include "config.h"
 #endif
 
-#include "ical.h"
+#include <libical/ical.h>
 #include "icalcstp.h"
 #include "pvl.h" 
 
Index: src/libicalss/icalcstp.h
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalcstp.h,v
retrieving revision 1.7
diff -u -r1.7 icalcstp.h
--- src/libicalss/icalcstp.h	17 Apr 2001 17:54:45 -0000	1.7
+++ src/libicalss/icalcstp.h	9 Oct 2003 18:33:45 -0000
@@ -27,7 +27,7 @@
 #ifndef ICALCSTP_H
 #define ICALCSTP_H
 
-#include "ical.h"
+#include <libical/ical.h>
 
 
 /* Connection state, from the state machine in RFC2445 */
Index: src/libicalss/icalcstpclient.c
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalcstpclient.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 icalcstpclient.c
--- src/libicalss/icalcstpclient.c	17 Apr 2001 17:23:19 -0000	1.1.1.1
+++ src/libicalss/icalcstpclient.c	9 Oct 2003 18:33:45 -0000
@@ -26,7 +26,7 @@
 #include "config.h"
 #endif
 
-#include "ical.h"
+#include <libical/ical.h>
 #include "icalcstp.h"
 #include "icalcstpclient.h"
 #include "pvl.h" 
Index: src/libicalss/icalcstpclient.h
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalcstpclient.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 icalcstpclient.h
--- src/libicalss/icalcstpclient.h	17 Apr 2001 17:23:19 -0000	1.1.1.1
+++ src/libicalss/icalcstpclient.h	9 Oct 2003 18:33:45 -0000
@@ -27,8 +27,8 @@
 #ifndef ICALCSTPC_H
 #define ICALCSTPC_H
 
-#include "ical.h"
-#include "icalcstp.h"
+#include <libical/ical.h>
+#include <libicalss/icalcstp.h>
 
 /********************** Client (Sender) Interfaces **************************/
 
Index: src/libicalss/icalcstpserver.c
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalcstpserver.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 icalcstpserver.c
--- src/libicalss/icalcstpserver.c	17 Apr 2001 17:23:20 -0000	1.1.1.1
+++ src/libicalss/icalcstpserver.c	9 Oct 2003 18:33:45 -0000
@@ -26,7 +26,7 @@
 #include "config.h"
 #endif
 
-#include "ical.h"
+#include <libical/ical.h>
 #include "icalcstp.h"
 #include "icalcstpserver.h"
 #include "pvl.h" 
Index: src/libicalss/icalcstpserver.h
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalcstpserver.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 icalcstpserver.h
--- src/libicalss/icalcstpserver.h	17 Apr 2001 17:23:20 -0000	1.1.1.1
+++ src/libicalss/icalcstpserver.h	9 Oct 2003 18:33:45 -0000
@@ -27,7 +27,7 @@
 #ifndef ICALCSTPS_H
 #define ICALCSTPS_H
 
-#include "ical.h"
+#include <libical/ical.h>
 
 
 /********************** Server (Reciever) Interfaces *************************/
Index: src/libicalss/icaldirset.c
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icaldirset.c,v
retrieving revision 1.3
diff -u -r1.3 icaldirset.c
--- src/libicalss/icaldirset.c	11 Sep 2003 22:04:30 -0000	1.3
+++ src/libicalss/icaldirset.c	9 Oct 2003 18:33:45 -0000
@@ -57,7 +57,7 @@
 #endif
 
 
-#include "ical.h"
+#include <libical/ical.h>
 #include "icaldirset.h"
 #include "icaldirset.h"
 #include "icalfileset.h"
Index: src/libicalss/icaldirset.h
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icaldirset.h,v
retrieving revision 1.2
diff -u -r1.2 icaldirset.h
--- src/libicalss/icaldirset.h	11 Sep 2003 22:04:30 -0000	1.2
+++ src/libicalss/icaldirset.h	9 Oct 2003 18:33:45 -0000
@@ -29,10 +29,10 @@
 #ifndef ICALDIRSET_H
 #define ICALDIRSET_H
 
-#include "ical.h"
-#include "icalset.h"
-#include "icalcluster.h"
-#include "icalgauge.h"
+#include <libical/ical.h>
+#include <libicalss/icalset.h>
+#include <libicalss/icalcluster.h>
+#include <libicalss/icalgauge.h>
 
 /* icaldirset Routines for storing, fetching, and searching for ical
  * objects in a database */
Index: src/libicalss/icaldirsetimpl.h
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icaldirsetimpl.h,v
retrieving revision 1.2
diff -u -r1.2 icaldirsetimpl.h
--- src/libicalss/icaldirsetimpl.h	11 Sep 2003 22:04:30 -0000	1.2
+++ src/libicalss/icaldirsetimpl.h	9 Oct 2003 18:33:45 -0000
@@ -30,7 +30,7 @@
 #include "config.h"
 #endif
 
-#include "icalcluster.h"
+#include <libicalss/icalcluster.h>
 
 /* This definition is in its own file so it can be kept out of the
    main header file, but used by "friend classes" like icalset*/
Index: src/libicalss/icalfileset.h
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalfileset.h,v
retrieving revision 1.2
diff -u -r1.2 icalfileset.h
--- src/libicalss/icalfileset.h	11 Sep 2003 22:04:30 -0000	1.2
+++ src/libicalss/icalfileset.h	9 Oct 2003 18:33:45 -0000
@@ -29,10 +29,10 @@
 #ifndef ICALFILESET_H
 #define ICALFILESET_H
 
-#include "ical.h"
-#include "icalset.h"
-#include "icalcluster.h"
-#include "icalgauge.h"
+#include <libical/ical.h>
+#include <libicalss/icalset.h>
+#include <libicalss/icalcluster.h>
+#include <libicalss/icalgauge.h>
 #include <sys/types.h> /* For open() flags and mode */
 #include <sys/stat.h> /* For open() flags and mode */
 #include <fcntl.h> /* For open() flags and mode */
Index: src/libicalss/icalfilesetimpl.h
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalfilesetimpl.h,v
retrieving revision 1.2
diff -u -r1.2 icalfilesetimpl.h
--- src/libicalss/icalfilesetimpl.h	11 Sep 2003 22:04:30 -0000	1.2
+++ src/libicalss/icalfilesetimpl.h	9 Oct 2003 18:33:45 -0000
@@ -32,7 +32,7 @@
 #include "config.h"
 #endif
 
-#include "icalgauge.h"
+#include <libicalss/icalgauge.h>
 
 /* This definition is in its own file so it can be kept out of the
    main header file, but used by "friend classes" like icaldirset*/
Index: src/libicalss/icalgauge.c
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalgauge.c,v
retrieving revision 1.3
diff -u -r1.3 icalgauge.c
--- src/libicalss/icalgauge.c	24 Sep 2003 02:06:51 -0000	1.3
+++ src/libicalss/icalgauge.c	9 Oct 2003 18:33:45 -0000
@@ -26,7 +26,7 @@
 
 ======================================================================*/
 
-#include "ical.h"
+#include <libical/ical.h>
 #include "icalgauge.h"
 #include "icalgaugeimpl.h"
 #include <stdlib.h>
Index: src/libicalss/icalgaugeimpl.h
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalgaugeimpl.h,v
retrieving revision 1.2
diff -u -r1.2 icalgaugeimpl.h
--- src/libicalss/icalgaugeimpl.h	11 Sep 2003 22:04:30 -0000	1.2
+++ src/libicalss/icalgaugeimpl.h	9 Oct 2003 18:33:45 -0000
@@ -22,7 +22,7 @@
 
 ======================================================================*/
 
-#include "ical.h"
+#include <libical/ical.h>
 
 typedef enum icalgaugecompare {
     ICALGAUGECOMPARE_EQUAL=ICAL_XLICCOMPARETYPE_EQUAL,
Index: src/libicalss/icalmessage.c
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalmessage.c,v
retrieving revision 1.2
diff -u -r1.2 icalmessage.c
--- src/libicalss/icalmessage.c	11 Sep 2003 22:04:30 -0000	1.2
+++ src/libicalss/icalmessage.c	9 Oct 2003 18:33:45 -0000
@@ -27,7 +27,7 @@
 #endif
 
 #include "icalmessage.h"
-#include "icalenums.h"
+#include <libical/icalenums.h>
 #include <ctype.h>  /* for tolower()*/
 #include <string.h> /* for strstr */
 #include <stdlib.h> /* for free(), malloc() */
Index: src/libicalss/icalmessage.h
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalmessage.h,v
retrieving revision 1.2
diff -u -r1.2 icalmessage.h
--- src/libicalss/icalmessage.h	11 Sep 2003 22:04:30 -0000	1.2
+++ src/libicalss/icalmessage.h	9 Oct 2003 18:33:45 -0000
@@ -23,7 +23,7 @@
 
  =========================================================================*/
 
-#include "ical.h"
+#include <libical/ical.h>
 
 #ifndef ICALMESSAGE_H
 #define ICALMESSAGE_H
Index: src/libicalss/icalset.c
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalset.c,v
retrieving revision 1.2
diff -u -r1.2 icalset.c
--- src/libicalss/icalset.c	11 Sep 2003 22:04:30 -0000	1.2
+++ src/libicalss/icalset.c	9 Oct 2003 18:33:45 -0000
@@ -34,7 +34,7 @@
 
 ======================================================================*/
 
-#include "ical.h"
+#include <libical/ical.h>
 #include "icalset.h"
 #include "icalfileset.h"
 #include "icalfilesetimpl.h"
Index: src/libicalss/icalset.h
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalset.h,v
retrieving revision 1.2
diff -u -r1.2 icalset.h
--- src/libicalss/icalset.h	11 Sep 2003 22:04:30 -0000	1.2
+++ src/libicalss/icalset.h	9 Oct 2003 18:33:45 -0000
@@ -40,8 +40,8 @@
 #define ICALSET_H
 
 #include <limits.h> /* For PATH_MAX */
-#include "ical.h"
-#include "icalgauge.h"
+#include <libical/ical.h>
+#include <libicalss/icalgauge.h>
 
 #ifdef PATH_MAX
 #define ICAL_PATH_MAX PATH_MAX
Index: src/libicalss/icalspanlist.c
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalspanlist.c,v
retrieving revision 1.2
diff -u -r1.2 icalspanlist.c
--- src/libicalss/icalspanlist.c	11 Sep 2003 22:04:30 -0000	1.2
+++ src/libicalss/icalspanlist.c	9 Oct 2003 18:33:45 -0000
@@ -26,7 +26,7 @@
 #include "config.h"
 #endif
 
-#include "ical.h"
+#include <libical/ical.h>
 #include "icalspanlist.h"
 
 #include <stdlib.h> /* for free and malloc */
Index: src/libicalss/icalspanlist.h
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalspanlist.h,v
retrieving revision 1.2
diff -u -r1.2 icalspanlist.h
--- src/libicalss/icalspanlist.h	11 Sep 2003 22:04:30 -0000	1.2
+++ src/libicalss/icalspanlist.h	9 Oct 2003 18:33:45 -0000
@@ -25,8 +25,8 @@
 #ifndef ICALSPANLIST_H
 #define ICALSPANLIST_H
 
-#include "ical.h"
-#include "icalset.h"
+#include <libical/ical.h>
+#include <libicalss/icalset.h>
 
 /** @file icalspanlist.h
  *  @brief Code that supports collections of free/busy spans of time
Index: src/libicalss/icalspanlist_cxx.h
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalspanlist_cxx.h,v
retrieving revision 1.1
diff -u -r1.1 icalspanlist_cxx.h
--- src/libicalss/icalspanlist_cxx.h	11 Sep 2003 22:04:30 -0000	1.1
+++ src/libicalss/icalspanlist_cxx.h	9 Oct 2003 18:33:45 -0000
@@ -15,8 +15,8 @@
 #ifndef ICALSPANLIST_CXX_H
 #define ICALSPANLIST_CXX_H
 
-#include "ical.h"
-#include "icalss.h"
+#include <libical/ical.h>
+#include <libicalss/icalss.h>
 #include "vcomponent.h"
 #include <vector>		/* For as_matrix.. */
 
Index: src/libicalss/icalss.h
===================================================================
RCS file: src/libicalss/icalss.h
diff -N src/libicalss/icalss.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/libicalss/icalss.h	9 Oct 2003 18:33:45 -0000
@@ -0,0 +1,17 @@
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
+#include <libicalss/icalgauge.h>
+#include <libicalss/icalcluster.h>
+#include <libicalss/icalfileset.h>
+#include <libicalss/icaldirset.h>
+#include <libicalss/icalcalendar.h>
+#include <libicalss/icalclassify.h>
+#include <libicalss/icalspanlist.h>
+#include <libicalss/icalmessage.h>
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
Index: src/libicalss/icalssutil.h
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalssutil.h,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 icalssutil.h
--- src/libicalss/icalssutil.h	23 Jan 2001 19:20:42 -0000	1.1.1.2
+++ src/libicalss/icalssutil.h	9 Oct 2003 18:33:45 -0000
@@ -23,5 +23,5 @@
 
  =========================================================================*/
 
-#include "ical.h"
+#include <libical/ical.h>
 
Index: src/libicalss/icalssyacc.c
===================================================================
RCS file: /cvs/gnome/libical/src/libicalss/icalssyacc.c,v
retrieving revision 1.5
diff -u -r1.5 icalssyacc.c
--- src/libicalss/icalssyacc.c	24 Sep 2003 02:06:52 -0000	1.5
+++ src/libicalss/icalssyacc.c	9 Oct 2003 18:33:45 -0000
@@ -63,8 +63,8 @@
 #include <stdlib.h>
 #include <string.h> /* for strdup() */
 #include <limits.h> /* for SHRT_MAX*/
-#include "ical.h"
-#include "icalgauge.h"
+#include <libical/ical.h>
+#include <libicalss/icalgauge.h>
 #include "icalgaugeimpl.h"
 
 extern struct icalgauge_impl *icalss_yy_gauge;
Index: src/libicalvcal/Makefile.am
===================================================================
RCS file: /cvs/gnome/libical/src/libicalvcal/Makefile.am,v
retrieving revision 1.9
diff -u -r1.9 Makefile.am
--- src/libicalvcal/Makefile.am	22 Sep 2003 07:32:32 -0000	1.9
+++ src/libicalvcal/Makefile.am	9 Oct 2003 18:33:45 -0000
@@ -1,10 +1,8 @@
 privlib_LTLIBRARIES = libicalvcal-evolution.la
 
 INCLUDES =			\
-	-I$(top_builddir)	\
-	-I$(top_srcdir)/src/libical	\
-	-I$(top_builddir)/src/libical	\
-	-I$(top_srcdir)/src/libicalss
+	-I$(top_srcdir)		\
+	-I$(top_srcdir)/src
 
 libicalvcal_evolution_la_LDFLAGS = -version-info 0:0:0
 
Index: src/libicalvcal/icalvcal.c
===================================================================
RCS file: /cvs/gnome/libical/src/libicalvcal/icalvcal.c,v
retrieving revision 1.4
diff -u -r1.4 icalvcal.c
--- src/libicalvcal/icalvcal.c	11 Sep 2003 22:04:32 -0000	1.4
+++ src/libicalvcal/icalvcal.c	9 Oct 2003 18:33:46 -0000
@@ -39,8 +39,12 @@
 
   ======================================================================*/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "icalvcal.h"
-#include <string.h>   
+#include <string.h>
 
 #ifdef WIN32
 #define snprintf	_snprintf
@@ -326,8 +330,8 @@
 
    /* We add a VERSION and PRODID here, to make it a valid iCalendar object,
       but the application may change them if necessary. */
-   prop = icalproperty_new_prodid ("-//Softwarestudio.org//" ICAL_PACKAGE
-				   " version " ICAL_VERSION "//EN");
+   prop = icalproperty_new_prodid ("-//Softwarestudio.org//" PACKAGE
+				   " version " VERSION "//EN");
    icalcomponent_add_property (root, prop);
 
    prop = icalproperty_new_version ("2.0");
Index: src/libicalvcal/icalvcal.h
===================================================================
RCS file: /cvs/gnome/libical/src/libicalvcal/icalvcal.h,v
retrieving revision 1.3
diff -u -r1.3 icalvcal.h
--- src/libicalvcal/icalvcal.h	11 Sep 2003 22:04:33 -0000	1.3
+++ src/libicalvcal/icalvcal.h	9 Oct 2003 18:33:46 -0000
@@ -26,7 +26,7 @@
 #ifndef ICALVCAL_H
 #define ICALVCAL_H
 
-#include "ical.h"
+#include <libical/ical.h>
 #include "vcc.h"
 
 /* These are used as default values if the values are missing in the vCalendar
Index: src/test/Makefile.am
===================================================================
RCS file: /cvs/gnome/libical/src/test/Makefile.am,v
retrieving revision 1.18
diff -u -r1.18 Makefile.am
--- src/test/Makefile.am	22 Sep 2003 07:32:33 -0000	1.18
+++ src/test/Makefile.am	9 Oct 2003 18:33:46 -0000
@@ -24,14 +24,8 @@
 LIBS = @PTHREAD_LIBS@
 
 INCLUDES = 				\
-       -I. 				\
-       -I../libicalvcal 		\
-       -I$(srcdir)/../libicalvcal 	\
-       -I$(srcdir) 			\
-       -I../libical 			\
-       -I$(srcdir)/../libical 		\
-       -I../libicalss 			\
-       -I$(srcdir)/../libicalss         \
+	-I$(top_srcdir)			\
+	-I$(top_srcdir)/src		\
 	$(cxx_inc) $(bdb4_inc)
 
 TESTS=regression
Index: src/test/copycluster.c
===================================================================
RCS file: /cvs/gnome/libical/src/test/copycluster.c,v
retrieving revision 1.13
diff -u -r1.13 copycluster.c
--- src/test/copycluster.c	11 Sep 2003 22:04:38 -0000	1.13
+++ src/test/copycluster.c	9 Oct 2003 18:33:46 -0000
@@ -32,8 +32,8 @@
 #include <unistd.h> /* for alarm */
 #include <stdlib.h> /* for exit */
 
-#include "ical.h"
-#include "icalss.h"
+#include <libical/ical.h>
+#include <libicalss/icalss.h>
 
 static void sig_alrm(int i){
     fprintf(stderr,"Could not get lock on file\n");
Index: src/test/findobj.c
===================================================================
RCS file: /cvs/gnome/libical/src/test/findobj.c,v
retrieving revision 1.8
diff -u -r1.8 findobj.c
--- src/test/findobj.c	11 Sep 2003 22:04:38 -0000	1.8
+++ src/test/findobj.c	9 Oct 2003 18:33:46 -0000
@@ -29,8 +29,8 @@
 #include <errno.h>
 #include <string.h> /* For strerror */
 
-#include "ical.h"
-#include "icalss.h"
+#include <libical/ical.h>
+#include <libicalss/icalss.h>
 
 /* This program finds an object stored in a calendar */
 
Index: src/test/icaltestparser.c
===================================================================
RCS file: /cvs/gnome/libical/src/test/icaltestparser.c,v
retrieving revision 1.9
diff -u -r1.9 icaltestparser.c
--- src/test/icaltestparser.c	11 Sep 2003 22:04:38 -0000	1.9
+++ src/test/icaltestparser.c	9 Oct 2003 18:33:46 -0000
@@ -29,7 +29,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-#include "ical.h"
+#include <libical/ical.h>
 
 #include <stdlib.h>
 
Index: src/test/process.c
===================================================================
RCS file: /cvs/gnome/libical/src/test/process.c,v
retrieving revision 1.2
diff -u -r1.2 process.c
--- src/test/process.c	11 Sep 2003 22:04:38 -0000	1.2
+++ src/test/process.c	9 Oct 2003 18:33:46 -0000
@@ -26,8 +26,8 @@
 #include <string.h> /* For strerror */
 #include <stdlib.h> /* for free */
 
-#include "ical.h"
-#include "icalss.h"
+#include <libical/ical.h>
+#include <libicalss/icalss.h>
 
 void send_message(icalcomponent *reply,const char* this_user)
 {
Index: src/test/recur.c
===================================================================
RCS file: /cvs/gnome/libical/src/test/recur.c,v
retrieving revision 1.2
diff -u -r1.2 recur.c
--- src/test/recur.c	11 Sep 2003 22:04:38 -0000	1.2
+++ src/test/recur.c	9 Oct 2003 18:33:46 -0000
@@ -35,8 +35,8 @@
 #include <unistd.h> /* for alarm */
 #endif
 
-#include "ical.h"
-#include "icalss.h"
+#include <libical/ical.h>
+#include <libicalss/icalss.h>
 
 #ifdef WIN32
 #define snprintf	_snprintf
Index: src/test/regression-classify.c
===================================================================
RCS file: /cvs/gnome/libical/src/test/regression-classify.c,v
retrieving revision 1.1
diff -u -r1.1 regression-classify.c
--- src/test/regression-classify.c	11 Sep 2003 22:04:38 -0000	1.1
+++ src/test/regression-classify.c	9 Oct 2003 18:33:46 -0000
@@ -28,8 +28,8 @@
 #include <errno.h>
 #include <string.h> /* For strerror */
 
-#include "ical.h"
-#include "icalss.h"
+#include <libical/ical.h>
+#include <libicalss/icalss.h>
 #include "regression.h"
 
 extern int VERBOSE;
Index: src/test/regression-component.c
===================================================================
RCS file: /cvs/gnome/libical/src/test/regression-component.c,v
retrieving revision 1.1
diff -u -r1.1 regression-component.c
--- src/test/regression-component.c	11 Sep 2003 22:04:38 -0000	1.1
+++ src/test/regression-component.c	9 Oct 2003 18:33:46 -0000
@@ -1,4 +1,4 @@
-#include "ical.h"
+#include <libical/ical.h>
 #include "regression.h"
 
 #include <string.h>
Index: src/test/regression-recur.c
===================================================================
RCS file: /cvs/gnome/libical/src/test/regression-recur.c,v
retrieving revision 1.1
diff -u -r1.1 regression-recur.c
--- src/test/regression-recur.c	11 Sep 2003 22:04:38 -0000	1.1
+++ src/test/regression-recur.c	9 Oct 2003 18:33:46 -0000
@@ -30,8 +30,8 @@
 #include <unistd.h> /* for alarm */
 #endif
 
-#include "ical.h"
-#include "icalss.h"
+#include <libical/ical.h>
+#include <libicalss/icalss.h>
 #include "regression.h"
 
 extern int VERBOSE;
Index: src/test/regression-storage.c
===================================================================
RCS file: /cvs/gnome/libical/src/test/regression-storage.c,v
retrieving revision 1.1
diff -u -r1.1 regression-storage.c
--- src/test/regression-storage.c	11 Sep 2003 22:04:38 -0000	1.1
+++ src/test/regression-storage.c	9 Oct 2003 18:33:46 -0000
@@ -33,8 +33,8 @@
 #include <stdio.h> /* for printf */
 #include <time.h> /* for time() */
 
-#include "ical.h"
-#include "icalss.h"
+#include <libical/ical.h>
+#include <libicalss/icalss.h>
 #include "regression.h"
 
 #define OUTPUT_FILE "filesetout.ics"
Index: src/test/regression-utils.c
===================================================================
RCS file: /cvs/gnome/libical/src/test/regression-utils.c,v
retrieving revision 1.1
diff -u -r1.1 regression-utils.c
--- src/test/regression-utils.c	11 Sep 2003 22:04:38 -0000	1.1
+++ src/test/regression-utils.c	9 Oct 2003 18:33:46 -0000
@@ -1,4 +1,4 @@
-#include "ical.h"
+#include <libical/ical.h>
 
 #include <stdlib.h>	/* abort() */
 #include <string.h>	/* strcmp() */
Index: src/test/regression.c
===================================================================
RCS file: /cvs/gnome/libical/src/test/regression.c,v
retrieving revision 1.15
diff -u -r1.15 regression.c
--- src/test/regression.c	22 Sep 2003 07:32:33 -0000	1.15
+++ src/test/regression.c	9 Oct 2003 18:33:47 -0000
@@ -27,9 +27,9 @@
     
   ======================================================================*/
 
-#include "ical.h"
-#include "icalss.h"
-#include "icalvcal.h"
+#include <libical/ical.h>
+#include <libicalss/icalss.h>
+#include <libicalvcal/icalvcal.h>
 
 #include "regression.h"
 
@@ -1090,7 +1090,7 @@
  
 #include <stdio.h>
 #include <stdlib.h>
-#include <ical.h>
+#include <libical/ical.h>
  
     static const char test_icalcomp_str[] =
 "BEGIN:VEVENT\n"
@@ -2425,7 +2425,7 @@
  
 #include <stdio.h>
 #include <stdlib.h>
-#include <ical.h>
+#include <libical/ical.h>
  
     static const char test_icalcomp_str[] =
 "BEGIN:VEVENT\r\n"
Index: src/test/storage.c
===================================================================
RCS file: /cvs/gnome/libical/src/test/storage.c,v
retrieving revision 1.10
diff -u -r1.10 storage.c
--- src/test/storage.c	11 Sep 2003 22:04:39 -0000	1.10
+++ src/test/storage.c	9 Oct 2003 18:33:47 -0000
@@ -27,7 +27,7 @@
     
   ======================================================================*/
 
-#include "ical.h"
+#include <libical/ical.h>
 #include <assert.h>
 #include <string.h> /* for strdup */
 #include <stdlib.h> /* for malloc */
Index: src/test/stow.c
===================================================================
RCS file: /cvs/gnome/libical/src/test/stow.c,v
retrieving revision 1.9
diff -u -r1.9 stow.c
--- src/test/stow.c	11 Sep 2003 22:04:39 -0000	1.9
+++ src/test/stow.c	9 Oct 2003 18:33:47 -0000
@@ -38,8 +38,8 @@
 #include <sys/types.h> /* For getpwent */
 #include <ctype.h> /* for tolower */
 
-#include "ical.h"
-#include "icalss.h"
+#include <libical/ical.h>
+#include <libicalss/icalss.h>
 
 char* program_name;
 #define TMPSIZE 2048
@@ -309,7 +309,7 @@
 
     snprintf(attendee,TMPSIZE,"mailto:%s",local_attendee);
 
-    snprintf(prodid,TMPSIZE,"-//Softwarestudio.org//%s version %s//EN",ICAL_PACKAGE,ICAL_VERSION);
+    snprintf(prodid,TMPSIZE,"-//Softwarestudio.org//%s version %s//EN",PACKAGE,VERSION);
 
     /* Create the base component */
     reply = icalcomponent_vanew( 
Index: src/test/testclassify.c
===================================================================
RCS file: /cvs/gnome/libical/src/test/testclassify.c,v
retrieving revision 1.2
diff -u -r1.2 testclassify.c
--- src/test/testclassify.c	11 Sep 2003 22:04:39 -0000	1.2
+++ src/test/testclassify.c	9 Oct 2003 18:33:47 -0000
@@ -26,10 +26,10 @@
  ======================================================================*/
 
 #include <stdio.h> /* for printf */
-#include "ical.h"
+#include <libical/ical.h>
 #include <errno.h>
 #include <string.h> /* For strerror */
-#include "icalss.h"
+#include <libicalss/icalss.h>
 
 /* Get a note about the purpose of the property*/
 const char* get_note(icalcomponent *c)
Index: src/test/testmime.c
===================================================================
RCS file: /cvs/gnome/libical/src/test/testmime.c,v
retrieving revision 1.2
diff -u -r1.2 testmime.c
--- src/test/testmime.c	11 Sep 2003 22:04:39 -0000	1.2
+++ src/test/testmime.c	9 Oct 2003 18:33:47 -0000
@@ -33,7 +33,7 @@
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
  ======================================================================*/
 
-#include "ical.h"
+#include <libical/ical.h>
 
 #include <stdlib.h> /* For rand */
 #include <string.h> /* for strrchr, strdup*/
Index: src/test/testvcal.c
===================================================================
RCS file: /cvs/gnome/libical/src/test/testvcal.c,v
retrieving revision 1.2
diff -u -r1.2 testvcal.c
--- src/test/testvcal.c	11 Sep 2003 22:04:39 -0000	1.2
+++ src/test/testvcal.c	9 Oct 2003 18:33:47 -0000
@@ -25,7 +25,7 @@
 
  ======================================================================*/
 
-#include "icalvcal.h"
+#include <libicalvcal/icalvcal.h>
 #include <stdio.h>
 
 /* Given a vCal data file as its first argument, this program will
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]