aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--wombat/ChangeLog6
-rw-r--r--wombat/GNOME_Evolution_WombatLDAP.server.in.in4
-rw-r--r--wombat/GNOME_Evolution_WombatNOLDAP.server.in.in4
-rw-r--r--wombat/Makefile.am14
4 files changed, 17 insertions, 11 deletions
diff --git a/wombat/ChangeLog b/wombat/ChangeLog
index e795a5eabd..29126fb6f4 100644
--- a/wombat/ChangeLog
+++ b/wombat/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-27 Ettore Perazzoli <ettore@ximian.com>
+
+ * Makefile.am: Rename wombat to evolution-wombat.
+ * GNOME_Evolution_WombatLDAP.server.in.in: Updated accordingly.
+ * GNOME_Evolution_WombatNOLDAP.server.in.in: Likewise.
+
2003-01-14 Ettore Perazzoli <ettore@ximian.com>
* Makefile.am: Do not dist the .server.in files; just dist the
diff --git a/wombat/GNOME_Evolution_WombatLDAP.server.in.in b/wombat/GNOME_Evolution_WombatLDAP.server.in.in
index 973ab19881..f76b9504a2 100644
--- a/wombat/GNOME_Evolution_WombatLDAP.server.in.in
+++ b/wombat/GNOME_Evolution_WombatLDAP.server.in.in
@@ -2,7 +2,7 @@
<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_ServerFactory"
type="exe"
- location="@LIBEXECDIR@/wombat">
+ location="@LIBEXECDIR@/evolution-wombat">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/Evolution/BookFactory:1.0"/>
@@ -20,7 +20,7 @@
<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_CalendarFactory"
type="exe"
- location="@LIBEXECDIR@/wombat">
+ location="@LIBEXECDIR@/evolution-wombat">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/Evolution/Calendar/CalFactory:1.0"/>
diff --git a/wombat/GNOME_Evolution_WombatNOLDAP.server.in.in b/wombat/GNOME_Evolution_WombatNOLDAP.server.in.in
index 12fec40934..659751c4e5 100644
--- a/wombat/GNOME_Evolution_WombatNOLDAP.server.in.in
+++ b/wombat/GNOME_Evolution_WombatNOLDAP.server.in.in
@@ -2,7 +2,7 @@
<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_ServerFactory"
type="exe"
- location="@LIBEXECDIR@/wombat">
+ location="@LIBEXECDIR@/evolution-wombat">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/Evolution/BookFactory:1.0"/>
@@ -19,7 +19,7 @@
<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_CalendarFactory"
type="exe"
- location="@LIBEXECDIR@/wombat">
+ location="@LIBEXECDIR@/evolution-wombat">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/Evolution/Calendar/CalFactory:1.0"/>
diff --git a/wombat/Makefile.am b/wombat/Makefile.am
index f9c13cebe5..276711d424 100644
--- a/wombat/Makefile.am
+++ b/wombat/Makefile.am
@@ -18,9 +18,9 @@ INCLUDES = \
$(WOMBAT_CFLAGS)
libexec_PROGRAMS = \
- wombat
+ evolution-wombat
-wombat_SOURCES = \
+evolution_wombat_SOURCES = \
wombat.c
if ENABLE_LDAP
@@ -29,7 +29,7 @@ LDAP_STUFF = \
$(LDAP_LIBS)
endif
-wombat_LDADD = \
+evolution_wombat_LDADD = \
$(top_builddir)/addressbook/backend/pas/libpasfile.a \
$(DB3_LDADD) \
$(LDAP_STUFF) \
@@ -78,10 +78,10 @@ EXTRA_DIST = $(server_DATA) \
if ENABLE_PURIFY
PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-all-local: wombat.pure
+all-local: evolution-wombat.pure
-wombat.pure: wombat
- @rm -f wombat.pure
- $(PLINK) $(wombat_LDFLAGS) $(wombat_OBJECTS) $(wombat_LDADD) $(LIBS)
+evolution-wombat.pure: evolution-wombat
+ @rm -f evolution-wombat.pure
+ $(PLINK) $(evolution_wombat_LDFLAGS) $(evolution_wombat_OBJECTS) $(evolution_wombat_LDADD) $(LIBS)
endif