aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/backend/ebook
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-01-25 07:16:18 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-01-25 07:16:18 +0800
commit4ba09274d6d393568a06c483bf4934ea4707a604 (patch)
tree8bb9f22fe18024c733e233f963c621c39ed460f4 /addressbook/backend/ebook
parentd656b69c9bd1de52d6991e1694fd4dcf9856951c (diff)
downloadgsoc2013-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/backend/ebook')
-rw-r--r--addressbook/backend/ebook/Makefile.am75
1 files changed, 29 insertions, 46 deletions
diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
index ea49ad47f3..f137cd24ab 100644
--- a/addressbook/backend/ebook/Makefile.am
+++ b/addressbook/backend/ebook/Makefile.am
@@ -1,22 +1,22 @@
noinst_PROGRAMS = test-card test-client test-client-list
-bin_PROGRAMS = evolution-vcard-importer \
- evolution-ldif-importer \
- load-pine-addressbook \
+bin_PROGRAMS = evolution-vcard-importer \
+ evolution-ldif-importer \
+ load-pine-addressbook \
load-gnomecard-addressbook
-CORBA_SOURCE = \
- addressbook.h \
- addressbook-common.c \
- addressbook-stubs.c \
- addressbook-skels.c \
- Evolution-Composer.h \
- Evolution-Composer-common.c \
- Evolution-Composer-skels.c \
+CORBA_SOURCE = \
+ addressbook.h \
+ addressbook-common.c \
+ addressbook-stubs.c \
+ addressbook-skels.c \
+ Evolution-Composer.h \
+ Evolution-Composer-common.c \
+ Evolution-Composer-skels.c \
Evolution-Composer-stubs.c
-idls = \
- $(srcdir)/../idl/addressbook.idl \
+idls = \
+ $(srcdir)/../idl/addressbook.idl \
$(srcdir)/../../../composer/Evolution-Composer.idl
idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
@@ -25,7 +25,7 @@ $(CORBA_SOURCE): $(idls)
$(ORBIT_IDL) -I $(srcdir) $(idls) $(idl_flags)
INCLUDES = \
- -DGNOMELOCALEDIR=\""$(localedir)"\" \
+ -DGNOMELOCALEDIR=\""$(localedir)"\" \
-DG_LOG_DOMAIN=\"EBook\" \
-I$(top_srcdir) \
-I$(top_srcdir)/camel \
@@ -35,8 +35,7 @@ INCLUDES = \
-I$(top_builddir)/addressbook/ename \
-I$(top_builddir)/shell \
-I$(top_srcdir)/shell \
- $(BONOBO_GNOME_CFLAGS) \
- $(EXTRA_GNOME_CFLAGS)
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
lib_LTLIBRARIES = libebook.la
@@ -83,9 +82,7 @@ test_client_SOURCES = \
test_client_LDADD = \
libebook.la \
- $(BONOBO_CONF_LIBS) \
- $(BONOBO_GNOME_LIBS) \
- $(EXTRA_GNOME_LIBS) \
+ $(EVOLUTION_ADDRESSBOOK_LIBS) \
$(top_builddir)/camel/libcamel.la \
$(top_builddir)/libibex/libibex.la \
$(top_builddir)/libversit/libversit.la \
@@ -97,9 +94,7 @@ test_client_list_SOURCES = \
test_client_list_LDADD = \
libebook.la \
- $(BONOBO_CONF_LIBS) \
- $(BONOBO_GNOME_LIBS) \
- $(EXTRA_GNOME_LIBS) \
+ $(EVOLUTION_ADDRESSBOOK_LIBS) \
$(top_builddir)/camel/libcamel.la \
$(top_builddir)/libibex/libibex.la \
$(top_builddir)/e-util/ename/libename.la \
@@ -111,39 +106,35 @@ test_card_SOURCES = \
test_card_LDADD = \
libebook.la \
- $(BONOBO_CONF_LIBS) \
- $(BONOBO_GNOME_LIBS) \
- $(EXTRA_GNOME_LIBS) \
+ $(EVOLUTION_ADDRESSBOOK_LIBS) \
$(top_builddir)/camel/libcamel.la \
$(top_builddir)/libibex/libibex.la \
$(top_builddir)/e-util/ename/libename.la \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/e-util/libeutil.la
-evolution_vcard_importer_SOURCES = \
+evolution_vcard_importer_SOURCES = \
evolution-vcard-importer.c
+
evolution_vcard_importer_LDADD = \
libebook.la \
- $(BONOBO_CONF_LIBS) \
- $(BONOBO_GNOME_LIBS) \
- $(EXTRA_GNOME_LIBS) \
+ $(EVOLUTION_ADDRESSBOOK_LIBS) \
$(top_builddir)/camel/libcamel.la \
- $(top_builddir)/libibex/libibex.la \
+ $(top_builddir)/libibex/libibex.la \
$(top_builddir)/shell/importer/libevolution-importer.la \
$(DB3_LDADD) \
$(top_builddir)/e-util/ename/libename.la \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/e-util/libeutil.la
-evolution_ldif_importer_SOURCES = \
+evolution_ldif_importer_SOURCES = \
evolution-ldif-importer.c
-evolution_ldif_importer_LDADD = \
+
+evolution_ldif_importer_LDADD = \
libebook.la \
- $(BONOBO_CONF_LIBS) \
- $(BONOBO_GNOME_LIBS) \
- $(EXTRA_GNOME_LIBS) \
+ $(EVOLUTION_ADDRESSBOOK_LIBS) \
$(top_builddir)/camel/libcamel.la \
- $(top_builddir)/libibex/libibex.la \
+ $(top_builddir)/libibex/libibex.la \
$(top_builddir)/shell/importer/libevolution-importer.la \
$(DB3_LDADD) \
$(top_builddir)/e-util/ename/libename.la \
@@ -155,9 +146,7 @@ load_pine_addressbook_SOURCES = \
load_pine_addressbook_LDADD = \
libebook.la \
- $(BONOBO_CONF_LIBS) \
- $(BONOBO_GNOME_LIBS) \
- $(EXTRA_GNOME_LIBS) \
+ $(EVOLUTION_ADDRESSBOOK_LIBS) \
$(top_builddir)/camel/libcamel.la \
$(top_builddir)/libibex/libibex.la \
$(top_builddir)/e-util/ename/libename.la \
@@ -170,9 +159,7 @@ load_gnomecard_addressbook_SOURCES = \
load_gnomecard_addressbook_LDADD = \
libebook.la \
- $(BONOBO_CONF_LIBS) \
- $(BONOBO_GNOME_LIBS) \
- $(EXTRA_GNOME_LIBS) \
+ $(EVOLUTION_ADDRESSBOOK_LIBS) \
$(top_builddir)/camel/libcamel.la \
$(top_builddir)/libibex/libibex.la \
$(top_builddir)/e-util/ename/libename.la \
@@ -197,7 +184,3 @@ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
# GNOME_Evolution_Addressbook_Pine_Importer.oafinfo
EXTRA_DIST = $(oaf_in_files) $(oaf_DATA)
-
-
-
-