aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--wombat/ChangeLog4
-rw-r--r--wombat/Makefile.am7
2 files changed, 5 insertions, 6 deletions
diff --git a/wombat/ChangeLog b/wombat/ChangeLog
index 04036823b2..67afbe1c01 100644
--- a/wombat/ChangeLog
+++ b/wombat/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-06 Dan Winship <danw@ximian.com>
+
+ * Makefile.am: cleanup
+
2003-02-01 Hans Petter Jansson <hpj@ximian.com>
* Makefile.am: Make .server file point to where wombat is now
diff --git a/wombat/Makefile.am b/wombat/Makefile.am
index eea933dcd5..f5ca8e46bb 100644
--- a/wombat/Makefile.am
+++ b/wombat/Makefile.am
@@ -13,12 +13,10 @@ INCLUDES = \
-I$(top_builddir)/calendar \
-I$(top_srcdir)/libical/src/libical \
-I$(top_builddir)/libical/src/libical \
- -DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
$(WOMBAT_CFLAGS)
-evolibexecdir = $(libexecdir)/evolution/$(BASE_VERSION)
-evolibexec_PROGRAMS = \
+privlibexec_PROGRAMS = \
evolution-wombat
evolution_wombat_SOURCES = \
@@ -48,8 +46,6 @@ evolution_wombat_LDADD = \
$(top_builddir)/libwombat/libwombat.la \
$(WOMBAT_LIBS)
-serversdir = $(libdir)/bonobo/servers
-
if ENABLE_LDAP
SERVER_IN_FILE=GNOME_Evolution_WombatLDAP.server.in.in
else
@@ -61,7 +57,6 @@ GNOME_Evolution_Wombat.server.in.in: $(SERVER_IN_FILE)
server_in_files = GNOME_Evolution_Wombat.server.in.in
-serverdir = $(libdir)/bonobo/servers
server_DATA = $(server_in_files:.server.in.in=.server)
$(server_in_files:.server.in.in=.server.in): $(server_in_files)
sed -e "s|\@LIBEXECDIR\@|$(evolibexecdir)|" $< > $@