aboutsummaryrefslogtreecommitdiffstats
path: root/tools/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'tools/Makefile.am')
-rw-r--r--tools/Makefile.am68
1 files changed, 38 insertions, 30 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 5687cc174b..7ea0e47099 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,12 +1,10 @@
-toolsdir = $(privdatadir)/tools
-
-tools_SCRIPTS = \
+bin_SCRIPTS = \
csv2vcard \
evolution-move-tasks \
evolution-addressbook-clean \
killev
-tools_PROGRAMS = \
+bin_PROGRAMS = \
evolution-addressbook-import \
evolution-addressbook-export \
evolution-launch-composer
@@ -17,59 +15,69 @@ INCLUDES = \
-DG_LOG_DOMAIN=\"evolution-tools\" \
-I$(top_srcdir) \
-I$(top_builddir) \
+ -DEVOLUTION_BINDIR=\""$(bindir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
- -DPREFIX=\""$(prefix)"\" \
- -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 = $(tools_SCRIPTS) verify-evolution-install.sh \
- evolution-addressbook-clean.in
-
-CORBA_SOURCE = \
+CORBA_SOURCE = \
Evolution-Composer.h \
Evolution-Composer-common.c \
Evolution-Composer-skels.c \
Evolution-Composer-stubs.c
-BUILT_SOURCES = $(CORBA_SOURCE)
+idls = \
+ $(top_srcdir)/composer/Evolution-Composer.idl
-idls = \
- $(top_srcdir)/composer/Evolution-Composer.idl
+idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
$(CORBA_SOURCE): $(idls)
- $(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) $(idls)
+ $(ORBIT_IDL) -I $(srcdir) $(idls) $(idl_flags)
+
+BUILT_SOURCES = $(CORBA_SOURCE)
+
+dist-hook:
+ cd $(distdir); rm -f $(BUILT_SOURCES)
+
+EXTRA_DIST = $(bin_SCRIPTS) verify-evolution-install.sh \
+ evolution-addressbook-clean.in
+
+evolution_launch_composer_SOURCES = \
+ $(CORBA_SOURCE) \
+ evolution-launch-composer.c
+
+evolution_launch_composer_LDADD = \
+ $(GNOME_FULL_LIBS) \
+ $(top_builddir)/addressbook/backend/ebook/libebook.la \
+ $(top_builddir)/camel/libcamel.la \
+ $(top_builddir)/e-util/ename/libename.la \
+ $(top_builddir)/libversit/libversit.a \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/widgets/menus/libmenus.la
+
evolution_addressbook_import_LDADD = \
$(GNOME_FULL_LIBS) \
$(top_builddir)/addressbook/backend/ebook/libebook.la \
+ $(top_builddir)/camel/libcamel.la \
+ $(top_builddir)/e-util/ename/libename.la \
+ $(top_builddir)/libversit/libversit.a \
+ $(top_builddir)/e-util/libeutil.la \
$(top_builddir)/widgets/menus/libmenus.la
-evolution_addressbook_export_LDADD = \
+evolution_addressbook_export_LDADD = \
$(evolution_addressbook_import_LDADD)
-evolution_addressbook_abuse_LDADD = \
+evolution_addressbook_abuse_LDADD = \
$(evolution_addressbook_import_LDADD)
-evolution_launch_composer_SOURCES = \
- $(CORBA_SOURCE) \
- evolution-launch-composer.c
-
-evolution_launch_composer_LDADD = \
- $(GNOME_FULL_LIBS) \
- $(top_builddir)/addressbook/backend/ebook/libebook.la \
- $(top_builddir)/widgets/menus/libmenus.la
-
-CLEANFILES = evolution-addressbook-clean $(BUILD_SOURCES)
+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\@?$(toolsdir)?g' \
+ sed -e 's?\@EVOLUTION_BINDIR\@?$(bindir)?g' \
< $(srcdir)/evolution-addressbook-clean.in > evolution-addressbook-clean.tmp \
&& mv evolution-addressbook-clean.tmp evolution-addressbook-clean