aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog4
-rw-r--r--camel/Makefile.am12
2 files changed, 10 insertions, 6 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 958d1c262f..6e7b588a2a 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-26 Jeffrey Stedfast <fejj@ximian.com>
+
+ * Makefile.am: Fix Ettore's fix.
+
2001-09-25 Jeffrey Stedfast <fejj@ximian.com>
* camel-pgp-context.c (camel_pgp_context_new): No longer takes a
diff --git a/camel/Makefile.am b/camel/Makefile.am
index 2d56192d2a..277c736235 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -205,8 +205,11 @@ libcamel_static_la_SOURCES = $(libcamel_la_SOURCES)
libcamel_static_la_LIBADD = $(libcamel_la_LIBADD)
libcamel_static_la_LDFLAGS = --all-static
-camel-lock-helper($EXEEXT): camel-lock-helper.o camel-lock.o
- $(CC) -o $@ $^ -I$(srcdir)/.. -I$(srcdir)
+camel_lock_helper_SOURCES = \
+ camel-lock-helper.c \
+ camel-lock-helper.h \
+ camel-lock.c \
+ camel-lock.h
install-exec-hook:
@if test -n "$(CAMEL_LOCK_HELPER_USER)"; then \
@@ -244,13 +247,10 @@ noinst_HEADERS = \
camel-charset-map-private.h \
camel-private.h \
camel-search-private.h \
- camel-lock-helper.h \
camel-html-parser.h
-# manually include camel-lock-helper.c since we build it manually
EXTRA_DIST = \
- README \
- camel-lock-helper.c
+ README
#noinst_PROGRAMS = \
# camel-mime-filter-from