Install libversit.a so that people compiling against the addressbook can

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-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>

       * 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  <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-07-03  Peter Williams  <peterw@ximian.com>

       * Makefile.am: Install libeutil, libeconduit, and libedb3util and
       their headers.


2002-07-08  Peter Williams  <peterw@ximian.com>

       * Makefile.am: Reference the new libefilterbar.a.

 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-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.

svn path=/trunk/; revision=17496

2 files changed, 33 insertions, 22 deletions

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)