aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog6
-rw-r--r--camel/Makefile.am5
2 files changed, 8 insertions, 3 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index b8b1e58872..bc5794ddc5 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-29 Dan Winship <danw@ximian.com>
+
+ * Makefile.am (camel_lock_helper_SOURCES): Remove camel-lock.c
+ from here because it upsets automake 1.6 for some reason
+ (camel_lock_helper_LDADD): Add camel-lock.o here
+
2003-04-29 Jeremy Katz <katzj@redhat.com>
* providers/imap/camel-imap-folder.c (parse_fetch_response):
diff --git a/camel/Makefile.am b/camel/Makefile.am
index 7055630273..099f370e0a 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -233,13 +233,12 @@ libcamel_static_la_LDFLAGS = --all-static
camel_lock_helper_SOURCES = \
camel-lock-helper.c \
- camel-lock-helper.h \
- camel-lock.c \
- camel-lock.h
+ camel-lock-helper.h
# NOTE: This needs to be cleaned up, it shouldn't link with all this crap,
# because it might be setuid.
camel_lock_helper_LDADD = \
+ camel-lock.o \
$(libcamel_la_LIBADD)
camel_index_control_SOURCES = \