aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libical/ChangeLog5
-rw-r--r--libical/src/libicalss/Makefile.am22
2 files changed, 16 insertions, 11 deletions
diff --git a/libical/ChangeLog b/libical/ChangeLog
index da8ecf82bd..2a6dd7d768 100644
--- a/libical/ChangeLog
+++ b/libical/ChangeLog
@@ -1,5 +1,10 @@
2001-04-18 Ettore Perazzoli <ettore@ximian.com>
+ * src/libicalss/Makefile.am (COMBINEDHEADERS): All of these have
+ to come from the srcdir: prepend `$(srcdir)'.
+
+2001-04-18 Ettore Perazzoli <ettore@ximian.com>
+
* src/libical/Makefile.am (COMBINEDHEADERS): Shouldn't prepend
`$(top_builddir)/src/libical' to `icalderivedvalue.h',
`icalderivedparameter.h', `icalderivedproperty.h' here, that
diff --git a/libical/src/libicalss/Makefile.am b/libical/src/libicalss/Makefile.am
index 28a3adc6ee..8ab867a206 100644
--- a/libical/src/libicalss/Makefile.am
+++ b/libical/src/libicalss/Makefile.am
@@ -37,17 +37,17 @@ libicalss_la_SOURCES = \
libicalssincludedir = $(includedir)
COMBINEDHEADERS = \
- icalgauge.h \
- icalset.h \
- icalfileset.h \
- icaldirset.h \
- icalcalendar.h \
- icalclassify.h \
- icalspanlist.h \
- icalmessage.h \
- icalcstp.h \
- icalcstpclient.h \
- icalcstpserver.h
+ $(srcdir)/icalgauge.h \
+ $(srcdir)/icalset.h \
+ $(srcdir)/icalfileset.h \
+ $(srcdir)/icaldirset.h \
+ $(srcdir)/icalcalendar.h \
+ $(srcdir)/icalclassify.h \
+ $(srcdir)/icalspanlist.h \
+ $(srcdir)/icalmessage.h \
+ $(srcdir)/icalcstp.h \
+ $(srcdir)/icalcstpclient.h \
+ $(srcdir)/icalcstpserver.h
icalss.h: $(COMBINEDHEADERS)