aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libical/ChangeLog5
-rw-r--r--libical/src/libical/Makefile.am31
2 files changed, 20 insertions, 16 deletions
diff --git a/libical/ChangeLog b/libical/ChangeLog
index 95a7a619ff..611087459e 100644
--- a/libical/ChangeLog
+++ b/libical/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-16 JP Rosevear <jpr@ximian.com>
+
+ * src/libical/Makefile.am: Fixes to make it make dist and make
+ distcheck. Kind of kludgy but they seem to work. Time will tell.
+
2001-05-10 JP Roseveaer <jpr@ximian.com>
* src/libical/icaltime.c (set_tz, unset_tz): plug leak
diff --git a/libical/src/libical/Makefile.am b/libical/src/libical/Makefile.am
index 9c123b6bd9..5c2200c7f0 100644
--- a/libical/src/libical/Makefile.am
+++ b/libical/src/libical/Makefile.am
@@ -2,7 +2,7 @@
# FILE: Makefile.am
# CREATOR: eric
#
-# $Id: Makefile.am,v 1.28 2001/04/18 15:00:51 ettore Exp $
+# $Id: Makefile.am,v 1.29 2001/05/16 07:16:31 jpr Exp $
#
#
# (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -36,6 +36,8 @@ YFLAGS = -d -v -t -pical_yy
LFLAGS = -Pical_yy
LEX_OUTPUT_ROOT = lex.ical_yy
+all: ical.h
+
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir)/src \
@@ -45,6 +47,7 @@ INCLUDES = \
libical_la_LDFLAGS = -version-info 0:0:0
libical_la_SOURCES = \
+ $(BUILT_SOURCES) \
icalattendee.h \
icalattendee.c \
icalcomponent.c \
@@ -61,17 +64,12 @@ libical_la_SOURCES = \
icalparameter.c \
icalparameter.h \
icalparameterimpl.h \
- icalderivedparameter.c \
- icalderivedparameter.h \
icalparser.c \
icalparser.h \
- icalderivedproperty.c \
- icalderivedproperty.h \
icalproperty.c \
icalproperty.h \
icalrecur.c \
icalrecur.h \
- icalrestriction.c \
icalrestriction.h \
icaltime.c \
icaltime.h \
@@ -84,8 +82,6 @@ libical_la_SOURCES = \
icalvalue.c \
icalvalue.h \
icalvalueimpl.h \
- icalderivedvalue.c \
- icalderivedvalue.h \
icalyacc.h \
icalyacc.y \
pvl.c \
@@ -127,15 +123,17 @@ COMBINEDHEADERS = \
$(top_srcdir)/src/libical/icalmime.h \
$(top_srcdir)/src/libical/icallangbind.h
+BUILT_COMBINEDHEADERS = \
+ icalderivedparameter.h \
+ icalderivedproperty.h \
+ icalderivedvalue.h
+
BUILT_SOURCES = \
- ical.h \
+ $(BUILT_COMBINEDHEADERS)\
icalderivedparameter.c \
- icalderivedparameter.h \
icalderivedproperty.c \
- icalderivedproperty.h \
icalrestriction.c \
- icalderivedvalue.c \
- icalderivedvalue.h
+ icalderivedvalue.c
ical.h: $(COMBINEDHEADERS)
cat $(COMBINEDHEADERS) \
@@ -156,7 +154,7 @@ PARAMETERDEPS = \
icalderivedparameter.h: $(PARAMETERDEPS)
$(PERL) -I $(ICALSCRIPTS) $(ICALSCRIPTS)/mkderivedparameters.pl -i $(srcdir)/icalderivedparameter.h.in -h $(DESIGNDATA)/parameters.csv > icalderivedparameter.h
-icalderivedparameter.c: $(PARAMETERDEPS) icalparameter.h
+icalderivedparameter.c: $(PARAMETERDEPS) $(BUILT_COMBINEDHEADERS)
$(PERL) -I $(ICALSCRIPTS) $(ICALSCRIPTS)/mkderivedparameters.pl -i $(srcdir)/icalderivedparameter.c.in -c $(DESIGNDATA)/parameters.csv > icalderivedparameter.c
# properties
@@ -174,7 +172,7 @@ icalderivedproperty.h: $(PROPERTYDEPS)
-i $(srcdir)/icalderivedproperty.h.in -h $(DESIGNDATA)/properties.csv\
${DESIGNDATA}/value-types.csv > icalderivedproperty.h
-icalderivedproperty.c: $(PROPERTYDEPS) icalproperty.h
+icalderivedproperty.c: $(PROPERTYDEPS) $(BUILT_COMBINEDHEADERS)
$(PERL) -I$(ICALSCRIPTS) $(ICALSCRIPTS)/mkderivedproperties.pl \
-i $(srcdir)/icalderivedproperty.c.in -c $(DESIGNDATA)/properties.csv \
${DESIGNDATA}/value-types.csv > icalderivedproperty.c
@@ -202,7 +200,7 @@ icalderivedvalue.h: $(VALUEDEPS)
$(PERL) -I$(ICALSCRIPTS) $(ICALSCRIPTS)/mkderivedvalues.pl \
-i $(srcdir)/icalderivedvalue.h.in -h $(DESIGNDATA)/value-types.csv > icalderivedvalue.h
-icalderivedvalue.c: $(VALUEDEPS) icalderivedvalue.h
+icalderivedvalue.c: $(VALUEDEPS) $(BUILT_COMBINEDHEADERS)
$(PERL) -I$(ICALSCRIPTS) $(ICALSCRIPTS)/mkderivedvalues.pl \
-i $(srcdir)/icalderivedvalue.c.in -c $(DESIGNDATA)/value-types.csv > icalderivedvalue.c
@@ -215,6 +213,7 @@ CLEANFILES += $(BUILT_SOURCES)
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES)
+ cd $(distdir); rm -f ical.h
EXTRA_DIST = \
icalderivedparameter.c.in \