aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/conduits
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@src.gnome.org>2007-06-03 22:50:35 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2007-06-03 22:50:35 +0800
commit54a9260f696f5c7462f40af8f838d723ba3abeb5 (patch)
treeab87ece78582288b7dabf6635fe3f393fd042c4d /calendar/conduits
parentb484ae1c53ce5e8075eefe907cffbcb936106397 (diff)
downloadgsoc2013-evolution-54a9260f696f5c7462f40af8f838d723ba3abeb5.tar.gz
gsoc2013-evolution-54a9260f696f5c7462f40af8f838d723ba3abeb5.tar.zst
gsoc2013-evolution-54a9260f696f5c7462f40af8f838d723ba3abeb5.zip
Fix for version removal from installed files.
svn path=/trunk/; revision=33646
Diffstat (limited to 'calendar/conduits')
-rw-r--r--calendar/conduits/calendar/Makefile.am15
-rw-r--r--calendar/conduits/memo/Makefile.am15
-rw-r--r--calendar/conduits/todo/Makefile.am15
3 files changed, 24 insertions, 21 deletions
diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am
index 8abfc96bb1..36ec220208 100644
--- a/calendar/conduits/calendar/Makefile.am
+++ b/calendar/conduits/calendar/Makefile.am
@@ -8,24 +8,25 @@ INCLUDES = \
# Calendar Conduit
privconduit_LTLIBRARIES = libecalendar_conduit.la
-libecalendar_conduit_la_SOURCES = \
+libecalendar_conduit_la_SOURCES = \
calendar-conduit.c
libecalendar_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
libecalendar_conduit_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/e-util/libeconduit.la \
- $(top_builddir)/widgets/misc/libemiscwidgets.la \
+ $(top_builddir)/e-util/libeconduit.la \
+ $(top_builddir)/widgets/misc/libemiscwidgets.la \
$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
-e-calendar-$(BASE_VERSION).conduit: e-calendar.conduit.in
- sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' \
+e-calendar.conduit: e-calendar.conduit.in
+ sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' \
-e 's^\@datadir\@^$(datadir)^g' \
-e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \
$< > $@
conduitdir = $(datadir)/gnome-pilot/conduits/
-conduit_DATA = e-calendar-$(BASE_VERSION).conduit
+conduit_DATA = e-calendar.conduit
BUILT_SOURCES = $(conduit_DATA)
CLEANFILES = $(BUILT_SOURCES)
@@ -34,4 +35,4 @@ EXTRA_DIST = \
e-calendar.conduit.in
dist-hook:
- cd $(distdir); rm -f $(BUILT_SOURCES) \ No newline at end of file
+ cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/calendar/conduits/memo/Makefile.am b/calendar/conduits/memo/Makefile.am
index 70494168ca..afbee4e56c 100644
--- a/calendar/conduits/memo/Makefile.am
+++ b/calendar/conduits/memo/Makefile.am
@@ -8,24 +8,25 @@ INCLUDES = \
# Memo Conduit
privconduit_LTLIBRARIES = libememo_conduit.la
-libememo_conduit_la_SOURCES = \
+libememo_conduit_la_SOURCES = \
memo-conduit.c
-libememo_conduit_la_LDFLAGS = -module -avoid-version
+libememo_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
libememo_conduit_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/e-util/libeconduit.la \
- $(top_builddir)/widgets/misc/libemiscwidgets.la \
+ $(top_builddir)/e-util/libeconduit.la \
+ $(top_builddir)/widgets/misc/libemiscwidgets.la \
$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
-e-memo-$(BASE_VERSION).conduit: e-memo.conduit.in
- sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' \
+e-memo.conduit: e-memo.conduit.in
+ sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' \
-e 's^\@datadir\@^$(datadir)^g' \
-e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \
$< > $@
conduitdir = $(datadir)/gnome-pilot/conduits/
-conduit_DATA = e-memo-$(BASE_VERSION).conduit
+conduit_DATA = e-memo.conduit
BUILT_SOURCES = $(conduit_DATA)
CLEANFILES = $(BUILT_SOURCES)
diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am
index 9c3ae10874..2978fcef61 100644
--- a/calendar/conduits/todo/Makefile.am
+++ b/calendar/conduits/todo/Makefile.am
@@ -8,24 +8,25 @@ INCLUDES = \
# ToDo Conduit
privconduit_LTLIBRARIES = libetodo_conduit.la
-libetodo_conduit_la_SOURCES = \
+libetodo_conduit_la_SOURCES = \
todo-conduit.c
libetodo_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
libetodo_conduit_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/e-util/libeconduit.la \
- $(top_builddir)/widgets/misc/libemiscwidgets.la \
+ $(top_builddir)/e-util/libeconduit.la \
+ $(top_builddir)/widgets/misc/libemiscwidgets.la \
$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
-e-todo-$(BASE_VERSION).conduit: e-todo.conduit.in
- sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' \
+e-todo.conduit: e-todo.conduit.in
+ sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' \
-e 's^\@datadir\@^$(datadir)^g' \
-e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \
$< > $@
conduitdir = $(datadir)/gnome-pilot/conduits/
-conduit_DATA = e-todo-$(BASE_VERSION).conduit
+conduit_DATA = e-todo.conduit
BUILT_SOURCES = $(conduit_DATA)
CLEANFILES = $(BUILT_SOURCES)
@@ -34,4 +35,4 @@ EXTRA_DIST = \
e-todo.conduit.in
dist-hook:
- cd $(distdir); rm -f $(BUILT_SOURCES) \ No newline at end of file
+ cd $(distdir); rm -f $(BUILT_SOURCES)