From 515ebfd45c748cf31e2f45fe9180f97e08051498 Mon Sep 17 00:00:00 2001 From: Peter Williams Date: Wed, 17 Jul 2002 21:03:19 +0000 Subject: Install libversit.a so that people compiling against the addressbook can 2002-07-09 Peter Williams * 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-08 Peter Williams * 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 * 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 Peter Williams * 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-07-03 Peter Williams * Makefile.am: Install libeutil, libeconduit, and libedb3util and their headers. 2002-07-08 Peter Williams * Makefile.am: Reference the new libefilterbar.a. 2002-07-12 Peter Williams * 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-09 Peter Williams * 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. svn path=/trunk/; revision=17496 --- calendar/ChangeLog | 16 ++++++++++++++++ calendar/cal-util/Makefile.am | 5 +++-- calendar/pcs/Makefile.am | 34 ++++++++++++++++++++++------------ calendar/pcs/cal-backend-file.h | 2 +- calendar/pcs/cal-backend-util.h | 2 +- calendar/pcs/cal-backend.h | 8 ++++---- calendar/pcs/cal-factory.h | 2 +- calendar/pcs/cal.h | 4 ++-- calendar/pcs/query.h | 4 ++-- 9 files changed, 52 insertions(+), 25 deletions(-) (limited to 'calendar') 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 + + * 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 * 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 -#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 -#include +#include 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 #include #include -#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 #include -#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 #include -#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 #include -#include "cal-common.h" -#include "evolution-calendar.h" +#include "pcs/cal-common.h" +#include "pcs/evolution-calendar.h" BEGIN_GNOME_DECLS -- cgit v1.2.3