diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2002-01-25 07:16:18 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2002-01-25 07:16:18 +0800 |
| commit | 4ba09274d6d393568a06c483bf4934ea4707a604 (patch) | |
| tree | 8bb9f22fe18024c733e233f963c621c39ed460f4 /addressbook/gui/component | |
| parent | d656b69c9bd1de52d6991e1694fd4dcf9856951c (diff) | |
| download | gsoc2013-evolution-4ba09274d6d393568a06c483bf4934ea4707a604.tar gsoc2013-evolution-4ba09274d6d393568a06c483bf4934ea4707a604.tar.gz gsoc2013-evolution-4ba09274d6d393568a06c483bf4934ea4707a604.tar.bz2 gsoc2013-evolution-4ba09274d6d393568a06c483bf4934ea4707a604.tar.lz gsoc2013-evolution-4ba09274d6d393568a06c483bf4934ea4707a604.tar.xz gsoc2013-evolution-4ba09274d6d393568a06c483bf4934ea4707a604.tar.zst gsoc2013-evolution-4ba09274d6d393568a06c483bf4934ea4707a604.zip | |
Clean up some of the Makefiles so we dont' link every library multiple
times, causing big libtool 1.4 pain.
svn path=/trunk/; revision=15461
Diffstat (limited to 'addressbook/gui/component')
| -rw-r--r-- | addressbook/gui/component/Makefile.am | 54 |
1 files changed, 24 insertions, 30 deletions
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index 8d8c7198bc..0916f75f98 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -2,8 +2,6 @@ SUBDIRS = select-names INCLUDES = \ -DG_LOG_DOMAIN=\"evolution-addressbook\" \ - $(EXTRA_GNOME_CFLAGS) \ - $(GNOME_INCLUDEDIR) \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_srcdir)/shell \ @@ -15,14 +13,13 @@ INCLUDES = \ -I$(top_srcdir)/addressbook/gui/widgets \ -I$(top_srcdir)/addressbook/backend \ -I$(top_builddir)/addressbook/backend \ - $(BONOBO_HTML_GNOME_CFLAGS) \ - $(GNOME_VFS_CFLAGS) \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" \ - -DEVOLUTION_IMAGESDIR=\""$(datadir)"/images/evolution\" + -DEVOLUTION_IMAGESDIR=\""$(datadir)"/images/evolution\" \ + $(EVOLUTION_ADDRESSBOOK_CFLAGS) bin_PROGRAMS = \ @@ -45,28 +42,25 @@ evolution_addressbook_SOURCES = \ e-address-popup.h \ e-address-popup.c -evolution_addressbook_LDADD = \ - select-names/libeselectnames.la \ - $(top_builddir)/shell/libeshell.la \ - $(EXTRA_GNOME_LIBS) \ - $(BONOBO_HTML_GNOME_LIBS) \ - $(GNOME_VFS_LIBS) \ - $(BONOBO_CONF_LIBS) \ - $(top_builddir)/addressbook/gui/widgets/libeminicard.a \ - $(top_builddir)/addressbook/backend/ebook/libebook.la \ - $(top_builddir)/camel/libcamel.la \ - $(top_builddir)/libibex/libibex.la \ - $(top_builddir)/e-util/ename/libename.la \ +evolution_addressbook_LDADD = \ + select-names/libeselectnames.la \ + $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/addressbook/gui/widgets/libeminicard.a \ + $(top_builddir)/addressbook/backend/ebook/libebook.la \ + $(top_builddir)/camel/libcamel.la \ + $(top_builddir)/libibex/libibex.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.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.a \ - $(top_builddir)/addressbook/printing/libecontactprint.a \ - $(top_builddir)/addressbook/gui/search/libeaddressbooksearch.a \ - $(top_builddir)/addressbook/gui/merging/libecardmerging.a \ - $(top_builddir)/filter/libfilter.la \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/menus/libmenus.la + $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.a \ + $(top_builddir)/libversit/libversit.la \ + $(top_builddir)/widgets/misc/libemiscwidgets.a \ + $(top_builddir)/addressbook/printing/libecontactprint.a \ + $(top_builddir)/addressbook/gui/search/libeaddressbooksearch.a \ + $(top_builddir)/addressbook/gui/merging/libecardmerging.a \ + $(top_builddir)/filter/libfilter.la \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/widgets/menus/libmenus.la \ + $(EVOLUTION_ADDRESSBOOK_LIBS) evolution_addressbook_LDFLAGS = `gnome-config --libs gdk_pixbuf` -export-dynamic @@ -79,10 +73,10 @@ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) gladedir = $(datadir)/evolution/glade glade_DATA = addressbook-config.glade -EXTRA_DIST = \ - $(glade_DATA) \ - $(oaf_DATA) \ - addressbook-config.glade\ +EXTRA_DIST = \ + $(glade_DATA) \ + $(oaf_DATA) \ + addressbook-config.glade \ $(oaf_in_files) if ENABLE_PURIFY |