diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2003-10-22 02:28:34 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2003-10-22 02:28:34 +0800 |
| commit | 0fb08f3ff81575a4749d851404233f34252dd2f2 (patch) | |
| tree | 7e03befedc3a76fd104921dbbc616810d87333be /tools/Makefile.am | |
| parent | 0e19f2c16de592607a341eb9974d31e4e47e02b5 (diff) | |
| download | gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.gz gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.bz2 gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.lz gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.xz gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.zst gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.zip | |
Merge new-ui-branch to the trunk.
svn path=/trunk/; revision=22964
Diffstat (limited to 'tools/Makefile.am')
| -rw-r--r-- | tools/Makefile.am | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 0f4ee59981..c6a769c31a 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,14 +1,6 @@ -privlibexec_SCRIPTS = \ - csv2vcard \ - evolution-addressbook-clean - privlibexec_PROGRAMS = \ - evolution-addressbook-import \ killev - -noinst_PROGRAMS = evolution-addressbook-abuse - INCLUDES = \ -DG_LOG_DOMAIN=\"evolution-tools\" \ -I$(top_srcdir) \ @@ -18,14 +10,10 @@ INCLUDES = \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DDATADIR=\""$(datadir)"\" \ -DLIBDIR=\""$(libdir)"\" \ - -I$(top_srcdir)/addressbook \ - -I$(top_srcdir)/addressbook/backend \ - -I$(top_builddir)/addressbook/backend \ -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \ $(GNOME_FULL_CFLAGS) -EXTRA_DIST = $(privlibexec_SCRIPTS) verify-evolution-install.sh \ - evolution-addressbook-clean.in +EXTRA_DIST = verify-evolution-install.sh CORBA_SOURCE = \ Evolution-Composer.h \ @@ -41,14 +29,6 @@ idls = \ $(CORBA_SOURCE): $(idls) $(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) $(idls) -evolution_addressbook_import_LDADD = \ - $(GNOME_FULL_LIBS) \ - $(top_builddir)/addressbook/backend/ebook/libebook.la \ - $(top_builddir)/widgets/menus/libmenus.la - -evolution_addressbook_abuse_LDADD = \ - $(evolution_addressbook_import_LDADD) - killev_SOURCES = \ killev.c @@ -56,10 +36,3 @@ killev_LDADD = \ $(top_builddir)/e-util/libeutil.la CLEANFILES = evolution-addressbook-clean $(BUILT_SOURCES) - - -evolution-addressbook-clean: evolution-addressbook-clean.in Makefile -## Use sed and then mv to avoid problems if the user interrupts. - sed -e 's?\@EVOLUTION_TOOLSDIR\@?$(privlibexecdir)?g' \ - < $(srcdir)/evolution-addressbook-clean.in > evolution-addressbook-clean.tmp \ - && mv evolution-addressbook-clean.tmp evolution-addressbook-clean |