From a902ec9badad18e09c7499cb961fbf811aaf7beb Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 20 Feb 2003 04:07:28 +0000 Subject: Build the subparts as (noinst) shared libraries rather than static * gui/component/Makefile.am: * gui/contact-editor/Makefile.am: * gui/contact-list-editor/Makefile.am: * gui/search/Makefile.am: * gui/widgets/Makefile.am: * printing/Makefile.am: Build the subparts as (noinst) shared libraries rather than static libraries, so they can be portably linked into libevolution-addressbook.so svn path=/trunk/; revision=19963 --- addressbook/ChangeLog | 9 +++++++++ addressbook/gui/component/Makefile.am | 10 +++++----- addressbook/gui/contact-editor/Makefile.am | 6 +++--- addressbook/gui/contact-list-editor/Makefile.am | 6 +++--- addressbook/gui/merging/Makefile.am | 6 +++--- addressbook/gui/search/Makefile.am | 6 +++--- addressbook/gui/widgets/Makefile.am | 4 ++-- addressbook/printing/Makefile.am | 6 +++--- 8 files changed, 31 insertions(+), 22 deletions(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index d6f7c1b890..c3f2a2a953 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,5 +1,14 @@ 2003-02-19 Dan Winship + * gui/component/Makefile.am: + * gui/contact-editor/Makefile.am: + * gui/contact-list-editor/Makefile.am: + * gui/search/Makefile.am: + * gui/widgets/Makefile.am: + * printing/Makefile.am: Build the subparts as (noinst) shared + libraries rather than static libraries, so they can be portably + linked into libevolution-addressbook.so + * gui/widgets/e-addressbook-model.c: Make parent_class static. * gui/widgets/e-addressbook-reflow-adapter.c: Likewise diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index d53fb4c7ac..d9a210a0ae 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -48,15 +48,15 @@ libevolution_addressbook_la_SOURCES = \ libevolution_addressbook_la_LIBADD = \ select-names/libeselectnames.la \ $(top_builddir)/shell/libeshell.la \ - $(top_builddir)/addressbook/gui/widgets/libeminicard.a \ - $(top_builddir)/addressbook/printing/libecontactprint.a \ - $(top_builddir)/addressbook/gui/search/libeaddressbooksearch.a \ + $(top_builddir)/addressbook/gui/widgets/libeminicard.la \ + $(top_builddir)/addressbook/printing/libecontactprint.la \ + $(top_builddir)/addressbook/gui/search/libeaddressbooksearch.la \ $(top_builddir)/filter/libfilter.la \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ $(top_builddir)/camel/libcamel.la \ $(top_builddir)/e-util/ename/libename.la \ - $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.a \ - $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.a \ + $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ + $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/libversit/libversit.a \ $(top_builddir)/widgets/misc/libemiscwidgets.a \ $(top_builddir)/addressbook/gui/merging/libecardmerging.a \ diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am index 01ec18265a..24625865e8 100644 --- a/addressbook/gui/contact-editor/Makefile.am +++ b/addressbook/gui/contact-editor/Makefile.am @@ -17,10 +17,10 @@ INCLUDES = \ -DLIBGNOMEUI_DISABLE_DEPRECATED \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) -noinst_LIBRARIES = \ - libecontacteditor.a +noinst_LTLIBRARIES = \ + libecontacteditor.la -libecontacteditor_a_SOURCES = \ +libecontacteditor_la_SOURCES = \ e-contact-editor-address.c \ e-contact-editor-address.h \ e-contact-editor-fullname.c \ diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am index 6a3a21728a..278b2e528f 100644 --- a/addressbook/gui/contact-list-editor/Makefile.am +++ b/addressbook/gui/contact-list-editor/Makefile.am @@ -18,10 +18,10 @@ INCLUDES = \ -DLIBGNOMEUI_DISABLE_DEPRECATED \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) -noinst_LIBRARIES = \ - libecontactlisteditor.a +noinst_LTLIBRARIES = \ + libecontactlisteditor.la -libecontactlisteditor_a_SOURCES = \ +libecontactlisteditor_la_SOURCES = \ e-contact-list-editor.c \ e-contact-list-editor.h \ e-contact-list-editor-marshal.c \ diff --git a/addressbook/gui/merging/Makefile.am b/addressbook/gui/merging/Makefile.am index 4c57316e8c..e032cd639d 100644 --- a/addressbook/gui/merging/Makefile.am +++ b/addressbook/gui/merging/Makefile.am @@ -10,10 +10,10 @@ INCLUDES = \ -DLIBGNOMEUI_DISABLE_DEPRECATED \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) -noinst_LIBRARIES = \ - libecardmerging.a +noinst_LTLIBRARIES = \ + libecardmerging.la -libecardmerging_a_SOURCES = \ +libecardmerging_la_SOURCES = \ e-card-merging.c \ e-card-merging.h diff --git a/addressbook/gui/search/Makefile.am b/addressbook/gui/search/Makefile.am index bdf90e99ea..89d55c49bc 100644 --- a/addressbook/gui/search/Makefile.am +++ b/addressbook/gui/search/Makefile.am @@ -19,9 +19,9 @@ INCLUDES = \ -DLIBGNOMEUI_DISABLE_DEPRECATED \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) -noinst_LIBRARIES = \ - libeaddressbooksearch.a +noinst_LTLIBRARIES = \ + libeaddressbooksearch.la -libeaddressbooksearch_a_SOURCES = \ +libeaddressbooksearch_la_SOURCES = \ e-addressbook-search-dialog.c \ e-addressbook-search-dialog.h diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index 44938fb100..72e7a884c1 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -17,8 +17,8 @@ INCLUDES = \ -DLIBGNOMEUI_DISABLE_DEPRECATED \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) -noinst_LIBRARIES = \ - libeminicard.a +noinst_LTLIBRARIES = \ + libeminicard.la libeminicard_a_SOURCES = \ e-addressbook-marshal.c \ diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am index 67868ac237..07d4f6a87e 100644 --- a/addressbook/printing/Makefile.am +++ b/addressbook/printing/Makefile.am @@ -18,10 +18,10 @@ INCLUDES = \ -DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) -noinst_LIBRARIES = \ - libecontactprint.a +noinst_LTLIBRARIES = \ + libecontactprint.la -libecontactprint_a_SOURCES = \ +libecontactprint_la_SOURCES = \ e-contact-print-envelope.c \ e-contact-print-envelope.h \ e-contact-print-style-editor.c \ -- cgit v1.2.3