From e91a42c3f8d07fc27b5611589778935d278e9703 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Tue, 27 Feb 2001 20:44:50 +0000 Subject: Merge the building fix from evolution-0-9-branch. svn path=/trunk/; revision=8413 --- libical/ChangeLog | 5 +++++ libical/src/libical/Makefile.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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 + + * src/libical/Makefile.am (ical.h): Depend on `$(BUILT_SOURCES)', + not `$(COMBINEDHEADERS)'. + 2001-02-09 JP Rosevear * 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 -- cgit v1.2.3