Fixed INCLUDES and don't autogenerate ical.h, no need to. Plus it caused

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 svn path=/trunk/; revision=22844
2003-10-09 21:02:30 +00:00 · 2003-10-09 21:02:30 +00:00 · 9f20d8032c
commit 9f20d8032c
parent 18407a6beb
63 changed files with 179 additions and 151 deletions
--- a/libical/ChangeLog
+++ b/libical/ChangeLog
@ -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
--- a/libical/examples/Makefile.am
+++ b/libical/examples/Makefile.am
@ -9,7 +9,7 @@ endif

 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 \
--- a/libical/examples/access_components.c
+++ b/libical/examples/access_components.c
@ -1,6 +1,6 @@
 /* Access_component.c */

-#include "ical.h"
+#include <libical/ical.h>

 #include <assert.h>
 #include <string.h> /* for strdup */
--- a/libical/examples/access_properties_and_parameters.c
+++ b/libical/examples/access_properties_and_parameters.c
@ -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
--- a/libical/examples/errors.c
+++ b/libical/examples/errors.c
@ -1,6 +1,6 @@
 /* errors.c */

-#include "ical.h"
+#include <libical/ical.h>
 #include <stdio.h>

 void program_errors()
--- a/libical/examples/main.c
+++ b/libical/examples/main.c
@ -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()
 {
--- a/libical/examples/parse_text.c
+++ b/libical/examples/parse_text.c
@ -5,7 +5,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-#include "ical.h"
+#include <libical/ical.h>

 #include <stdlib.h>

--- a/libical/examples/usecases.c
+++ b/libical/examples/usecases.c
@ -27,7 +27,7 @@
    
  ======================================================================*/

-#include "ical.h"
+#include <libical/ical.h>
 #include <assert.h>
 #include <string.h> /* for strdup */
 #include <stdlib.h> /* for malloc */
--- a/libical/src/libical/Makefile.am
+++ b/libical/src/libical/Makefile.am
@ -2,7 +2,7 @@
 #  FILE: Makefile.am
 #  CREATOR: eric 
 #  
-#  $Id: Makefile.am,v 1.39 2003/10/07 14:28:18 danw Exp $
+#  $Id: Makefile.am,v 1.40 2003/10/09 21:02:23 fejj Exp $
 #
 #
 # (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@ -40,8 +40,6 @@ CPPFLAGS = -DPACKAGE_DATA_DIR=\""$(privdatadir)"\"

 # CFLAGS = -g

-all: ical.h
-
 INCLUDES =			\
 	-I$(top_builddir)	\
 	-I$(top_srcdir)/src	\
@ -161,23 +159,6 @@ BUILT_SOURCES =			\
 	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 @@ CLEANFILES = $(BUILT_SOURCES) $(BUILT_COMBINEDHEADERS)

 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 \
--- a/libical/src/libical/ical.h
+++ b/libical/src/libical/ical.h
@ -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 */
--- a/libical/src/libicalss/Makefile.am
+++ b/libical/src/libicalss/Makefile.am
@ -2,7 +2,7 @@
 #  FILE: Makefile.am
 #  CREATOR: eric 
 #  
-#  $Id: Makefile.am,v 1.20 2003/09/22 07:32:31 hansp Exp $
+#  $Id: Makefile.am,v 1.21 2003/10/09 21:02:25 fejj Exp $
 #
 #
 # (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@ -27,8 +27,6 @@ AM_YFLAGS =-d -v -p ss
 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 @@ privlib_LTLIBRARIES = libicalss-evolution.la $(cxx_lib)

 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,32 +108,12 @@ COMBINEDHEADERS = \
 	$(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


--- a/libical/src/libicalss/icalbdbset.h
+++ b/libical/src/libicalss/icalbdbset.h
@ -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;
--- a/libical/src/libicalss/icalbdbset_cxx.h
+++ b/libical/src/libicalss/icalbdbset_cxx.h
@ -10,8 +10,8 @@


 extern "C" {
-#include "ical.h"
-#include "icalgauge.h"
+#include <libical/ical.h>
+#include <libicalss/icalgauge.h>
 }

 #include "vcomponent.h"
--- a/libical/src/libicalss/icalbdbsetimpl.h
+++ b/libical/src/libicalss/icalbdbsetimpl.h
@ -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
--- a/libical/src/libicalss/icalcalendar.h
+++ b/libical/src/libicalss/icalcalendar.h
@ -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 
--- a/libical/src/libicalss/icalclassify.c
+++ b/libical/src/libicalss/icalclassify.c
@ -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() */
--- a/libical/src/libicalss/icalclassify.h
+++ b/libical/src/libicalss/icalclassify.h
@ -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);
--- a/libical/src/libicalss/icalcluster.h
+++ b/libical/src/libicalss/icalcluster.h
@ -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;

--- a/libical/src/libicalss/icalcomponent.h
+++ b/libical/src/libicalss/icalcomponent.h
@ -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;

--- a/libical/src/libicalss/icalcsdb.h
+++ b/libical/src/libicalss/icalcsdb.h
@ -26,7 +26,7 @@
 #ifndef ICALCSDB_H
 #define ICALCSDB_H

-#include "ical.h"
+#include <libical/ical.h>

 typedef void icalcsdb;

--- a/libical/src/libicalss/icalcstp.c
+++ b/libical/src/libicalss/icalcstp.c
@ -26,7 +26,7 @@
 #include "config.h"
 #endif

-#include "ical.h"
+#include <libical/ical.h>
 #include "icalcstp.h"
 #include "pvl.h" 

--- a/libical/src/libicalss/icalcstp.h
+++ b/libical/src/libicalss/icalcstp.h
@ -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 */
--- a/libical/src/libicalss/icalcstpclient.c
+++ b/libical/src/libicalss/icalcstpclient.c
@ -26,7 +26,7 @@
 #include "config.h"
 #endif

-#include "ical.h"
+#include <libical/ical.h>
 #include "icalcstp.h"
 #include "icalcstpclient.h"
 #include "pvl.h" 
--- a/libical/src/libicalss/icalcstpclient.h
+++ b/libical/src/libicalss/icalcstpclient.h
@ -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 **************************/

--- a/libical/src/libicalss/icalcstpserver.c
+++ b/libical/src/libicalss/icalcstpserver.c
@ -26,7 +26,7 @@
 #include "config.h"
 #endif

-#include "ical.h"
+#include <libical/ical.h>
 #include "icalcstp.h"
 #include "icalcstpserver.h"
 #include "pvl.h" 
--- a/libical/src/libicalss/icalcstpserver.h
+++ b/libical/src/libicalss/icalcstpserver.h
@ -27,7 +27,7 @@
 #ifndef ICALCSTPS_H
 #define ICALCSTPS_H

-#include "ical.h"
+#include <libical/ical.h>


 /********************** Server (Reciever) Interfaces *************************/
--- a/libical/src/libicalss/icaldirset.c
+++ b/libical/src/libicalss/icaldirset.c
@ -57,7 +57,7 @@
 #endif


-#include "ical.h"
+#include <libical/ical.h>
 #include "icaldirset.h"
 #include "icaldirset.h"
 #include "icalfileset.h"
--- a/libical/src/libicalss/icaldirset.h
+++ b/libical/src/libicalss/icaldirset.h
@ -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 */
--- a/libical/src/libicalss/icaldirsetimpl.h
+++ b/libical/src/libicalss/icaldirsetimpl.h
@ -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*/
--- a/libical/src/libicalss/icalfileset.h
+++ b/libical/src/libicalss/icalfileset.h
@ -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 */
--- a/libical/src/libicalss/icalfilesetimpl.h
+++ b/libical/src/libicalss/icalfilesetimpl.h
@ -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*/
--- a/libical/src/libicalss/icalgauge.c
+++ b/libical/src/libicalss/icalgauge.c
@ -26,7 +26,7 @@

 ======================================================================*/

-#include "ical.h"
+#include <libical/ical.h>
 #include "icalgauge.h"
 #include "icalgaugeimpl.h"
 #include <stdlib.h>
--- a/libical/src/libicalss/icalgaugeimpl.h
+++ b/libical/src/libicalss/icalgaugeimpl.h
@ -22,7 +22,7 @@

 ======================================================================*/

-#include "ical.h"
+#include <libical/ical.h>

 typedef enum icalgaugecompare {
    ICALGAUGECOMPARE_EQUAL=ICAL_XLICCOMPARETYPE_EQUAL,
--- a/libical/src/libicalss/icalmessage.c
+++ b/libical/src/libicalss/icalmessage.c
@ -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() */
--- a/libical/src/libicalss/icalmessage.h
+++ b/libical/src/libicalss/icalmessage.h
@ -23,7 +23,7 @@

 =========================================================================*/

-#include "ical.h"
+#include <libical/ical.h>

 #ifndef ICALMESSAGE_H
 #define ICALMESSAGE_H
--- a/libical/src/libicalss/icalset.c
+++ b/libical/src/libicalss/icalset.c
@ -34,7 +34,7 @@

 ======================================================================*/

-#include "ical.h"
+#include <libical/ical.h>
 #include "icalset.h"
 #include "icalfileset.h"
 #include "icalfilesetimpl.h"
--- a/libical/src/libicalss/icalset.h
+++ b/libical/src/libicalss/icalset.h
@ -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
--- a/libical/src/libicalss/icalspanlist.c
+++ b/libical/src/libicalss/icalspanlist.c
@ -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 */
--- a/libical/src/libicalss/icalspanlist.h
+++ b/libical/src/libicalss/icalspanlist.h
@ -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
--- a/libical/src/libicalss/icalspanlist_cxx.h
+++ b/libical/src/libicalss/icalspanlist_cxx.h
@ -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.. */

--- a/libical/src/libicalss/icalss.h
+++ b/libical/src/libicalss/icalss.h
@ -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 */
--- a/libical/src/libicalss/icalssutil.h
+++ b/libical/src/libicalss/icalssutil.h
@ -23,5 +23,5 @@

 =========================================================================*/

-#include "ical.h"
+#include <libical/ical.h>

--- a/libical/src/libicalss/icalssyacc.c
+++ b/libical/src/libicalss/icalssyacc.c
@ -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;
--- a/libical/src/libicalvcal/Makefile.am
+++ b/libical/src/libicalvcal/Makefile.am
@ -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

--- a/libical/src/libicalvcal/icalvcal.c
+++ b/libical/src/libicalvcal/icalvcal.c
@ -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 @@ icalcomponent* icalvcal_convert_with_defaults (VObject *object,

   /* 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");
--- a/libical/src/libicalvcal/icalvcal.h
+++ b/libical/src/libicalvcal/icalvcal.h
@ -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
--- a/libical/src/test/Makefile.am
+++ b/libical/src/test/Makefile.am
@ -24,14 +24,8 @@ LDADD =  ../libicalss/libicalss-evolution.la ../libicalvcal/libicalvcal-evolutio
 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
--- a/libical/src/test/copycluster.c
+++ b/libical/src/test/copycluster.c
@ -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");
--- a/libical/src/test/findobj.c
+++ b/libical/src/test/findobj.c
@ -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 */

--- a/libical/src/test/icaltestparser.c
+++ b/libical/src/test/icaltestparser.c
@ -29,7 +29,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-#include "ical.h"
+#include <libical/ical.h>

 #include <stdlib.h>

--- a/libical/src/test/process.c
+++ b/libical/src/test/process.c
@ -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)
 {
--- a/libical/src/test/recur.c
+++ b/libical/src/test/recur.c
@ -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
--- a/libical/src/test/regression-classify.c
+++ b/libical/src/test/regression-classify.c
@ -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;
--- a/libical/src/test/regression-component.c
+++ b/libical/src/test/regression-component.c
@ -1,4 +1,4 @@
-#include "ical.h"
+#include <libical/ical.h>
 #include "regression.h"

 #include <string.h>
--- a/libical/src/test/regression-recur.c
+++ b/libical/src/test/regression-recur.c
@ -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;
--- a/libical/src/test/regression-storage.c
+++ b/libical/src/test/regression-storage.c
@ -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"
--- a/libical/src/test/regression-utils.c
+++ b/libical/src/test/regression-utils.c
@ -1,4 +1,4 @@
-#include "ical.h"
+#include <libical/ical.h>

 #include <stdlib.h>	/* abort() */
 #include <string.h>	/* strcmp() */
--- a/libical/src/test/regression.c
+++ b/libical/src/test/regression.c
@ -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 @@ void test_recur_parameter_bug(){
 
 #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 @@ void test_x(){
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <ical.h>
+#include <libical/ical.h>
 
    static const char test_icalcomp_str[] =
 "BEGIN:VEVENT\r\n"
--- a/libical/src/test/storage.c
+++ b/libical/src/test/storage.c
@ -27,7 +27,7 @@
    
  ======================================================================*/

-#include "ical.h"
+#include <libical/ical.h>
 #include <assert.h>
 #include <string.h> /* for strdup */
 #include <stdlib.h> /* for malloc */
--- a/libical/src/test/stow.c
+++ b/libical/src/test/stow.c
@ -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 @@ icalcomponent* make_reply(icalcomponent *comp, icalproperty *return_status,

    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( 
--- a/libical/src/test/testclassify.c
+++ b/libical/src/test/testclassify.c
@ -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)
--- a/libical/src/test/testmime.c
+++ b/libical/src/test/testmime.c
@ -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*/
--- a/libical/src/test/testvcal.c
+++ b/libical/src/test/testvcal.c
@ -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