aboutsummaryrefslogtreecommitdiffstats
path: root/libical
diff options
context:
space:
mode:
authorJP Rosevear <jpr@ximian.com>2003-11-06 03:26:42 +0800
committerJP Rosevear <jpr@src.gnome.org>2003-11-06 03:26:42 +0800
commit189d7b0fc6f3fe05e69ce67c9239bab0bff4ec63 (patch)
tree71e4882796d7208854d2675cff42fc56c912ac97 /libical
parenta513b96722e37b7d5db3b6de0fdede440b0131bf (diff)
downloadgsoc2013-evolution-189d7b0fc6f3fe05e69ce67c9239bab0bff4ec63.tar
gsoc2013-evolution-189d7b0fc6f3fe05e69ce67c9239bab0bff4ec63.tar.gz
gsoc2013-evolution-189d7b0fc6f3fe05e69ce67c9239bab0bff4ec63.tar.bz2
gsoc2013-evolution-189d7b0fc6f3fe05e69ce67c9239bab0bff4ec63.tar.lz
gsoc2013-evolution-189d7b0fc6f3fe05e69ce67c9239bab0bff4ec63.tar.xz
gsoc2013-evolution-189d7b0fc6f3fe05e69ce67c9239bab0bff4ec63.tar.zst
gsoc2013-evolution-189d7b0fc6f3fe05e69ce67c9239bab0bff4ec63.zip
LIBADD all the relevant libical libs
2003-11-05 JP Rosevear <jpr@ximian.com> * libecal/Makefile.am: LIBADD all the relevant libical libs * libecal/libecal-1.0.pc.in: no need to explicitly link libical-evolution * libedatacal/libedatacal-1.0.pc.in: ditto; fix include dir svn path=/trunk/; revision=23192
Diffstat (limited to 'libical')
-rw-r--r--libical/ChangeLog8
-rw-r--r--libical/src/libical/Makefile.am6
-rw-r--r--libical/src/libicalss/Makefile.am6
-rw-r--r--libical/src/libicalvcal/Makefile.am4
4 files changed, 16 insertions, 8 deletions
diff --git a/libical/ChangeLog b/libical/ChangeLog
index ae02915d22..5b5d8c2659 100644
--- a/libical/ChangeLog
+++ b/libical/ChangeLog
@@ -1,3 +1,11 @@
+2003-11-05 JP Rosevear <jpr@ximian.com>
+
+ * src/libical/Makefile.am: ditto
+
+ * src/libicalvcal/Makefile.am: ditto
+
+ * src/libicalss/Makefile.am: don't install the library
+
2003-11-04 JP Rosevear <jpr@ximian.com>
* src/libicalvcal/Makefile.am: install headers
diff --git a/libical/src/libical/Makefile.am b/libical/src/libical/Makefile.am
index 262a4f97d7..1d3ea027c5 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.42 2003/10/23 14:42:45 danw Exp $
+# $Id: Makefile.am,v 1.43 2003/11/05 19:26:40 jpr Exp $
#
#
# (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -34,7 +34,7 @@ cxx_lib=
cxx_headers=
endif
-privlib_LTLIBRARIES = libical-evolution.la $(cxx_lib)
+noinst_LTLIBRARIES = libical-evolution.la $(cxx_lib)
AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\""$(privdatadir)"\"
@@ -113,7 +113,7 @@ libical_evolution_cxx_la_SOURCES = \
icptrholder.h
endif
-libical_evolutionincludedir = $(privincludedir)/libical
+libical_evolutionincludedir = $(includedir)/evolution-data-server-1.0/libical
libical_evolutioninclude_HEADERS = \
ical.h \
diff --git a/libical/src/libicalss/Makefile.am b/libical/src/libicalss/Makefile.am
index 1b72cd03c9..14ba3f5d02 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.22 2003/10/21 18:28:20 ettore Exp $
+# $Id: Makefile.am,v 1.23 2003/11/05 19:26:41 jpr Exp $
#
#
# (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -52,7 +52,7 @@ cxx_lib=
cxx_headers=
endif
-privlib_LTLIBRARIES = libicalss-evolution.la $(cxx_lib)
+noinst_LTLIBRARIES = libicalss-evolution.la $(cxx_lib)
INCLUDES = \
-I$(top_srcdir)/src \
@@ -94,7 +94,7 @@ libicalss_evolution_la_SOURCES = \
$(BDB_SOURCEFILES) \
$(libicalss_evolution_la_DEVSOURCES)
-libicalssincludedir = $(privincludedir)/libical
+libicalssincludedir = $(includedir)/evolution-data-server-1.0/libical
COMBINEDHEADERS = \
$(srcdir)/icalgauge.h \
diff --git a/libical/src/libicalvcal/Makefile.am b/libical/src/libicalvcal/Makefile.am
index e38e08b71d..44e266f4c4 100644
--- a/libical/src/libicalvcal/Makefile.am
+++ b/libical/src/libicalvcal/Makefile.am
@@ -1,4 +1,4 @@
-privlib_LTLIBRARIES = libicalvcal-evolution.la
+noinst_LTLIBRARIES = libicalvcal-evolution.la
INCLUDES = \
-I$(top_srcdir) \
@@ -24,7 +24,7 @@ libicalvcal_evolution_la_SOURCES = \
vcaltmp.c \
$(libicalvcal_evolution_la_DEVSOURCES)
-libicalvcal_evolutionincludedir = $(privincludedir)/libical
+libicalvcal_evolutionincludedir = $(includedir)/evolution-data-server-1.0/libical
libicalvcal_evolutioninclude_HEADERS = \
icalvcal.h \