aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/conduits
diff options
context:
space:
mode:
authorJP Rosevear <jpr@ximian.com>2003-11-20 23:11:40 +0800
committerJP Rosevear <jpr@src.gnome.org>2003-11-20 23:11:40 +0800
commit0a13b5729550185d3b5aed46b6ae07b1c8ec7578 (patch)
treefae915812e4a7676666cfe2d55a4825ee6981d7d /calendar/conduits
parentd420759f1e42dcff24f700a41b8292337269e365 (diff)
downloadgsoc2013-evolution-0a13b5729550185d3b5aed46b6ae07b1c8ec7578.tar.gz
gsoc2013-evolution-0a13b5729550185d3b5aed46b6ae07b1c8ec7578.tar.zst
gsoc2013-evolution-0a13b5729550185d3b5aed46b6ae07b1c8ec7578.zip
Remove a bunch of gal includes that are no longer needed
2003-11-20 JP Rosevear <jpr@ximian.com> * Remove a bunch of gal includes that are no longer needed svn path=/trunk/; revision=23457
Diffstat (limited to 'calendar/conduits')
-rw-r--r--calendar/conduits/calendar/Makefile.am17
-rw-r--r--calendar/conduits/calendar/e-calendar.conduit.in2
-rw-r--r--calendar/conduits/todo/Makefile.am17
-rw-r--r--calendar/conduits/todo/e-todo.conduit.in2
4 files changed, 22 insertions, 16 deletions
diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am
index 7d521ccc6a..b670939538 100644
--- a/calendar/conduits/calendar/Makefile.am
+++ b/calendar/conduits/calendar/Makefile.am
@@ -16,17 +16,20 @@ libecalendar_conduit_la_LIBADD = \
$(top_builddir)/e-util/libeconduit.la \
$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
-e-calendar.conduit: e-calendar.conduit.in Makefile
+e-calendar-$(BASE_VERSION).conduit: e-calendar.conduit.in
sed -e 's^\@prefix\@^$(prefix)^g' \
-e 's^\@datadir\@^$(datadir)^g' \
- < $(srcdir)/e-calendar.conduit.in > e-calendar.conduit.tmp \
- && mv e-calendar.conduit.tmp e-calendar.conduit
+ -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \
+ $< > $@
-Conduitdir = $(datadir)/gnome-pilot/conduits/
-Conduit_DATA = e-calendar.conduit
+conduitdir = $(datadir)/gnome-pilot/conduits/
+conduit_DATA = e-calendar-$(BASE_VERSION).conduit
+
+BUILT_SOURCES = $(conduit_DATA)
+CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = \
e-calendar.conduit.in
-install-data-local:
- $(mkinstalldirs) $(Conduitdir)
+dist-hook:
+ cd $(distdir); rm -f $(BUILT_SOURCES) \ No newline at end of file
diff --git a/calendar/conduits/calendar/e-calendar.conduit.in b/calendar/conduits/calendar/e-calendar.conduit.in
index e75d889234..3bf0c3b9ae 100644
--- a/calendar/conduits/calendar/e-calendar.conduit.in
+++ b/calendar/conduits/calendar/e-calendar.conduit.in
@@ -1,7 +1,7 @@
<gnome-pilot-conduit version="1.0">
<conduit id="e_calendar_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libecalendar_conduit.so"/>
<name value="ECalendar"/>
- <conduit-attribute name="description" value="Synchronizes Calendar with Evolution"/>
+ <conduit-attribute name="description" value="Synchronizes Calendar with Evolution @BASE_VERSION@"/>
<conduit-attribute name="default-synctype" value="synchronize"/>
<conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot"/>
<conduit-attribute name="settings" value="TRUE"/>
diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am
index 4b4fccc732..0de69d0f66 100644
--- a/calendar/conduits/todo/Makefile.am
+++ b/calendar/conduits/todo/Makefile.am
@@ -16,17 +16,20 @@ libetodo_conduit_la_LIBADD = \
$(top_builddir)/e-util/libeconduit.la \
$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
-e-todo.conduit: e-todo.conduit.in Makefile
+e-todo-$(BASE_VERSION).conduit: e-todo.conduit.in
sed -e 's^\@prefix\@^$(prefix)^g' \
-e 's^\@datadir\@^$(datadir)^g' \
- < $(srcdir)/e-todo.conduit.in > e-todo.conduit.tmp \
- && mv e-todo.conduit.tmp e-todo.conduit
+ -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \
+ $< > $@
-Conduitdir = $(datadir)/gnome-pilot/conduits/
-Conduit_DATA = e-todo.conduit
+conduitdir = $(datadir)/gnome-pilot/conduits/
+conduit_DATA = e-todo-$(BASE_VERSION).conduit
+
+BUILT_SOURCES = $(conduit_DATA)
+CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = \
e-todo.conduit.in
-install-data-local:
- $(mkinstalldirs) $(Conduitdir)
+dist-hook:
+ cd $(distdir); rm -f $(BUILT_SOURCES) \ No newline at end of file
diff --git a/calendar/conduits/todo/e-todo.conduit.in b/calendar/conduits/todo/e-todo.conduit.in
index a7bea27a8f..1bfe02045c 100644
--- a/calendar/conduits/todo/e-todo.conduit.in
+++ b/calendar/conduits/todo/e-todo.conduit.in
@@ -1,7 +1,7 @@
<gnome-pilot-conduit version="1.0">
<conduit id="e_todo_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libetodo_conduit.so"/>
<name value="EToDo"/>
- <conduit-attribute name="description" value="Synchronizes ToDo List with Evolution"/>
+ <conduit-attribute name="description" value="Synchronizes ToDo List with Evolution @BASE_VERSION@"/>
<conduit-attribute name="default-synctype" value="synchronize"/>
<conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot"/>
<conduit-attribute name="settings" value="TRUE"/>