diff options
| author | Dan Winship <danw@src.gnome.org> | 2003-02-22 05:24:34 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2003-02-22 05:24:34 +0800 |
| commit | d40f089a706484364ceb499d6bb4f6d823b92b09 (patch) | |
| tree | 2a467c1fcafe9828b96fc82de3c8d115e1234aa7 /addressbook/gui | |
| parent | 80906889c2d0c7db9a69ca5d2e3a7657effd311b (diff) | |
| download | gsoc2013-evolution-d40f089a706484364ceb499d6bb4f6d823b92b09.tar gsoc2013-evolution-d40f089a706484364ceb499d6bb4f6d823b92b09.tar.gz gsoc2013-evolution-d40f089a706484364ceb499d6bb4f6d823b92b09.tar.bz2 gsoc2013-evolution-d40f089a706484364ceb499d6bb4f6d823b92b09.tar.lz gsoc2013-evolution-d40f089a706484364ceb499d6bb4f6d823b92b09.tar.xz gsoc2013-evolution-d40f089a706484364ceb499d6bb4f6d823b92b09.tar.zst gsoc2013-evolution-d40f089a706484364ceb499d6bb4f6d823b92b09.zip | |
Make libversit a shared library, update stuff for that, and clean up
some LDADDs in the process
svn path=/trunk/; revision=19994
Diffstat (limited to 'addressbook/gui')
| -rw-r--r-- | addressbook/gui/component/Makefile.am | 4 | ||||
| -rw-r--r-- | addressbook/gui/component/select-names/Makefile.am | 4 | ||||
| -rw-r--r-- | addressbook/gui/widgets/Makefile.am | 18 |
3 files changed, 5 insertions, 21 deletions
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index c5e22211e2..8d50c74ee6 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -53,14 +53,10 @@ libevolution_addressbook_la_LIBADD = \ $(top_builddir)/addressbook/gui/search/libeaddressbooksearch.a \ $(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)/libversit/libversit.a \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/addressbook/gui/merging/libecardmerging.a \ - $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/menus/libmenus.la \ $(EVOLUTION_ADDRESSBOOK_LIBS) $(LDAP_LIBS) diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am index d9e9887a26..0ccc838d37 100644 --- a/addressbook/gui/component/select-names/Makefile.am +++ b/addressbook/gui/component/select-names/Makefile.am @@ -69,6 +69,10 @@ libeselectnames_la_SOURCES = \ e-simple-card-bonobo.c \ e-simple-card-bonobo.h +libeselectnames_la_LIBADD = \ + $(top_builddir)/addressbook/backend/ebook/libebook.la \ + $(EVOLUTION_ADDRESSBOOK_LIBS) + # We'll need these again when we split out the select names control # into its own shlib factory, but for now they're redundant. # diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index 2b9d7c88f2..dbc38f62e2 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -91,16 +91,12 @@ MARSHAL_GENERATED = e-addressbook-marshal.c e-addressbook-marshal.h #minicard_test_LDADD = \ # libeminicard.a \ # $(top_builddir)/addressbook/backend/ebook/libebook.la \ -# $(top_builddir)/e-util/libeutil.la \ -# $(top_builddir)/libversit/libversit.la \ -# $(top_builddir)/e-util/ename/libename.la \ # $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.a \ # $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.a \ # $(top_builddir)/addressbook/printing/libecontactprint.a \ # $(top_builddir)/addressbook/gui/merging/libecardmerging.a \ # $(top_builddir)/widgets/misc/libemiscwidgets.la \ # $(top_builddir)/addressbook/gui/component/select-names/libeselectnames.la \ -# $(top_builddir)/e-util/libeutil.la \ # $(EVOLUTION_ADDRESSBOOK_LIBS) \ # libeminicard.a # @@ -110,13 +106,9 @@ MARSHAL_GENERATED = e-addressbook-marshal.c e-addressbook-marshal.h #reflow_test_LDADD = \ # libeminicard.a \ # $(top_builddir)/addressbook/backend/ebook/libebook.la \ -# $(top_builddir)/e-util/libeutil.la \ -# $(top_builddir)/libversit/libversit.la \ -# $(top_builddir)/e-util/ename/libename.la \ # $(top_builddir)/addressbook/contact-editor/libecontacteditor.a \ # $(top_builddir)/addressbook/printing/libecontactprint.a \ # $(top_builddir)/widgets/misc/libemiscwidgets.la \ -# $(top_builddir)/e-util/libeutil.la \ # $(EVOLUTION_ADDRESSBOOK_LIBS) #minicard_view_test_SOURCES = \ @@ -126,13 +118,9 @@ MARSHAL_GENERATED = e-addressbook-marshal.c e-addressbook-marshal.h # $(EVOLUTION_ADDRESSBOOK_LIBS) # libeminicard.a \ # $(top_builddir)/addressbook/backend/ebook/libebook.la \ -# $(top_builddir)/e-util/libeutil.la \ -# $(top_builddir)/libversit/libversit.la \ -# $(top_builddir)/addressbook/ename/libename.la \ # $(top_builddir)/addressbook/contact-editor/libecontacteditor.a \ # $(top_builddir)/addressbook/printing/libecontactprint.a \ -# $(top_builddir)/widgets/misc/libemiscwidgets.la \ -# $(top_builddir)/e-util/libeutil.la +# $(top_builddir)/widgets/misc/libemiscwidgets.la # #minicard_widget_test_SOURCES = \ # e-minicard-widget-test.c @@ -140,15 +128,11 @@ MARSHAL_GENERATED = e-addressbook-marshal.c e-addressbook-marshal.h #minicard_widget_test_LDADD = \ # libeminicard.a \ # $(top_builddir)/addressbook/backend/ebook/libebook.la \ -# $(top_builddir)/e-util/libeutil.la \ -# $(top_builddir)/libversit/libversit.la \ -# $(top_builddir)/e-util/ename/libename.la \ # $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.a \ # $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.a \ # $(top_builddir)/addressbook/gui/component/select-names/libeselectnames.la \ # $(top_builddir)/addressbook/printing/libecontactprint.a \ # $(top_builddir)/widgets/misc/libemiscwidgets.la \ -# $(top_builddir)/e-util/libeutil.la \ # $(top_builddir)/addressbook/gui/merging/libecardmerging.a \ # $(EVOLUTION_ADDRESSBOOK_LIBS) |