use privincludedir

2003-11-05  JP Rosevear  <jpr@ximian.com>

	* libebook/Makefile.am: use privincludedir

	* libedatabook/Makefile.am: ditto

	* libedatabook/libedatabook-1.0.pc.in: use privincludedir; remove
	gal

	* libebook/libebook-1.0.pc.in: ditto

2003-11-05  JP Rosvear <jpr@ximian.com>

	* libecal/Makefile.am: use privincludedir

	* libedatacal/Makefile.am: ditto

	* libecal/libecal-1.0.pc.in: ditto

	* libedatacal/libedatacal-1.0.pc.in: use privincludedir; remove
	gal

2003-11-05 JP Rosevear <jpr@ximian.com>

	* configure.in: make the priv*dir's sane

	* libedataserver/libedataserver-1.0.pc.in: use privincludedir;
	remove gal

	* libedataserver/ename/Makefile.am: ditto

	* libedataserver/Makefile.am: install to privincludedir

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

diff --git a/ChangeLog b/ChangeLog
index 2ccdd35..a3d5ea2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2003-11-05 JP Rosevear <jpr@ximian.com>
+
+       * configure.in: make the priv*dir's sane
+
+       * libedataserver/libedataserver-1.0.pc.in: use privincludedir;
+       remove gal
+
+       * libedataserver/ename/Makefile.am: ditto
+
+       * libedataserver/Makefile.am: install to privincludedir
+       
 2003-11-05  Rodrigo Moya <rodrigo@ximian.com>
 
        * libedataserver/e-util.[ch]: new files to contain a few functions

diff --git a/TODO b/TODO
index 6886922..5a2a445 100644 (file)
--- a/TODO
+++ b/TODO
@@ -6,6 +6,4 @@
 -ensure license
 -ensure authors
 -G_STRLOC for errors
--remove remaining gal usage
--figure out where to install libical
 -have backends link separately
\ No newline at end of file

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index e111853..662f4d7 100644 (file)
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,14 @@
+2003-11-05  JP Rosevear  <jpr@ximian.com>
+
+       * libebook/Makefile.am: use privincludedir
+
+       * libedatabook/Makefile.am: ditto
+
+       * libedatabook/libedatabook-1.0.pc.in: use privincludedir; remove
+       gal
+
+       * libebook/libebook-1.0.pc.in: ditto
+
 2003-11-05  Rodrigo Moya <rodrigo@ximian.com>
 
        * libedatabook/e-book-backend-sexp.c:

diff --git a/addressbook/libebook/Makefile.am b/addressbook/libebook/Makefile.am
index a6f5de7..d7e86f5 100644 (file)
--- a/addressbook/libebook/Makefile.am
+++ b/addressbook/libebook/Makefile.am
@@ -55,7 +55,7 @@ libebook_la_LDFLAGS =                                                         \
        -version-info $(LIBEBOOK_CURRENT):$(LIBEBOOK_REVISION):$(LIBEBOOK_AGE)  \
        -no-undefined
 
-libebookincludedir = $(includedir)/evolution-data-server-1.0/libebook
+libebookincludedir = $(privincludedir)/libebook
 
 libebookinclude_HEADERS =                              \
        $(CORBA_GENERATED_H)                            \

diff --git a/addressbook/libebook/libebook-1.0.pc.in b/addressbook/libebook/libebook-1.0.pc.in
index 499131e..143b054 100644 (file)
--- a/addressbook/libebook/libebook-1.0.pc.in
+++ b/addressbook/libebook/libebook-1.0.pc.in
@@ -6,9 +6,11 @@ includedir=@includedir@
 idldir=@idldir@
 IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@
 
+privincludedir=@privincludedir@
+
 Name: libebook
 Description: Client library for evolution address books
 Version: @VERSION@
-Requires: libbonobo-2.0 libgnome-2.0 gal-2.2 >= @GAL_REQUIRED@ libedataserver-1.0
+Requires: libbonobo-2.0 libgnome-2.0 libedataserver-1.0
 Libs: -L${libdir} -lebook
-Cflags: -I${includedir}/evolution-data-server-1.0
+Cflags: -I${privincludedir}

diff --git a/addressbook/libedata-book/Makefile.am b/addressbook/libedata-book/Makefile.am
index 2cac716..0c7f64d 100644 (file)
--- a/addressbook/libedata-book/Makefile.am
+++ b/addressbook/libedata-book/Makefile.am
@@ -75,7 +75,7 @@ libedatabook_la_LDFLAGS =                                                                     \
        -version-info $(LIBEDATABOOK_CURRENT):$(LIBEDATABOOK_REVISION):$(LIBEDATABOOK_AGE)      \
        -no-undefined
 
-libedatabookincludedir = $(includedir)/evolution-data-server-1.0/libedatabook
+libedatabookincludedir = $(privincludedir)/libedatabook
 
 libedatabookinclude_HEADERS =                          \
        $(CORBA_GENERATED_H)                            \

diff --git a/addressbook/libedata-book/libedata-book-1.0.pc.in b/addressbook/libedata-book/libedata-book-1.0.pc.in
index 2da6d9c..ed83494 100644 (file)
--- a/addressbook/libedata-book/libedata-book-1.0.pc.in
+++ b/addressbook/libedata-book/libedata-book-1.0.pc.in
@@ -6,9 +6,11 @@ includedir=@includedir@
 idldir=@idldir@
 IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@
 
+privincludedir=@privincludedir@
+
 Name: libedatabook
 Description: Backend library for evolution address books
 Version: @VERSION@
-Requires: libbonobo-2.0 libgnome-2.0  gal-2.2 >= @GAL_REQUIRED@ libedataserver-1.0 libecal-1.0
+Requires: libbonobo-2.0 libgnome-2.0 libedataserver-1.0 libecal-1.0
 Libs: -L${libdir} -ledatabook
-Cflags: -I${includedir}/evolution-data-server-1.0
+Cflags: -I${privincludedir}

diff --git a/addressbook/libedatabook/Makefile.am b/addressbook/libedatabook/Makefile.am
index 2cac716..0c7f64d 100644 (file)
--- a/addressbook/libedatabook/Makefile.am
+++ b/addressbook/libedatabook/Makefile.am
@@ -75,7 +75,7 @@ libedatabook_la_LDFLAGS =                                                                     \
        -version-info $(LIBEDATABOOK_CURRENT):$(LIBEDATABOOK_REVISION):$(LIBEDATABOOK_AGE)      \
        -no-undefined
 
-libedatabookincludedir = $(includedir)/evolution-data-server-1.0/libedatabook
+libedatabookincludedir = $(privincludedir)/libedatabook
 
 libedatabookinclude_HEADERS =                          \
        $(CORBA_GENERATED_H)                            \

diff --git a/addressbook/libedatabook/libedatabook-1.0.pc.in b/addressbook/libedatabook/libedatabook-1.0.pc.in
index 2da6d9c..ed83494 100644 (file)
--- a/addressbook/libedatabook/libedatabook-1.0.pc.in
+++ b/addressbook/libedatabook/libedatabook-1.0.pc.in
@@ -6,9 +6,11 @@ includedir=@includedir@
 idldir=@idldir@
 IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@
 
+privincludedir=@privincludedir@
+
 Name: libedatabook
 Description: Backend library for evolution address books
 Version: @VERSION@
-Requires: libbonobo-2.0 libgnome-2.0  gal-2.2 >= @GAL_REQUIRED@ libedataserver-1.0 libecal-1.0
+Requires: libbonobo-2.0 libgnome-2.0 libedataserver-1.0 libecal-1.0
 Libs: -L${libdir} -ledatabook
-Cflags: -I${includedir}/evolution-data-server-1.0
+Cflags: -I${privincludedir}

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 0d2ca32..2c9cd73 100644 (file)
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,14 @@
+2003-11-05  JP Rosvear <jpr@ximian.com>
+
+       * libecal/Makefile.am: use privincludedir
+
+       * libedatacal/Makefile.am: ditto
+
+       * libecal/libecal-1.0.pc.in: ditto
+
+       * libedatacal/libedatacal-1.0.pc.in: use privincludedir; remove
+       gal
+
 2003-11-05  JP Rosevear <jpr@ximian.com>
 
        * libecal/Makefile.am: LIBADD all the relevant libical libs

diff --git a/calendar/libecal/Makefile.am b/calendar/libecal/Makefile.am
index 945c330..17a4b4e 100644 (file)
--- a/calendar/libecal/Makefile.am
+++ b/calendar/libecal/Makefile.am
@@ -62,7 +62,7 @@ libecal_la_LDFLAGS =                                                          \
        -version-info $(LIBECAL_CURRENT):$(LIBECAL_REVISION):$(LIBECAL_AGE)     \
        -no-undefined
 
-libecalincludedir = $(includedir)/evolution-data-server-1.0/libecal
+libecalincludedir = $(privincludedir)/libecal
 
 libecalinclude_HEADERS =       \
        $(CORBA_GENERATED_H)    \

diff --git a/calendar/libecal/libecal-1.0.pc.in b/calendar/libecal/libecal-1.0.pc.in
index 72a8e0b..6056230 100644 (file)
--- a/calendar/libecal/libecal-1.0.pc.in
+++ b/calendar/libecal/libecal-1.0.pc.in
@@ -6,9 +6,11 @@ includedir=@includedir@
 idldir=@idldir@
 IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@
 
+privincludedir=@privincludedir@
+
 Name: libedatacal
 Description: Backend library for evolution calendars
 Version: @VERSION@
 Requires: libgnome-2.0 libbonobo-2.0 libedataserver-1.0
 Libs: -L${libdir} -lecal
-Cflags: -I${includedir}/evolution-data-server-1.0
+Cflags: -I${privincludedir}

diff --git a/calendar/libedata-cal/Makefile.am b/calendar/libedata-cal/Makefile.am
index 7717b0e..88dfba4 100644 (file)
--- a/calendar/libedata-cal/Makefile.am
+++ b/calendar/libedata-cal/Makefile.am
@@ -56,7 +56,7 @@ libedatacal_la_LDFLAGS =                                                              \
        -version-info $(LIBEDATACAL_CURRENT):$(LIBEDATACAL_REVISION):$(LIBEDATACAL_AGE) \
        -no-undefined
 
-libedatacalincludedir = $(includedir)/evolution-data-server-1.0/libedatacal
+libedatacalincludedir = $(privincludedir)/libedatacal
 
 libedatacalinclude_HEADERS =           \
        $(CORBA_GENERATED_H)            \

diff --git a/calendar/libedata-cal/libedata-cal-1.0.pc.in b/calendar/libedata-cal/libedata-cal-1.0.pc.in
index 52fc98d..0d0fcb7 100644 (file)
--- a/calendar/libedata-cal/libedata-cal-1.0.pc.in
+++ b/calendar/libedata-cal/libedata-cal-1.0.pc.in
@@ -6,9 +6,11 @@ includedir=@includedir@
 idldir=@idldir@
 IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@
 
+privincludedir=@privincludedir@
+
 Name: libecal
 Description: Client library for evolution calendars
 Version: @VERSION@
-Requires: libgnome-2.0 libbonobo-2.0 gal-2.2 >= @GAL_REQUIRED@ gnome-vfs-2.0 libedataserver-1.0 libecal-1.0
+Requires: libgnome-2.0 libbonobo-2.0 gnome-vfs-2.0 libedataserver-1.0 libecal-1.0
 Libs: -L${libdir} -ledatacal -lecal
-Cflags: -I${includedir}/evolution-data-server-1.0
+Cflags: -I${privincludedir}

diff --git a/calendar/libedatacal/Makefile.am b/calendar/libedatacal/Makefile.am
index 7717b0e..88dfba4 100644 (file)
--- a/calendar/libedatacal/Makefile.am
+++ b/calendar/libedatacal/Makefile.am
@@ -56,7 +56,7 @@ libedatacal_la_LDFLAGS =                                                              \
        -version-info $(LIBEDATACAL_CURRENT):$(LIBEDATACAL_REVISION):$(LIBEDATACAL_AGE) \
        -no-undefined
 
-libedatacalincludedir = $(includedir)/evolution-data-server-1.0/libedatacal
+libedatacalincludedir = $(privincludedir)/libedatacal
 
 libedatacalinclude_HEADERS =           \
        $(CORBA_GENERATED_H)            \

diff --git a/calendar/libedatacal/libedatacal-1.0.pc.in b/calendar/libedatacal/libedatacal-1.0.pc.in
index 52fc98d..0d0fcb7 100644 (file)
--- a/calendar/libedatacal/libedatacal-1.0.pc.in
+++ b/calendar/libedatacal/libedatacal-1.0.pc.in
@@ -6,9 +6,11 @@ includedir=@includedir@
 idldir=@idldir@
 IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@
 
+privincludedir=@privincludedir@
+
 Name: libecal
 Description: Client library for evolution calendars
 Version: @VERSION@
-Requires: libgnome-2.0 libbonobo-2.0 gal-2.2 >= @GAL_REQUIRED@ gnome-vfs-2.0 libedataserver-1.0 libecal-1.0
+Requires: libgnome-2.0 libbonobo-2.0 gnome-vfs-2.0 libedataserver-1.0 libecal-1.0
 Libs: -L${libdir} -ledatacal -lecal
-Cflags: -I${includedir}/evolution-data-server-1.0
+Cflags: -I${privincludedir}

diff --git a/configure.in b/configure.in
index a4bfcb8..b72962b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -607,51 +607,21 @@ BASE_VERSION=`echo $VERSION | awk -F. '{print $1 "." $2;}'`
 AC_SUBST(BASE_VERSION)
 AC_DEFINE_UNQUOTED(BASE_VERSION, "$BASE_VERSION", [Base version (Major.Minor)])
 
-privlibdir='${libdir}'/evolution/$BASE_VERSION
-AC_SUBST(privlibdir)
-
 privlibexecdir='${libexecdir}'/evolution/$BASE_VERSION
 AC_SUBST(privlibexecdir)
 
-privdatadir='${datadir}'/evolution/$BASE_VERSION
+privdatadir='${datadir}'/evolution-data-server-1.0
 AC_SUBST(privdatadir)
 
-privincludedir='${includedir}'/evolution-$BASE_VERSION
+privincludedir='${includedir}'/evolution-data-server-1.0
 AC_SUBST(privincludedir)
 
-camel_providerdir="$privlibdir/camel-providers"
-AC_SUBST(camel_providerdir)
-
-componentdir="$privlibdir/components"
-AC_SUBST(componentdir)
-
-idldir="$datadir/idl/evolution-$BASE_VERSION"
+idldir="$datadir/idl/evolution-data-server-1.0"
 AC_SUBST(idldir)
 
 serverdir="$libdir/bonobo/servers"
 AC_SUBST(serverdir)
 
-evolutionuidir="$privdatadir/ui"
-AC_SUBST(evolutionuidir)
-
-imagesdir="$privdatadir/images"
-AC_SUBST(imagesdir)
-
-buttonsdir="$privdatadir/images/buttons"
-AC_SUBST(buttonsdir)
-
-soundsdir="$privdatadir/sounds"
-AC_SUBST(soundsdir)
-
-gladedir="$privdatadir/glade"
-AC_SUBST(gladedir)
-
-etspecdir="$privdatadir/etspec"
-AC_SUBST(etspecdir)
-
-viewsdir="$privdatadir/views"
-AC_SUBST(viewsdir)
-
 dnl ************************
 dnl IDL/Component Versioning
 dnl ************************

diff --git a/libedataserver/Makefile.am b/libedataserver/Makefile.am
index 860eaf9..d758c9e 100644 (file)
--- a/libedataserver/Makefile.am
+++ b/libedataserver/Makefile.am
@@ -40,7 +40,7 @@ libedataserver_la_LDFLAGS =                                                                           \
        -version-info $(LIBEDATASERVER_CURRENT):$(LIBEDATASERVER_REVISION):$(LIBEDATASERVER_AGE)        \
        -no-undefined
 
-libedataserverincludedir = $(includedir)/evolution-data-server-1.0/libedataserver
+libedataserverincludedir = $(privincludedir)/libedataserver
 
 libedataserverinclude_HEADERS =                \
        e-account-list.h                \

diff --git a/libedataserver/ename/Makefile.am b/libedataserver/ename/Makefile.am
index 3846931..798215c 100644 (file)
--- a/libedataserver/ename/Makefile.am
+++ b/libedataserver/ename/Makefile.am
@@ -18,7 +18,7 @@ libename_la_LDFLAGS =                                                                                 \
        -version-info $(LIBEDATASERVER_CURRENT):$(LIBEDATASERVER_REVISION):$(LIBEDATASERVER_AGE)        \
        -no-undefined
 
-libenameincludedir = $(includedir)/libedataserver-1.0/libename
+libenameincludedir = $(privincludedir)/libename
 
 libenameinclude_HEADERS =                              \
        e-address-western.h                             \

diff --git a/libedataserver/libedataserver-1.0.pc.in b/libedataserver/libedataserver-1.0.pc.in
index bcf4f87..aec3231 100644 (file)
--- a/libedataserver/libedataserver-1.0.pc.in
+++ b/libedataserver/libedataserver-1.0.pc.in
@@ -6,9 +6,11 @@ includedir=@includedir@
 idldir=@idldir@
 IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@
 
+privincludedir=@privincludedir@
+
 Name: libedataserver
 Description: Utily library for evolution data servers
 Version: @VERSION@
-Requires: libbonobo-2.0 libgnome-2.0 gal-2.2 >= @GAL_REQUIRED@
+Requires: libbonobo-2.0 libgnome-2.0
 Libs: -L${libdir} -ledataserver
-Cflags: -I${includedir}/evolution-data-server-1.0
+Cflags: -I${privincludedir}