--- src/libical/Makefile.am
+++ src/libical/Makefile.am
@@ -40,7 +40,7 @@
 libical_static_la_SOURCES = $(libical_la_SOURCES)
 libical_static_la_LDFLAGS = --all-static
 
-CPPFLAGS = -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"
+AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"
 
 # CFLAGS = -g
 
@@ -108,8 +108,6 @@
 if WITH_CXX
 libical_cxx_la_SOURCES =	\
 	$(libical_la_SOURCES)	\
-	vcomponent.h		\
-	vcomponent.cpp		\
 	icalproperty_cxx.h	\
 	icalproperty_cxx.cpp	\
 	icalparameter_cxx.h	\
--- src/libicalss/Makefile.am
+++ src/libicalss/Makefile.am
@@ -66,11 +66,7 @@
 libicalss_la_LDFLAGS = -version-info 0:0:0
 libicalss_la_LIBADD = $(BDB_LIBFILES)
 
-if DEV
-libicalss_la_DEVSOURCES = icalsslexer.l icalssyacc.y
-else
 libicalss_la_DEVSOURCES = icalsslexer.c icalssyacc.c
-endif
 
 libicalss_la_SOURCES =		\
 	icalcalendar.c		\
--- src/libicalvcal/Makefile.am
+++ src/libicalvcal/Makefile.am
@@ -8,11 +8,7 @@
 
 libicalvcal_la_LDFLAGS = -version-info 0:0:0
 
-if DEV
-libicalvcal_la_DEVSOURCES = vcc.y
-else
 libicalvcal_la_DEVSOURCES = vcc.c
-endif
 
 
 libicalvcal_la_SOURCES =	\
--- ./src/libical/sspm.c.ORG	2002-06-11 14:41:04.000000000 +0200
+++ ./src/libical/sspm.c	2005-01-19 16:55:02.959543556 +0100
@@ -1168,7 +1168,7 @@
 			     char *src,
 			     size_t *size)
 {
-    int cc;
+    int cc = 0;
     char buf[4] = {0,0,0,0};  
     int p = 0;
     int valid_data = 0;