diff options
Diffstat (limited to 'libical')
63 files changed, 179 insertions, 151 deletions
diff --git a/libical/ChangeLog b/libical/ChangeLog index 6b9f7e2190..c6d5919adc 100644 --- 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 diff --git a/libical/examples/Makefile.am b/libical/examples/Makefile.am index 7f04902d1c..c9adbe07ba 100644 --- 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 \ diff --git a/libical/examples/access_components.c b/libical/examples/access_components.c index dc92b64a7c..796ce4759d 100644 --- 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 */ diff --git a/libical/examples/access_properties_and_parameters.c b/libical/examples/access_properties_and_parameters.c index ba3d7fcc0b..1d8ff0b6d1 100644 --- 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 diff --git a/libical/examples/errors.c b/libical/examples/errors.c index 86d963bd75..2ff316dd20 100644 --- 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() diff --git a/libical/examples/main.c b/libical/examples/main.c index 1be2de5c9e..3d8d7777a3 100644 --- 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() { diff --git a/libical/examples/parse_text.c b/libical/examples/parse_text.c index b7eba43b8a..84bdd9adfd 100644 --- 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> diff --git a/libical/examples/usecases.c b/libical/examples/usecases.c index 116be30a59..dfa0d9cd5c 100644 --- 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 */ diff --git a/libical/src/libical/Makefile.am b/libical/src/libical/Makefile.am index 57dabce3b5..4416f28289 100644 --- 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 \ diff --git a/libical/src/libical/ical.h b/libical/src/libical/ical.h new file mode 100644 index 0000000000..adbe751bd0 --- /dev/null +++ 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 */ diff --git a/libical/src/libicalss/Makefile.am b/libical/src/libicalss/Makefile.am index 359b1f029a..c714e8ca5a 100644 --- 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 diff --git a/libical/src/libicalss/icalbdbset.h b/libical/src/libicalss/icalbdbset.h index c5c835fae3..4c278bea31 100644 --- 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; diff --git a/libical/src/libicalss/icalbdbset_cxx.h b/libical/src/libicalss/icalbdbset_cxx.h index 678adaa299..a80e195139 100644 --- 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" diff --git a/libical/src/libicalss/icalbdbsetimpl.h b/libical/src/libicalss/icalbdbsetimpl.h index 281a4834d4..9cde41b36b 100644 --- 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 diff --git a/libical/src/libicalss/icalcalendar.h b/libical/src/libicalss/icalcalendar.h index 2a0c15196a..62abdfa7c0 100644 --- 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 diff --git a/libical/src/libicalss/icalclassify.c b/libical/src/libicalss/icalclassify.c index 61ddbd3a76..e67287bc1b 100644 --- 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() */ diff --git a/libical/src/libicalss/icalclassify.h b/libical/src/libicalss/icalclassify.h index aceabc0a20..19021e8dd2 100644 --- 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); diff --git a/libical/src/libicalss/icalcluster.h b/libical/src/libicalss/icalcluster.h index f4eb041b04..e13bb0425c 100644 --- 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; diff --git a/libical/src/libicalss/icalcomponent.h b/libical/src/libicalss/icalcomponent.h index 9e0e9f5a9f..38025813e1 100644 --- 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; diff --git a/libical/src/libicalss/icalcsdb.h b/libical/src/libicalss/icalcsdb.h index 4619b94fd0..109d6fa73a 100644 --- 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; diff --git a/libical/src/libicalss/icalcstp.c b/libical/src/libicalss/icalcstp.c index 3b212b424a..d1a52fe303 100644 --- 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" diff --git a/libical/src/libicalss/icalcstp.h b/libical/src/libicalss/icalcstp.h index dfc361830e..a42f7fd244 100644 --- 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 */ diff --git a/libical/src/libicalss/icalcstpclient.c b/libical/src/libicalss/icalcstpclient.c index d53d53f568..2d819c27c1 100644 --- 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" diff --git a/libical/src/libicalss/icalcstpclient.h b/libical/src/libicalss/icalcstpclient.h index 8d9d0c904c..b18f54f594 100644 --- 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 **************************/ diff --git a/libical/src/libicalss/icalcstpserver.c b/libical/src/libicalss/icalcstpserver.c index 1a6ed7b976..1685caab3d 100644 --- 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" diff --git a/libical/src/libicalss/icalcstpserver.h b/libical/src/libicalss/icalcstpserver.h index 6fa2254b2e..c8f0aa0ba1 100644 --- 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 *************************/ diff --git a/libical/src/libicalss/icaldirset.c b/libical/src/libicalss/icaldirset.c index 4a20fe1978..7e495f9eae 100644 --- 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" diff --git a/libical/src/libicalss/icaldirset.h b/libical/src/libicalss/icaldirset.h index a2d577dc34..3a90af2ffa 100644 --- 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 */ diff --git a/libical/src/libicalss/icaldirsetimpl.h b/libical/src/libicalss/icaldirsetimpl.h index 332a369b02..442f0ea8f3 100644 --- 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*/ diff --git a/libical/src/libicalss/icalfileset.h b/libical/src/libicalss/icalfileset.h index 1a42307525..a24574b7a9 100644 --- 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 */ diff --git a/libical/src/libicalss/icalfilesetimpl.h b/libical/src/libicalss/icalfilesetimpl.h index fe39604225..6f7cf00c1a 100644 --- 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*/ diff --git a/libical/src/libicalss/icalgauge.c b/libical/src/libicalss/icalgauge.c index a181053d21..a4b97a9f1d 100644 --- 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> diff --git a/libical/src/libicalss/icalgaugeimpl.h b/libical/src/libicalss/icalgaugeimpl.h index e56b1c01c1..4bf13524c4 100644 --- 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, diff --git a/libical/src/libicalss/icalmessage.c b/libical/src/libicalss/icalmessage.c index 731a2c7cfc..7a64ac5de1 100644 --- 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() */ diff --git a/libical/src/libicalss/icalmessage.h b/libical/src/libicalss/icalmessage.h index 24f1c9f243..102e467f32 100644 --- 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 diff --git a/libical/src/libicalss/icalset.c b/libical/src/libicalss/icalset.c index 0ad22696f7..682a404a1e 100644 --- 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" diff --git a/libical/src/libicalss/icalset.h b/libical/src/libicalss/icalset.h index 4008c6216f..dd550e2690 100644 --- 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 diff --git a/libical/src/libicalss/icalspanlist.c b/libical/src/libicalss/icalspanlist.c index f42ff41ed8..6c366fa5ba 100644 --- 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 */ diff --git a/libical/src/libicalss/icalspanlist.h b/libical/src/libicalss/icalspanlist.h index 91f0acb8c1..084cb9afeb 100644 --- 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 diff --git a/libical/src/libicalss/icalspanlist_cxx.h b/libical/src/libicalss/icalspanlist_cxx.h index fce901c3db..cf81f13003 100644 --- 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.. */ diff --git a/libical/src/libicalss/icalss.h b/libical/src/libicalss/icalss.h new file mode 100644 index 0000000000..f2e543a260 --- /dev/null +++ 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 */ diff --git a/libical/src/libicalss/icalssutil.h b/libical/src/libicalss/icalssutil.h index 3890da6a11..22be0202b1 100644 --- a/libical/src/libicalss/icalssutil.h +++ b/libical/src/libicalss/icalssutil.h @@ -23,5 +23,5 @@ =========================================================================*/ -#include "ical.h" +#include <libical/ical.h> diff --git a/libical/src/libicalss/icalssyacc.c b/libical/src/libicalss/icalssyacc.c index c2dcc47a24..8e27cd75ed 100644 --- 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; diff --git a/libical/src/libicalvcal/Makefile.am b/libical/src/libicalvcal/Makefile.am index 414265181c..1a79d75651 100644 --- 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 diff --git a/libical/src/libicalvcal/icalvcal.c b/libical/src/libicalvcal/icalvcal.c index f5d417cb6d..76c87898af 100644 --- 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"); diff --git a/libical/src/libicalvcal/icalvcal.h b/libical/src/libicalvcal/icalvcal.h index 67119ce042..e5e0be7831 100644 --- 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 diff --git a/libical/src/test/Makefile.am b/libical/src/test/Makefile.am index 8b7f3e9672..e1824b064c 100644 --- 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 diff --git a/libical/src/test/copycluster.c b/libical/src/test/copycluster.c index 6c57177290..6894de9d36 100644 --- 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"); diff --git a/libical/src/test/findobj.c b/libical/src/test/findobj.c index 3c1eac85e3..eb565afa7a 100644 --- 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 */ diff --git a/libical/src/test/icaltestparser.c b/libical/src/test/icaltestparser.c index e5973e0d4a..9992979a3a 100644 --- 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> diff --git a/libical/src/test/process.c b/libical/src/test/process.c index 466cf38101..605a83eee7 100644 --- 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) { diff --git a/libical/src/test/recur.c b/libical/src/test/recur.c index bb23337adb..0b490c0513 100644 --- 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 diff --git a/libical/src/test/regression-classify.c b/libical/src/test/regression-classify.c index c805047c24..7af64499f3 100644 --- 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; diff --git a/libical/src/test/regression-component.c b/libical/src/test/regression-component.c index 0babb579ba..5494bdd779 100644 --- 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> diff --git a/libical/src/test/regression-recur.c b/libical/src/test/regression-recur.c index 85f643e964..793eb402c8 100644 --- 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; diff --git a/libical/src/test/regression-storage.c b/libical/src/test/regression-storage.c index 6f67c6c030..ea59767014 100644 --- 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" diff --git a/libical/src/test/regression-utils.c b/libical/src/test/regression-utils.c index edc1eddba3..685e9fe94a 100644 --- 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() */ diff --git a/libical/src/test/regression.c b/libical/src/test/regression.c index d4fc276e6b..034764551b 100644 --- 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" diff --git a/libical/src/test/storage.c b/libical/src/test/storage.c index 9c29d728af..acd9d95734 100644 --- 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 */ diff --git a/libical/src/test/stow.c b/libical/src/test/stow.c index 01abea4f75..52307420bb 100644 --- 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( diff --git a/libical/src/test/testclassify.c b/libical/src/test/testclassify.c index 649d80cc58..6e8385cbc4 100644 --- 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) diff --git a/libical/src/test/testmime.c b/libical/src/test/testmime.c index cdb47d88dc..1fd455a001 100644 --- 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*/ diff --git a/libical/src/test/testvcal.c b/libical/src/test/testvcal.c index f82adffcc8..80b227b148 100644 --- 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 |