aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libical/ChangeLog6
-rw-r--r--libical/src/libical/Makefile.am36
2 files changed, 23 insertions, 19 deletions
diff --git a/libical/ChangeLog b/libical/ChangeLog
index 3ab24075da..51ecd96d89 100644
--- a/libical/ChangeLog
+++ b/libical/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-13 Federico Mena Quintero <federico@helixcode.com>
+
+ * src/libical/Makefile.am (COMBINEDHEADERS): Removed the explicit
+ paths. Why it did *not* work on my original try when they were
+ not there, well, now I don't know.
+
2000-12-13 Ettore Perazzoli <ettore@helixcode.com>
* src/libicalvcal/Makefile.am (INCLUDES): Add
diff --git a/libical/src/libical/Makefile.am b/libical/src/libical/Makefile.am
index 650a8e9dca..74ead02312 100644
--- a/libical/src/libical/Makefile.am
+++ b/libical/src/libical/Makefile.am
@@ -7,8 +7,6 @@ YFLAGS = -d -v -t -pical_yy
LFLAGS = -Pical_yy
LEX_OUTPUT_ROOT = lex.ical_yy
-BUILT_SOURCES = ical.h
-
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir)/src \
@@ -58,23 +56,23 @@ libicalinclude_HEADERS = ical.h
# ORDERING OF HEADERS IS SIGNIFICANT. Don't change this ordering. It
# is required to make the combined header ical.h properly
-COMBINEDHEADERS = \
- $(top_builddir)/src/libical/icalversion.h \
- $(top_srcdir)/src/libical/icaltime.h \
- $(top_srcdir)/src/libical/icalenums.h \
- $(top_srcdir)/src/libical/icaltypes.h \
- $(top_srcdir)/src/libical/icalrecur.h \
- $(top_builddir)/src/libical/icalvalue.h \
- $(top_builddir)/src/libical/icalparameter.h \
- $(top_builddir)/src/libical/icalproperty.h \
- $(top_srcdir)/src/libical/pvl.h \
- $(top_srcdir)/src/libical/icalcomponent.h \
- $(top_srcdir)/src/libical/icalparser.h \
- $(top_srcdir)/src/libical/icalmemory.h \
- $(top_srcdir)/src/libical/icalerror.h \
- $(top_srcdir)/src/libical/icalrestriction.h \
- $(top_srcdir)/src/libical/sspm.h \
- $(top_srcdir)/src/libical/icalmime.h
+COMBINEDHEADERS = \
+ icalversion.h \
+ icaltime.h \
+ icalenums.h \
+ icaltypes.h \
+ icalrecur.h \
+ icalvalue.h \
+ icalparameter.h \
+ icalproperty.h \
+ pvl.h \
+ icalcomponent.h \
+ icalparser.h \
+ icalmemory.h \
+ icalerror.h \
+ icalrestriction.h \
+ sspm.h \
+ icalmime.h
BUILT_SOURCES = \
ical.h \