aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libical/src/test/Makefile.am6
-rw-r--r--wombat/ChangeLog4
-rw-r--r--wombat/Makefile.am2
3 files changed, 8 insertions, 4 deletions
diff --git a/libical/src/test/Makefile.am b/libical/src/test/Makefile.am
index 25683b2448..7fc594ee84 100644
--- a/libical/src/test/Makefile.am
+++ b/libical/src/test/Makefile.am
@@ -4,13 +4,13 @@ noinst_PROGRAMS = copycluster regression parser findobj storage stow recur testm
LDADD = ../libical/libical.a ../libicalss/libicalss.a ../libicalvcal/libicalvcal.a
INCLUDES = \
-I . \
+ -I../libicalvcal \
+ -I $(srcdir)/../libicalvcal \
-I $(srcdir) \
-I../libical \
-I $(srcdir)/../libical \
-I../libicalss \
- -I $(srcdir)/../libicalss \
- -I../libicalvcal \
- -I $(srcdir)/../libicalvcal
+ -I $(srcdir)/../libicalss
findobj_SOURCES = findobj.c
copycluster_SOURCES = copycluster.c
diff --git a/wombat/ChangeLog b/wombat/ChangeLog
index 636cd8d044..695bfea890 100644
--- a/wombat/ChangeLog
+++ b/wombat/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-24 Federico Mena Quintero <federico@helixcode.com>
+
+ * Makefile.am (wombat_LDADD): Reorder libical libs.
+
2000-08-02 Federico Mena Quintero <federico@helixcode.com>
* wombat.c (setup_pcs): Register the iCalendar file backend instad
diff --git a/wombat/Makefile.am b/wombat/Makefile.am
index 900c6283c0..757961f7f5 100644
--- a/wombat/Makefile.am
+++ b/wombat/Makefile.am
@@ -24,8 +24,8 @@ wombat_LDADD = \
$(top_builddir)/addressbook/backend/ebook/libebook.la \
$(top_builddir)/addressbook/ename/libename.la \
$(top_builddir)/calendar/pcs/libpcs.a \
- $(top_builddir)/libical/src/libical/libical.a \
$(top_builddir)/calendar/cal-util/libcal-util.la \
+ $(top_builddir)/libical/src/libical/libical.a \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/e-util/libeutil.la \
$(LDAP_LIBS)