aboutsummaryrefslogtreecommitdiffstats
path: root/e-util/Makefile.am
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-06-15 23:20:30 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-06-16 02:45:55 +0800
commit333897772f2cf3251915800aff2c836f02095c84 (patch)
tree6e5d9d2c81b0c1bdf3d3e941e09f2a724a2c56fe /e-util/Makefile.am
parent3acb21484e8b93916641dcd0a9b13fed2488a1ef (diff)
downloadgsoc2013-evolution-333897772f2cf3251915800aff2c836f02095c84.tar
gsoc2013-evolution-333897772f2cf3251915800aff2c836f02095c84.tar.gz
gsoc2013-evolution-333897772f2cf3251915800aff2c836f02095c84.tar.bz2
gsoc2013-evolution-333897772f2cf3251915800aff2c836f02095c84.tar.lz
gsoc2013-evolution-333897772f2cf3251915800aff2c836f02095c84.tar.xz
gsoc2013-evolution-333897772f2cf3251915800aff2c836f02095c84.tar.zst
gsoc2013-evolution-333897772f2cf3251915800aff2c836f02095c84.zip
Remove gnome-pilot integration.
It just doesn't belong in Evolution anymore. We don't support syncing with more modern devices -- see Conduits or SyncEvolution for that -- so it does not make sense for older model Palm Pilot PDAs to be the lone exception. I have repackaged the Evolution-Data-Server conduit modules to be provided by gnome-pilot itself in bug #619315. This should provide eqivalent Palm Pilot syncing functionality; it's just being moved to gnome-pilot. This completely severs our dependency on deprecated GNOME 2.x libraries which were still being dragged in by way of gnome-pilot dependencies. It was also interfereing with our bundling of libgnomecanvas.
Diffstat (limited to 'e-util/Makefile.am')
-rw-r--r--e-util/Makefile.am54
1 files changed, 1 insertions, 53 deletions
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 7df0e0d49e..f1c6131965 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -1,5 +1,4 @@
eutilincludedir = $(privincludedir)/e-util
-econdincludedir = $(privincludedir)/e-conduit
ecpsdir = $(privdatadir)/ecps
ruledir = $(privdatadir)
@@ -7,7 +6,7 @@ if OS_WIN32
PLATFORM_SOURCES = e-win32-reloc.c e-win32-defaults.c e-win32-defaults.h
endif
-privsolib_LTLIBRARIES = libeutil.la libeconduit.la
+privsolib_LTLIBRARIES = libeutil.la
eutilinclude_HEADERS = \
e-account-utils.h \
@@ -85,7 +84,6 @@ libeutil_la_CPPFLAGS = \
-DEVOLUTION_RULEDIR=\"$(ruledir)\" \
-DG_LOG_DOMAIN=\"e-utils\" \
$(GNOME_PLATFORM_CFLAGS) \
- $(GNOME_PILOT_CFLAGS) \
$(E_UTIL_CFLAGS)
libeutil_la_SOURCES = \
@@ -148,65 +146,15 @@ libeutil_la_LDFLAGS = $(NO_UNDEFINED)
libeutil_la_LIBADD = \
$(ICONV_LIBS) \
$(E_UTIL_LIBS) \
- $(GNOME_PILOT_LIBS) \
$(GNOME_PLATFORM_LIBS) \
$(INTLLIBS)
-econdinclude_HEADERS = \
- e-pilot-map.h \
- e-pilot-util.h
-
-pilot_sources = \
- $(econdinclude_HEADERS) \
- e-pilot-map.c \
- e-pilot-util.c
-
-if ENABLE_PILOT_CONDUITS
-pilot_compile = $(pilot_sources)
-else
-pilot_compile = e-html-utils.c
-endif
-
-libeconduit_la_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -I$(top_srcdir) \
- -I$(top_builddir) \
- -I$(top_srcdir)/widgets \
- -DEVOLUTION_DATADIR=\""$(datadir)"\" \
- -DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \
- -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
- -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \
- -DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\" \
- -DEVOLUTION_ICONDIR=\""$(icondir)"\" \
- -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \
- -DEVOLUTION_LIBDIR=\""$(datadir)"\" \
- -DEVOLUTION_LIBEXECDIR=\""$(privlibexecdir)"\" \
- -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
- -DEVOLUTION_PLUGINDIR=\""$(plugindir)"\" \
- -DEVOLUTION_PREFIX=\""$(prefix)"\" \
- -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \
- -DEVOLUTION_SOUNDDIR=\""$(soundsdir)"\" \
- -DEVOLUTION_SYSCONFDIR=\""$(sysconfdir)"\" \
- -DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\" \
- -DEVOLUTION_UIDIR=\""$(uidir)"\" \
- -DEVOLUTION_RULEDIR=\"$(ruledir)\" \
- -DG_LOG_DOMAIN=\"e-utils\" \
- $(GNOME_PILOT_CFLAGS) \
- $(E_UTIL_CFLAGS)
-
-libeconduit_la_SOURCES = $(pilot_compile)
-
-libeconduit_la_LDFLAGS = $(NO_UNDEFINED)
-
-libeconduit_la_LIBADD = $(E_UTIL_LIBS) $(GNOME_PILOT_LIBS)
-
error_DATA = e-system.error
errordir = $(privdatadir)/errors
@EVO_PLUGIN_RULE@
EXTRA_DIST = \
e-system.error.xml \
- $(pilot_sources) \
e-marshal.list
BUILT_SOURCES = $(MARSHAL_GENERATED) $(error_DATA)