build static versions of some util libraries for the conduit to link with

svn path=/trunk/; revision=4320

9 files changed, 44 insertions, 5 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 748c8a0c4e..553ba6b3ac 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,11 @@
+2000-07-25  Seth Alves  <alves@hungry.com>
+
+	* ename/Makefile.am (libename_static_la_LDFLAGS): build static
+	version of the library for address conduit to use
+
+	* backend/ebook/Makefile.am: build a static version of the library
+	to link into the conduit
+
 2000-07-25  Christopher James Lahey  <clahey@helixcode.com>
 
 	* backend/ebook/e-card.c: Added a #define for
diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
index 044eb9fa12..92b5fe5607 100644
--- a/addressbook/Makefile.am
+++ b/addressbook/Makefile.am
@@ -1,2 +1,2 @@
 SUBDIRS =	\
-	ename backend printing contact-editor gui
+	ename backend printing contact-editor gui conduit
diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
index c28b911271..ed05a02fcd 100644
--- a/addressbook/backend/ebook/Makefile.am
+++ b/addressbook/backend/ebook/Makefile.am
@@ -50,6 +50,15 @@ libebookinclude_HEADERS =				\
 	e-card-types.h					\
 	e-card.h
 
+
+#
+# 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
+
+
 test_client_SOURCES =					\
 	test-client.c
 
diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am
index 01c37f4a30..056045001f 100644
--- a/addressbook/conduit/Makefile.am
+++ b/addressbook/conduit/Makefile.am
@@ -42,8 +42,9 @@ libaddress_conduit_la_LDFLAGS = \
 	-rpath $(libdir)
 
 libaddress_conduit_la_LIBADD = 					\
-	$(top_builddir)/calendar/cal-client/libcal-client-static.la	\
-	$(top_builddir)/calendar/cal-util/libcal-util-static.la		\
+	$(top_builddir)/addressbook/backend/ebook/libebook-static.la	\
+	$(top_builddir)/e-util/libeutil-static.la			\
+	$(top_builddir)/addressbook/ename/libename-static.la		\
 	$(top_builddir)/libversit/libversit.la				\
 	$(top_builddir)/libical/src/libical/libical-static.la		\
 	$(BONOBO_VFS_GNOME_LIBS)					\
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
index 3c6ccf573b..d6168abb90 100644
--- a/addressbook/conduit/address-conduit.c
+++ b/addressbook/conduit/address-conduit.c
@@ -69,7 +69,7 @@ conduit_destroy_configuration(AddressbookConduitCfg **c)
 {
 	g_return_if_fail(c!=NULL);
 	g_return_if_fail(*c!=NULL);
-	g_free(*c);
+	//g_free(*c); FIX ME
 	*c = NULL;
 }
 
@@ -898,7 +898,9 @@ conduit_get_gpilot_conduit (guint32 pilotId)
 
 	printf ("in address's conduit_get_gpilot_conduit\n");
 
-	retval = gnome_pilot_conduit_standard_abs_new ("AddressDB", 0x746F646F);
+	retval = gnome_pilot_conduit_standard_abs_new ("AddressDB",
+						       0x61646472);
+
 	g_assert (retval != NULL);
 	gnome_pilot_conduit_construct(GNOME_PILOT_CONDUIT(retval),"AddressConduit");
 
diff --git a/addressbook/ename/Makefile.am b/addressbook/ename/Makefile.am
index e30796574a..25a67a929c 100644
--- a/addressbook/ename/Makefile.am
+++ b/addressbook/ename/Makefile.am
@@ -30,6 +30,11 @@ libenameinclude_HEADERS =				\
 	e-name-western.h
 
 
+noinst_LTLIBRARIES = libename-static.la
+libename_static_la_SOURCES = $(libename_la_SOURCES)
+libename_static_la_LDFLAGS = --all-static
+
+
 noinst_PROGRAMS =					\
 	test-ename-western				\
 	test-ename-western-gtk
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index e4e5a7a741..7b5b40cb84 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-25  Seth Alves  <alves@hungry.com>
+
+	* Makefile.am (libeutil_static_la_LDFLAGS): build static version
+	of library for conduit to use
+
 2000-07-25  Christopher James Lahey  <clahey@helixcode.com>
 
 	* e-util.c, e-util.h: Added a bunch of e_marshal functions.
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 43998022b4..db1c3340d6 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -41,3 +41,7 @@ libeutil_la_SOURCES =			\
 	e-util.h			\
 	e-xml-utils.c			\
 	e-xml-utils.h
+
+noinst_LTLIBRARIES = libeutil-static.la
+libeutil_static_la_SOURCES = $(libeutil_la_SOURCES)
+libeutil_static_la_LDFLAGS = --all-static
diff --git a/e-util/ename/Makefile.am b/e-util/ename/Makefile.am
index e30796574a..25a67a929c 100644
--- a/e-util/ename/Makefile.am
+++ b/e-util/ename/Makefile.am
@@ -30,6 +30,11 @@ libenameinclude_HEADERS =				\
 	e-name-western.h
 
 
+noinst_LTLIBRARIES = libename-static.la
+libename_static_la_SOURCES = $(libename_la_SOURCES)
+libename_static_la_LDFLAGS = --all-static
+
+
 noinst_PROGRAMS =					\
 	test-ename-western				\
 	test-ename-western-gtk