diff options
29 files changed, 275 insertions, 116 deletions
@@ -1,3 +1,14 @@ +2002-07-09 Peter Williams <peterw@ximian.com> + + * libversit/Makefile.am (privlib_LIBRARIES): Install libversit.a so + that people compiling against the addressbook can do so successfully. + + * Makefile.am: create our *Conf.sh files and dist them and install + them. + + * configure.in: Define and subst some variables that the Conf.sh + file need. + 2002-07-10 Peter Williams <peterw@ximian.com> * configure.in (privlibdir): Define a versioned library directory that we can diff --git a/Makefile.am b/Makefile.am index df0a66c3fb..d7c2bef2ca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,13 @@ changelogs = \ ChangeLog +confexecdir = $(libdir) +confexec_DATA = \ + camelConf.sh \ + evolution_shellConf.sh \ + evolution_addressbookConf.sh \ + evolution_calendarConf.sh + EXTRA_DIST = \ AUTHORS \ $(changelogs) \ @@ -11,7 +18,8 @@ EXTRA_DIST = \ NEWS \ xml-i18n-merge.in \ xml-i18n-update.in \ - xml-i18n-extract.in + xml-i18n-extract.in \ + $(confexec_DATA:.sh=.sh.in) SUBDIRS = \ intl \ @@ -43,3 +51,23 @@ SUBDIRS = \ po \ omf-install +%Conf.sh: %Conf.sh.in Makefile + sed -e 's?\@EVOLUTION_LIBDIR\@?$(EVOLUTION_LIBDIR)?g' \ + -e 's?\@EVOLUTION_DATADIR\@?$(EVOLUTION_DATADIR)?g' \ + -e 's?\@EVOLUTION_INCLUDEDIR\@?$(EVOLUTION_INCLUDEDIR)?g' \ + -e 's?\@CAMEL_INCLUDEDIR\@?$(CAMEL_INCLUDEDIR)?g' \ + -e 's?\@VERSION\@?$(VERSION)?g' \ + -e 's?\@privlibdir\@?$(privlibdir)?g' \ + -e 's?\@SHELL_LIBS\@?$(SHELL_LIBS)?g' \ + -e 's?\@SHELL_CFLAGS\@?$(SHELL_CFLAGS)?g' \ + -e 's?\@CAMEL_LIBS\@?$(CAMEL_LIBS)?g' \ + -e 's?\@CAMEL_CFLAGS\@?$(CAMEL_CFLAGS)?g' \ + -e 's?\@LDAP_LIBS\@?$(LDAP_LIBS)?g' \ + -e 's?\@LDAP_CFLAGS\@?$(LDAP_CFLAGS)?g' \ + -e 's?\@EVOLUTION_ADDRESSBOOK_LIBS\@?$(EVOLUTION_ADDRESSBOOK_LIBS)?g' \ + -e 's?\@EVOLUTION_ADDRESSBOOK_CFLAGS\@?$(EVOLUTION_ADDRESSBOOK_CFLAGS)?g' \ + -e 's?\@EVOLUTION_CALENDAR_LIBS\@?$(EVOLUTION_CALENDAR_LIBS)?g' \ + -e 's?\@EVOLUTION_CALENDAR_CFLAGS\@?$(EVOLUTION_CALENDAR_CFLAGS)?g' \ + < $(srcdir)/$< > $@.tmp \ + && mv $@.tmp $@ + diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 25855fb26f..6d3cba4f69 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -30,6 +30,14 @@ 2002-07-08 Peter Williams <peterw@ximian.com> + * backend/ebook/Makefile.am: Install libebook-static.la. + Also change --all-static to -all-static, which is the right flag. + + * backend/pas/Makefile.am: Install the PAS headers in + $(includedir)/evolution/pas. Install libpas.a + +2002-07-08 Peter Williams <peterw@ximian.com> + * gui/component/select-names/Makefile.am (idl_DATA): Install the SelectNames IDL and ancillary changes. diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am index 2d87a95816..307ec123fd 100644 --- a/addressbook/backend/ebook/Makefile.am +++ b/addressbook/backend/ebook/Makefile.am @@ -37,7 +37,7 @@ INCLUDES = \ -I$(top_srcdir)/shell \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) -lib_LTLIBRARIES = libebook.la +privlib_LTLIBRARIES = libebook.la libebook-static.la libebook_la_SOURCES = \ $(CORBA_SOURCE) \ @@ -73,10 +73,8 @@ libebookinclude_HEADERS = \ # # make a static library for use by addressbook's conduit's shared library # -noinst_LTLIBRARIES = libebook-static.la libebook_static_la_SOURCES = $(libebook_la_SOURCES) -libebook_static_la_LDFLAGS = --all-static - +libebook_static_la_LDFLAGS = -all-static test_client_SOURCES = \ test-client.c diff --git a/addressbook/backend/pas/Makefile.am b/addressbook/backend/pas/Makefile.am index 237a11b83a..7cdea8dac5 100644 --- a/addressbook/backend/pas/Makefile.am +++ b/addressbook/backend/pas/Makefile.am @@ -1,9 +1,12 @@ -CORBA_SOURCE = \ - addressbook.h \ +CORBA_SOURCE_H = addressbook.h + +CORBA_SOURCE_C = \ addressbook-common.c \ addressbook-stubs.c \ addressbook-skels.c +CORBA_SOURCE = $(CORBA_SOURCE_H) $(CORBA_SOURCE_C) + idls = \ $(srcdir)/../idl/addressbook.idl @@ -25,40 +28,50 @@ INCLUDES = \ LDAP_SCHEMA = \ evolutionperson.schema -LDAP_BACKEND_FILES = pas-backend-ldap.c pas-backend-ldap.h +LDAP_BACKEND_FILES_C = pas-backend-ldap.c +LDAP_BACKEND_FILES_H = pas-backend-ldap.h if ENABLE_LDAP -LDAP_BACKEND = $(LDAP_BACKEND_FILES) +LDAP_BACKEND_C = $(LDAP_BACKEND_FILES_C) +LDAP_BACKEND_H = $(LDAP_BACKEND_FILES_H) else -LDAP_BACKEND = +LDAP_BACKEND_C = +LDAP_BACKEND_H = endif -noinst_LIBRARIES = libpas.a +privlib_LIBRARIES = libpas.a -libpas_a_SOURCES = \ - $(CORBA_SOURCE) \ - pas-book-factory.c \ +pasincludedir = $(includedir)/evolution/pas + +pasinclude_HEADERS = \ + $(CORBA_SOURCE_H) \ pas-book-factory.h \ - pas-book-view.c \ pas-book-view.h \ - pas-book.c \ pas-book.h \ - pas-backend-card-sexp.c \ pas-backend-card-sexp.h \ - pas-backend-file.c \ pas-backend-file.h \ - $(LDAP_BACKEND) \ - pas-backend.c \ + $(LDAP_BACKEND_H) \ pas-backend.h \ - pas-backend-summary.c \ pas-backend-summary.h \ - pas-card-cursor.c \ pas-card-cursor.h +libpas_a_SOURCES = \ + $(pasinclude_HEADERS) \ + $(CORBA_SOURCE_C) \ + pas-book-factory.c \ + pas-book-view.c \ + pas-book.c \ + pas-backend-card-sexp.c \ + pas-backend-file.c \ + $(LDAP_BACKEND_C) \ + pas-backend.c \ + pas-backend-summary.c \ + pas-card-cursor.c + BUILT_SOURCES = $(CORBA_SOURCE) CLEANFILES = $(BUILT_SOURCES) dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) -EXTRA_DIST = $(LDAP_BACKEND_FILES) $(LDAP_SCHEMA) +EXTRA_DIST = $(LDAP_BACKEND_FILES_C) $(LDAP_BACKEND_FILES_H) $(LDAP_SCHEMA) diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 034c01f335..cf526ca79c 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,19 @@ +2002-07-08 Peter Williams <peterw@ximian.com> + + * cal-util/Makefile.am: Install libcal-util-static.la + and fix the -all-static flag to make it install statically. + + * pcs/Makefile.am: Install libpcs.a and its headers. + + * pcs/cal-backend-util.h: Same sort of include namespacing fix, + but for pcs. + + * pcs/cal.h: + * pcs/query.h: + * pcs/cal-factory.h: + * pcs/cal-backend.h: + * pcs/cal-backend-file.h: Same. + 2002-07-17 <jpr@ximian.com> * gui/calendar-model.c (calendar_model_value_at): use util diff --git a/calendar/cal-util/Makefile.am b/calendar/cal-util/Makefile.am index bb94577c16..40ad034cf8 100644 --- a/calendar/cal-util/Makefile.am +++ b/calendar/cal-util/Makefile.am @@ -17,6 +17,7 @@ INCLUDES = \ # lib_LTLIBRARIES = libcal-util.la +privlib_LTLIBRARIES = libcal-util-static.la libcal_util_la_SOURCES = \ cal-component.c \ @@ -35,9 +36,9 @@ libcal_utilinclude_HEADERS = \ # # static library for use in conduits' shared libraries # -noinst_LTLIBRARIES = libcal-util-static.la +#lib_LTLIBRARIES = libcal-util-static.la libcal_util_static_la_SOURCES = $(libcal_util_la_SOURCES) -libcal_util_static_la_LDFLAGS = --all-static +libcal_util_static_la_LDFLAGS = -all-static test_recur_SOURCES = \ test-recur.c diff --git a/calendar/pcs/Makefile.am b/calendar/pcs/Makefile.am index 57c24d3130..0c9800bd4d 100644 --- a/calendar/pcs/Makefile.am +++ b/calendar/pcs/Makefile.am @@ -2,6 +2,7 @@ INCLUDES = \ -DG_LOG_DOMAIN=\"wombat-pcs\" \ -I$(top_srcdir) \ -I$(top_srcdir)/calendar \ + -I$(top_builddir)/calendar \ -I$(top_srcdir)/libical/src/libical \ -I$(top_builddir)/libical/src/libical \ -I$(top_srcdir)/libwombat \ @@ -9,12 +10,16 @@ INCLUDES = \ -DGNOMELOCALEDIR=\""$(localedir)"\" \ $(EVOLUTION_CALENDAR_CFLAGS) -CORBA_GENERATED = \ - evolution-calendar.h \ +CORBA_GENERATED_H = \ + evolution-calendar.h + +CORBA_GENERATED_C = \ evolution-calendar-common.c \ evolution-calendar-skels.c \ evolution-calendar-stubs.c +CORBA_GENERATED = $(CORBA_GENERATED_H) $(CORBA_GENERATED_C) + idls = \ $(srcdir)/../idl/evolution-calendar.idl @@ -23,26 +28,31 @@ idl_flags = -I $(srcdir) `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl $(CORBA_GENERATED): $(idls) $(ORBIT_IDL) $(idl_flags) $(srcdir)/../idl/evolution-calendar.idl -noinst_LIBRARIES = libpcs.a +pcsincludedir = $(includedir)/evolution/pcs -libpcs_a_SOURCES = \ - $(CORBA_GENERATED) \ - cal.c \ +privlib_LIBRARIES = libpcs.a + +pcsinclude_HEADERS = \ + $(CORBA_GENERATED_H) \ cal.h \ - cal-backend.c \ cal-backend.h \ - cal-backend-file.c \ cal-backend-file.h \ - cal-backend-util.c \ cal-backend-util.h \ cal-common.h \ - cal-factory.c \ cal-factory.h \ - job.c \ job.h \ - query.c \ query.h +libpcs_a_SOURCES = \ + $(pcsinclude_HEADERS) \ + $(CORBA_GENERATED_C) \ + cal.c \ + cal-backend.c \ + cal-backend-file.c \ + cal-backend-util.c \ + cal-factory.c \ + job.c \ + query.c BUILT_SOURCES = $(CORBA_GENERATED) CLEANFILES = $(BUILT_SOURCES) diff --git a/calendar/pcs/cal-backend-file.h b/calendar/pcs/cal-backend-file.h index c90feddea3..30fc210dd8 100644 --- a/calendar/pcs/cal-backend-file.h +++ b/calendar/pcs/cal-backend-file.h @@ -23,7 +23,7 @@ #define CAL_BACKEND_FILE_H #include <libgnome/gnome-defs.h> -#include "cal-backend.h" +#include "pcs/cal-backend.h" BEGIN_GNOME_DECLS diff --git a/calendar/pcs/cal-backend-util.h b/calendar/pcs/cal-backend-util.h index f10267453a..aed52f4bb7 100644 --- a/calendar/pcs/cal-backend-util.h +++ b/calendar/pcs/cal-backend-util.h @@ -24,7 +24,7 @@ #define CAL_BACKEND_UTIL_H #include <bonobo-conf/bonobo-config-database.h> -#include <cal-backend.h> +#include <pcs/cal-backend.h> BEGIN_GNOME_DECLS diff --git a/calendar/pcs/cal-backend.h b/calendar/pcs/cal-backend.h index 26b3456e9e..b3647d9720 100644 --- a/calendar/pcs/cal-backend.h +++ b/calendar/pcs/cal-backend.h @@ -27,10 +27,10 @@ #include <libgnome/gnome-defs.h> #include <cal-util/cal-util.h> #include <cal-util/cal-component.h> -#include "evolution-calendar.h" -#include "cal-common.h" -#include "cal.h" -#include "query.h" +#include "pcs/evolution-calendar.h" +#include "pcs/cal-common.h" +#include "pcs/cal.h" +#include "pcs/query.h" BEGIN_GNOME_DECLS diff --git a/calendar/pcs/cal-factory.h b/calendar/pcs/cal-factory.h index 46a66ed9a0..7e83cfd2b7 100644 --- a/calendar/pcs/cal-factory.h +++ b/calendar/pcs/cal-factory.h @@ -24,7 +24,7 @@ #include <libgnome/gnome-defs.h> #include <bonobo/bonobo-xobject.h> -#include "evolution-calendar.h" +#include "pcs/evolution-calendar.h" BEGIN_GNOME_DECLS diff --git a/calendar/pcs/cal.h b/calendar/pcs/cal.h index 81c3e55154..9b6636b9d0 100644 --- a/calendar/pcs/cal.h +++ b/calendar/pcs/cal.h @@ -25,8 +25,8 @@ #include <libgnome/gnome-defs.h> #include <bonobo/bonobo-xobject.h> -#include "evolution-calendar.h" -#include "cal-common.h" +#include "pcs/evolution-calendar.h" +#include "pcs/cal-common.h" BEGIN_GNOME_DECLS diff --git a/calendar/pcs/query.h b/calendar/pcs/query.h index 80b17983a6..4e732aefd4 100644 --- a/calendar/pcs/query.h +++ b/calendar/pcs/query.h @@ -23,8 +23,8 @@ #include <libgnome/gnome-defs.h> #include <bonobo/bonobo-xobject.h> -#include "cal-common.h" -#include "evolution-calendar.h" +#include "pcs/cal-common.h" +#include "pcs/evolution-calendar.h" BEGIN_GNOME_DECLS diff --git a/configure.in b/configure.in index 81cd2773e0..8cd64843ce 100644 --- a/configure.in +++ b/configure.in @@ -1225,6 +1225,20 @@ AM_CONDITIONAL(HAVE_KDE_APPLNK, test x"$KDE_APPLNK_DIR" != x) AC_SUBST(KDE_APPLNK_DIR) dnl ****************************** +dnl foo for *Conf.sh.in +dnl ****************************** + +EVOLUTION_LIBDIR="-L${libdir}" +EVOLUTION_DATADIR="${datadir}" +EVOLUTION_INCLUDEDIR="-I${includedir}/evolution" +CAMEL_INCLUDEDIR="-I${includedir}/camel" + +AC_SUBST(EVOLUTION_LIBDIR) +AC_SUBST(EVOLUTION_DATADIR) +AC_SUBST(EVOLUTION_INCLUDEDIR) +AC_SUBST(CAMEL_INCLUDEDIR) + +dnl ****************************** dnl Makefiles dnl ****************************** diff --git a/doc/devel/ChangeLog b/doc/devel/ChangeLog index e4edcaaf77..c904329f5c 100644 --- a/doc/devel/ChangeLog +++ b/doc/devel/ChangeLog @@ -1,3 +1,11 @@ +2002-07-17 Peter Williams <peterw@ximian.com> + + * calendar/cal-util/Makefile.am (GTKDOC_LIBS): Because we're + using libtool as our LD, we can reference .la's and libtool + will DTRT for us. + + * calendar/cal-client/Makefile.am (GTKDOC_LIBS): Same here. + 2002-03-19 Dan Winship <danw@ximian.com> * calendar/cal-util/Makefile.am (GTKDOC_LIBS): Update for diff --git a/doc/devel/calendar/cal-client/Makefile.am b/doc/devel/calendar/cal-client/Makefile.am index 0e097c701f..4ff753e9d4 100644 --- a/doc/devel/calendar/cal-client/Makefile.am +++ b/doc/devel/calendar/cal-client/Makefile.am @@ -54,9 +54,9 @@ GTKDOC_CFLAGS= \ GTKDOC_LIBS= \ $(EVOLUTION_CALENDAR_LIBS) \ - $(top_builddir)/calendar/cal-client/.libs/libcal-client-static.al \ - $(top_builddir)/calendar/cal-util/.libs/libcal-util-static.al \ - $(top_builddir)/libical/src/libical/.libs/libical-static.al \ + $(top_builddir)/calendar/cal-client/libcal-client-static.la \ + $(top_builddir)/calendar/cal-util/libcal-util-static.la \ + $(top_builddir)/libical/src/libical/libical-static.la \ $(top_builddir)/libversit/libversit.a \ $(top_builddir)/libwombat/libwombat.la diff --git a/doc/devel/calendar/cal-util/Makefile.am b/doc/devel/calendar/cal-util/Makefile.am index fc2ff32368..cb1ce69533 100644 --- a/doc/devel/calendar/cal-util/Makefile.am +++ b/doc/devel/calendar/cal-util/Makefile.am @@ -59,8 +59,8 @@ GTKDOC_CFLAGS = \ GTKDOC_LIBS = \ $(EVOLUTION_CALENDAR_LIBS) \ - $(top_builddir)/calendar/cal-util/.libs/libcal-util-static.al \ - $(top_builddir)/libical/src/libical/.libs/libical-static.al \ + $(top_builddir)/calendar/cal-util/libcal-util-static.la \ + $(top_builddir)/libical/src/libical/libical-static.la \ $(top_builddir)/libversit/libversit.a GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC) @@ -193,4 +193,4 @@ dist-hook: dist-check-gtkdoc dist-hook-local test '$(srcdir)/sgml/*.sgml' = "$$files" \ || cp $$files $(distdir)/sgml -.PHONY : dist-hook-local
\ No newline at end of file +.PHONY : dist-hook-local diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 788868c281..2adf6d433b 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,8 @@ +2002-07-03 Peter Williams <peterw@ximian.com> + + * Makefile.am: Install libeutil, libeconduit, and libedb3util and + their headers. + 2002-07-15 Not Zed <NotZed@Ximian.com> * e-sexp.c (term_eval_caststring): Cast to a string type. diff --git a/e-util/Makefile.am b/e-util/Makefile.am index ebcb439c4e..f7b4bb4d8c 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -2,6 +2,10 @@ SUBDIRS = . ename imagesdir = $(datadir)/images/evolution +eutilincludedir = $(includedir)/evolution/e-util +econdincludedir = $(includedir)/evolution/e-conduit +edb3includedir = $(includedir)/evolution/e-db3util + INCLUDES = \ -I$(top_srcdir) \ -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \ @@ -11,74 +15,79 @@ INCLUDES = \ $(PISOCK_CFLAGS) \ $(E_UTIL_CFLAGS) -noinst_LTLIBRARIES = libeutil.la libeutil-static.la \ - libeconduit.la libeconduit-static.la \ - libedb3util.la +privlib_LTLIBRARIES = libeutil.la libedb3util.la libeconduit.la +noinst_LTLIBRARIES = libeutil-static.la libeconduit-static.la -libeutil_la_SOURCES = \ - e-bonobo-factory-util.c \ +eutilinclude_HEADERS = \ e-bonobo-factory-util.h \ - e-categories-master-list-wombat.c \ e-categories-master-list-wombat.h \ - e-categories-config.c \ e-categories-config.h \ - e-corba-utils.c \ e-corba-utils.h \ - e-dialog-utils.c \ e-dialog-utils.h \ - e-dialog-widgets.c \ e-dialog-widgets.h \ - e-gtk-utils.c \ e-gtk-utils.h \ - e-gui-utils.c \ e-gui-utils.h \ - e-host-utils.c \ e-host-utils.h \ - e-html-utils.c \ e-html-utils.h \ - e-iterator.c \ e-iterator.h \ - e-lang-utils.c \ e-lang-utils.h \ - e-list-iterator.c \ e-list-iterator.h \ - e-list.c \ e-list.h \ - e-memory.c \ e-memory.h \ - e-mktemp.c \ e-mktemp.h \ - e-msgport.c \ e-msgport.h \ - e-passwords.c \ e-passwords.h \ - e-path.c \ e-path.h \ - e-request.c \ e-request.h \ - e-sexp.c \ e-sexp.h \ - e-time-utils.c \ e-time-utils.h \ - e-url.c \ e-url.h \ - md5-utils.c \ md5-utils.h +libeutil_la_SOURCES = \ + $(eutilinclude_HEADERS) \ + e-bonobo-factory-util.c \ + e-categories-master-list-wombat.c \ + e-categories-config.c \ + e-corba-utils.c \ + e-dialog-utils.c \ + e-dialog-widgets.c \ + e-gtk-utils.c \ + e-gui-utils.c \ + e-host-utils.c \ + e-html-utils.c \ + e-iterator.c \ + e-lang-utils.c \ + e-list-iterator.c \ + e-list.c \ + e-memory.c \ + e-mktemp.c \ + e-msgport.c \ + e-passwords.c \ + e-path.c \ + e-request.c \ + e-sexp.c \ + e-time-utils.c \ + e-url.c \ + md5-utils.c + libeutil_la_LIBADD = $(E_UTIL_LIBS) libeutil_static_la_SOURCES = $(libeutil_la_SOURCES) libeutil_static_la_LIBADD = $(libeutil_la_LIBADD) -libeutil_static_la_LDFLAGS = --all-static +libeutil_static_la_LDFLAGS = -all-static -pilot_sources = \ - e-pilot-map.c \ +econdinclude_HEADERS = \ e-pilot-map.h \ - e-pilot-settings.c \ e-pilot-settings.h \ - e-pilot-util.c \ e-pilot-util.h +pilot_sources = \ + $(econdinclude_HEADERS) \ + e-pilot-map.c \ + e-pilot-settings.c \ + e-pilot-util.c + if ENABLE_PILOT_CONDUITS pilot_compile = $(pilot_sources) else @@ -88,12 +97,15 @@ endif libeconduit_la_SOURCES = $(pilot_compile) libeconduit_static_la_SOURCES = $(libeconduit_la_SOURCES) -libeconduit_static_la_LDFLAGS = --all-static +libeconduit_static_la_LDFLAGS = -all-static EXTRA_DIST = $(pilot_sources) -libedb3util_la_SOURCES = \ - e-db3-utils.c \ +edb3include_HEADERS = \ e-db3-utils.h \ - e-dbhash.c \ e-dbhash.h + +libedb3util_la_SOURCES = \ + $(edb3include_HEADERS) \ + e-db3-utils.c \ + e-dbhash.c diff --git a/libversit/Makefile.am b/libversit/Makefile.am index a102d1be3e..60ce4a41d1 100644 --- a/libversit/Makefile.am +++ b/libversit/Makefile.am @@ -1,6 +1,6 @@ # Makefile for libversit.a -# $Id: Makefile.am,v 1.10 2002/04/23 16:44:40 srittau Exp $ +# $Id: Makefile.am,v 1.11 2002/07/17 21:03:11 peterw Exp $ VERSIT_SRC = \ vcc.y \ @@ -11,7 +11,7 @@ VERSIT_SRC = \ vcaltmp.c \ vcaltmp.h -noinst_LIBRARIES = libversit.a +privlib_LIBRARIES = libversit.a noinst_LTLIBRARIES = libversit_lt.la libversit_a_SOURCES = $(VERSIT_SRC) diff --git a/mail/ChangeLog b/mail/ChangeLog index b46a9a8f01..27d721e4de 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,7 @@ +2002-07-08 Peter Williams <peterw@ximian.com> + + * Makefile.am: Reference the new libefilterbar.a. + 2002-07-17 Radek Doulik <rodo@ximian.com> * mail-callbacks.c (save_draft_done): use "saved" gtkhtml command diff --git a/mail/Makefile.am b/mail/Makefile.am index 37a9c77395..4d480345a1 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -143,6 +143,7 @@ evolution_mail_LDADD = \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/composer/libcomposer.a \ $(top_builddir)/widgets/misc/libemiscwidgets.a \ + $(top_builddir)/widgets/misc/libefilterbar.a \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ $(top_builddir)/libversit/libversit.a \ $(top_builddir)/e-util/ename/libename.la \ diff --git a/shell/ChangeLog b/shell/ChangeLog index 221df2455b..549d0711ac 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -25,6 +25,12 @@ 2002-07-12 Peter Williams <peterw@ximian.com> + * Makefile.am (INCLUDES): Add -I$(builddir)/libical/src/libical + for the generated ical.h (some headers rely on this because + they too get installed.) + +2002-07-12 Peter Williams <peterw@ximian.com> + * Makefile.am (eshellinclude_HEADERS): Install some headers that weren't getting installed. diff --git a/shell/Makefile.am b/shell/Makefile.am index 41decb9688..7a08ce2d9f 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -4,6 +4,7 @@ INCLUDES = -O \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/widgets/misc \ -I$(top_srcdir)/libical/src/libical \ + -I$(top_builddir)/libical/src/libical \ -I$(top_srcdir) \ -DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\" \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ diff --git a/widgets/ChangeLog b/widgets/ChangeLog index bf51ead15c..80ffca1cf9 100644 --- a/widgets/ChangeLog +++ b/widgets/ChangeLog @@ -1,3 +1,14 @@ +2002-07-09 Peter Williams <peterw@ximian.com> + + * e-timezone-dialog/Makefile.am: Add -I$(top_builddir)/libical/src/libical; + some headers that we rely on get installed, so they point to the ical.h that + gets generated and installed; consequently we need to be able to find the + generated ical.h + + * misc/Makefile.am: Install libemiscwidgets.a and its headers. However, + break EFilterBar into a separate libefilterbar.a because we don't want + the installed library to depend on libfilter. + 2002-07-05 Ettore Perazzoli <ettore@ximian.com> * e-timezone-dialog/e-timezone-dialog.c (e_timezone_dialog_init): diff --git a/widgets/e-timezone-dialog/Makefile.am b/widgets/e-timezone-dialog/Makefile.am index 3c8c46fd07..b308e424e3 100644 --- a/widgets/e-timezone-dialog/Makefile.am +++ b/widgets/e-timezone-dialog/Makefile.am @@ -1,6 +1,7 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/libical/src/libical \ + -I$(top_builddir)/libical/src/libical \ -DMAP_DIR=\""$(datadir)/images/evolution"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DG_LOG_DOMAIN=__FILE__ \ diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am index 0b274552ff..3e71f36498 100644 --- a/widgets/misc/Makefile.am +++ b/widgets/misc/Makefile.am @@ -9,47 +9,58 @@ INCLUDES = \ -DG_LOG_DOMAIN=__FILE__ \ $(GNOME_FULL_CFLAGS) -noinst_LIBRARIES = \ +privlib_LIBRARIES = \ libemiscwidgets.a -libemiscwidgets_a_SOURCES = \ - e-bonobo-widget.c \ +widgetsincludedir = $(includedir)/evolution/widgets + +widgetsinclude_HEADERS = \ e-bonobo-widget.h \ - e-calendar.c \ e-calendar.h \ - e-calendar-item.c \ e-calendar-item.h \ - e-cell-date-edit.c \ e-cell-date-edit.h \ - e-cell-percent.c \ e-cell-percent.h \ - e-charset-picker.c \ e-charset-picker.h \ - e-clipped-label.c \ e-clipped-label.h \ - e-config-page.c \ e-config-page.h \ - e-combo-button.c \ e-combo-button.h \ - e-dateedit.c \ e-dateedit.h \ - e-dropdown-button.c \ e-dropdown-button.h \ - e-filter-bar.c \ - e-filter-bar.h \ - e-map.c \ e-map.h \ - e-messagebox.c \ e-messagebox.h \ - e-multi-config-dialog.c \ e-multi-config-dialog.h \ - e-search-bar.c \ e-search-bar.h \ - e-title-bar.c \ e-title-bar.h \ - e-url-entry.c \ e-url-entry.h +libemiscwidgets_a_SOURCES = \ + $(widgetsinclude_HEADERS) \ + e-bonobo-widget.c \ + e-calendar.c \ + e-calendar-item.c \ + e-cell-date-edit.c \ + e-cell-percent.c \ + e-charset-picker.c \ + e-clipped-label.c \ + e-config-page.c \ + e-combo-button.c \ + e-dateedit.c \ + e-dropdown-button.c \ + e-map.c \ + e-messagebox.c \ + e-multi-config-dialog.c \ + e-search-bar.c \ + e-title-bar.c \ + e-url-entry.c + +libemiscwidgets_a_LIBADD = $(top_builddir)/e-util/libeutil.la + +noinst_LIBRARIES = libefilterbar.a + +libefilterbar_a_SOURCES = \ + e-filter-bar.c \ + e-filter-bar.h + noinst_PROGRAMS = \ test-calendar \ test-dateedit \ diff --git a/wombat/Makefile.am b/wombat/Makefile.am index de3797878a..8a4b6889b2 100644 --- a/wombat/Makefile.am +++ b/wombat/Makefile.am @@ -5,8 +5,8 @@ INCLUDES = \ -I$(top_srcdir)/addressbook/backend \ -I$(top_builddir)/addressbook/backend \ -I$(top_srcdir)/calendar \ - -I$(top_srcdir)/calendar/pcs \ - -I$(top_builddir)/calendar/pcs \ + -I$(top_srcdir)/calendar \ + -I$(top_builddir)/calendar \ -I$(top_srcdir)/libical/src/libical \ -I$(top_builddir)/libical/src/libical \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ |