libical.la -> libical-evolution.la

2003-09-22  Hans Petter Jansson  <hpj@ximian.com>

	* calendar/cal-util/Makefile.am (libical_util_la_LIBADD):
	libical.la -> libical-evolution.la

	* calendar/importers/Makefile.am
	(libevolution_calendar_importers_la_LIBADD):
	libicalvcal.la -> libicalvcal-evolution.la

	* shell/Makefile.am (evolution_LDADD):
	libical.la -> libical-evolution.la

	* libical/configure.in: Require flex 2.5.31 and add a test for it.
	Rename WITH_CXX conditional to WITH_CXX_BINDINGS.

	* libical/examples/Makefile.am (doesnothing_LDADD): Add -evolution to
	lib names.

	* libical/src/test/Makefile.am: WITH_CXX -> WITH_CXX_BINDINGS. Add
	-evolution to lib names.

	* libical/src/test/regression.c (main): WITH_CXX -> WITH_CXX_BINDINGS.

	* libical/src/libicalcap/Makefile.am: Add -evolution to lib names.
	Install to Evolution's priv dirs.

	* libical/src/libicalvcal/Makefile.am: Ditto.

	* libical/src/libical/Makefile.am: WITH_CXX -> WITH_CXX_BINDINGS. Add
	-evolution to lib names. Install in privlibdir. Install includes to
	$(privincludedir)/libical.

	* libical/src/libicalss/Makefile.am: Ditto.

	* libical/src/libicalss/icalsslexer.l: Replace option reentrant-bison
	with reentrant and bison-bridge. Use new Flex variable names.

	* libical/src/libical/icallexer.l:
	* libical/src/libical/icalyacc.y:
	* libical/src/libicalss/icalsslexer.c:
	* libical/src/libicalss/icalssyacc.c:
	* libical/src/libicalss/icalssyacc.h: Removed from repository.

svn path=/trunk/; revision=22633

1 files changed, 14 insertions, 14 deletions

diff --git a/libical/src/libicalss/Makefile.am b/libical/src/libicalss/Makefile.am
index ebb755c95a..359b1f029a 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.19 2003/09/11 22:04:30 hansp Exp $
+#  $Id: Makefile.am,v 1.20 2003/09/22 07:32:31 hansp Exp $
 #
 #
 # (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -46,15 +46,15 @@ BDB_SOURCEFILES=
 BDB_HEADERFILES=
 endif
 
-if WITH_CXX
-cxx_lib=libicalss_cxx.la
+if WITH_CXX_BINDINGS
+cxx_lib=libicalss-evolution_cxx.la
 cxx_headers=icalspanlist_cxx.h
 else
 cxx_lib=
 cxx_headers=
 endif
 
-lib_LTLIBRARIES = libicalss.la $(cxx_lib)
+privlib_LTLIBRARIES = libicalss-evolution.la $(cxx_lib)
 
 INCLUDES =			\
 	-I$(top_srcdir)/src	\
@@ -63,16 +63,16 @@ INCLUDES =			\
 	-I$(top_builddir)/libical \
 	$(BDB_INCLUDE)
 
-libicalss_la_LDFLAGS = -version-info 0:0:0
-libicalss_la_LIBADD = $(BDB_LIBFILES)
+libicalss_evolution_la_LDFLAGS = -version-info 0:0:0
+libicalss_evolution_la_LIBADD = $(BDB_LIBFILES)
 
 if DEV
-libicalss_la_DEVSOURCES = icalsslexer.l icalssyacc.y
+libicalss_evolution_la_DEVSOURCES = icalsslexer.l icalssyacc.y
 else
-libicalss_la_DEVSOURCES = icalsslexer.c icalssyacc.c
+libicalss_evolution_la_DEVSOURCES = icalsslexer.c icalssyacc.c
 endif
 
-libicalss_la_SOURCES =		\
+libicalss_evolution_la_SOURCES =		\
 	icalcalendar.c		\
 	icalcalendar.h		\
 	icalclassify.c		\
@@ -97,9 +97,9 @@ libicalss_la_SOURCES =		\
 	icalmessage.c		\
 	icalmessage.h		\
 	$(BDB_SOURCEFILES)	\
-	$(libicalss_la_DEVSOURCES)
+	$(libicalss_evolution_la_DEVSOURCES)
 
-libicalssincludedir = $(includedir)
+libicalssincludedir = $(privincludedir)/libical
 
 COMBINEDHEADERS = \
         $(srcdir)/icalgauge.h \
@@ -130,9 +130,9 @@ icalss.h: $(COMBINEDHEADERS)
 	echo '#endif'                     >> icalss.h
 
 
-if WITH_CXX
-libicalss_cxx_la_SOURCES =	\
-	$(libicalss_la_SOURCES)	\
+if WITH_CXX_BINDINGS
+libicalss_evolution_cxx_la_SOURCES =	\
+	$(libicalss_evolution_la_SOURCES)	\
 	icalspanlist_cxx.h	\
 	icalspanlist_cxx.cpp