aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-02-28 04:44:50 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-02-28 04:44:50 +0800
commite91a42c3f8d07fc27b5611589778935d278e9703 (patch)
treefc902f4c148eab4b0f7812787b331178de07c495
parent8e4a426f295f3ed8a6bb83942c42ad7c774238e8 (diff)
downloadgsoc2013-evolution-e91a42c3f8d07fc27b5611589778935d278e9703.tar
gsoc2013-evolution-e91a42c3f8d07fc27b5611589778935d278e9703.tar.gz
gsoc2013-evolution-e91a42c3f8d07fc27b5611589778935d278e9703.tar.bz2
gsoc2013-evolution-e91a42c3f8d07fc27b5611589778935d278e9703.tar.lz
gsoc2013-evolution-e91a42c3f8d07fc27b5611589778935d278e9703.tar.xz
gsoc2013-evolution-e91a42c3f8d07fc27b5611589778935d278e9703.tar.zst
gsoc2013-evolution-e91a42c3f8d07fc27b5611589778935d278e9703.zip
Merge the building fix from evolution-0-9-branch.
svn path=/trunk/; revision=8413
-rw-r--r--libical/ChangeLog5
-rw-r--r--libical/src/libical/Makefile.am2
2 files changed, 6 insertions, 1 deletions
diff --git a/libical/ChangeLog b/libical/ChangeLog
index 57c38d1419..5deefa813c 100644
--- a/libical/ChangeLog
+++ b/libical/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-27 Ettore Perazzoli <ettore@ximian.com>
+
+ * src/libical/Makefile.am (ical.h): Depend on `$(BUILT_SOURCES)',
+ not `$(COMBINEDHEADERS)'.
+
2001-02-09 JP Rosevear <jpr@ximian.com>
* src/libical/Makefile.am: The built sources shouldn't be cleaned
diff --git a/libical/src/libical/Makefile.am b/libical/src/libical/Makefile.am
index cb06525250..186e705060 100644
--- a/libical/src/libical/Makefile.am
+++ b/libical/src/libical/Makefile.am
@@ -92,7 +92,7 @@ BUILT_SOURCES = \
icalvalue.c \
icalvalue.h
-ical.h: $(COMBINEDHEADERS)
+ical.h: $(BUILT_SOURCES)
cat $(COMBINEDHEADERS) \
| egrep -v "#include.*\"ical" \
| egrep -v "#include.*\"pvl\.h\"" > ical.h