aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--wombat/Makefile.am12
-rw-r--r--wombat/wombat.c4
3 files changed, 17 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 25cff10fe1..eb3394cad6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,13 @@
+2000-03-29 Matt Loper <matt@helixcode.com>
+
+ * wombat/wombat.c: Changed headerfile path.
+
+ * wombat/Makefile.am: Use relative paths to libraries in the build
+ tree, rather than requiring libraries (such as libpcs) to already
+ be installed.
+
2000-03-28 Matt Loper <matt@helixcode.com>
+
* wombat/Makefile.am: new file.
* wombat/wombat.gnorba: Cleaned up.
diff --git a/wombat/Makefile.am b/wombat/Makefile.am
index 4207a87a2d..4dbdb4467b 100644
--- a/wombat/Makefile.am
+++ b/wombat/Makefile.am
@@ -18,12 +18,12 @@ wombat_SOURCES = \
wombat_LDADD = \
$(EXTRA_GNOME_LIBS) \
$(BONOBO_HTML_GNOME_LIBS) \
- $(top_builddir)/e-util/libeutil.la \
- -lpas \
- -lpcs \
- -lical \
- -lcalutil \
- $(top_builddir)/libversit/libversit.la \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/addressbook/backend/pas/libpas.la \
+ $(top_builddir)/calendar/pcs/libpcs.la \
+ $(top_builddir)/libical/src/libical/libical.la \
+ $(top_builddir)/calendar/cal-util/libcalutil.la \
+ $(top_builddir)/libversit/libversit.la \
-lgnomevfs
wombat_LDFLAGS = `gnome-config --libs gnorba`
diff --git a/wombat/wombat.c b/wombat/wombat.c
index 9568ae1938..5e4ad25173 100644
--- a/wombat/wombat.c
+++ b/wombat/wombat.c
@@ -7,8 +7,8 @@
#include <config.h>
#include <bonobo.h>
-#include <backend/pas-book-factory.h>
-#include <backend/pas-backend-file.h>
+#include <pas-book-factory.h>
+#include <pas-backend-file.h>
#include <libgnomevfs/gnome-vfs-init.h>
#include <libgnorba/gnorba.h>
#include <cal-factory.h>