libical-1.0HEADlibical-1.0master

4 files changed, 9 insertions, 88 deletions

diff --git a/src/libicalcap/CMakeLists.txt b/src/libicalcap/CMakeLists.txt
index 0369740..2390789 100644
--- a/src/libicalcap/CMakeLists.txt
+++ b/src/libicalcap/CMakeLists.txt
@@ -1,101 +1,22 @@
-include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/libical )
-
+include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/libical)
 
 ########### next target ###############
 
-SET(client_SRCS client.c)
+set(client_SRCS client.c)
 
 add_executable(client ${client_SRCS})
 
 target_link_libraries(client)
 
-
 ########### install files ###############
 
-install(FILES 
+install(FILES
   icalcap.h
   icalcap_impl.h
-  icalcap_message_impl.h	
+  icalcap_message_impl.h
   icalcap_server.h
   icalcap_server_impl.h
   icalcap_session.h
   icalcap_session_impl.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/libicalcap)
-
-
-
-#original Makefile.am contents follow:
-
-##======================================================================
-##  FILE: Makefile.am
-##  CREATOR: acampi 
-##  
-##  $Id: Makefile.am,v 1.4 2008-01-02 20:07:33 dothebart Exp $
-##
-##
-## (C) COPYRIGHT 2003, Andrea Campi, mailto:a.campi@inet.it
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of either: 
-##
-##    The LGPL as published by the Free Software Foundation, version
-##    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-##
-##  Or:
-##
-##    The Mozilla Public License Version 1.0. You may obtain a copy of
-##    the License at http://www.mozilla.org/MPL/
-##
-##  
-##
-##======================================================================
-#
-#
-#lib_LTLIBRARIES = libicalcap-evolution.la
-#
-#INCLUDES =			\
-#	-I$(top_builddir)	\
-#	-I$(top_srcdir)/src	\
-#	-I$(top_builddir)/src	\
-#	-I$(top_srcdir)/src/libical	\
-#	-I$(top_builddir)/libical	\
-#	-I$(srcdir)		\
-#	-DWITH_RR $(RRCAP_CFLAGS)
-#
-#libicalcap_evolution_la_LDFLAGS = $(RRCAP_LIBS) -version-info 43:0:43
-#
-#
-#libicalcap_evolution_la_SOURCES =		\
-#	icalcap.c		\
-#	icalcap.h		\
-#	icalcap_impl.h		\
-#	icalcap_message.c	\
-#	icalcap_message_impl.h	\
-#	icalcap_rr.c		\
-#	icalcap_server.c	\
-#	icalcap_server.h	\
-#	icalcap_server_impl.h	\
-#	icalcap_session.c	\
-#	icalcap_session.h	\
-#	icalcap_session_impl.h	\
-#	icalcap_utils.c
-#
-#libicalcap_evolutionincludedir = $(includedir)
-#
-#libicalcap_evolutioninclude_HEADERS =	\
-#	icalcap.h		\
-#	icalcap_impl.h		\
-#	icalcap_message_impl.h	\
-#	icalcap_server.h	\
-#	icalcap_server_impl.h	\
-#	icalcap_session.h	\
-#	icalcap_session_impl.h
-#
-#
-#noinst_PROGRAMS = client
-#
-#LDADD =  ../libicalss/libicalss-evolution.la ../libicalvcal/libicalvcal-evolution.la ../libical/libical-evolution.la libicalcap-evolution.la $(RRCAP_LIBS)
-#
-#
-#client_SOURCES = client.c
-#
+  DESTINATION ${INCLUDE_INSTALL_DIR}/libicalcap
+)
diff --git a/src/libicalcap/Makefile.am b/src/libicalcap/Makefile.am
index 04e6f43..022e58a 100644
--- a/src/libicalcap/Makefile.am
+++ b/src/libicalcap/Makefile.am
@@ -34,7 +34,7 @@ INCLUDES =			\
 	-I$(srcdir)		\
 	-DWITH_RR $(RRCAP_CFLAGS)
 
-libicalcap_evolution_la_LDFLAGS = $(RRCAP_LIBS) -version-info 43:0:43
+libicalcap_evolution_la_LDFLAGS = $(RRCAP_LIBS) -version-info 48:0:48
 
 
 libicalcap_evolution_la_SOURCES =		\
diff --git a/src/libicalcap/icalcap.h b/src/libicalcap/icalcap.h
index 5e61bf9..de7b471 100644
--- a/src/libicalcap/icalcap.h
+++ b/src/libicalcap/icalcap.h
@@ -1,7 +1,7 @@
 #ifndef __ICALCAP_H__
 #define __ICALCAP_H__
 
-#include <ical.h>
+#include <libical/ical.h>
 
 /*
  * Opaque objects
diff --git a/src/libicalcap/icalcap_message_impl.h b/src/libicalcap/icalcap_message_impl.h
index ae234d2..fa44f4d 100644
--- a/src/libicalcap/icalcap_message_impl.h
+++ b/src/libicalcap/icalcap_message_impl.h
@@ -3,7 +3,7 @@
 
 #ifdef WITH_RR
 
-#include <ical.h>
+#include <libical/ical.h>
 #include <librr/rr.h>
 
 #define	ICALCAP_MESSAGE_CMD	1