aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/devel/ChangeLog8
-rw-r--r--doc/devel/Makefile.am2
-rw-r--r--doc/devel/calendar/cal-client/Makefile.am8
-rw-r--r--doc/devel/calendar/cal-util/Makefile.am8
-rw-r--r--doc/devel/calendar/cal-util/tmpl/cal-component.sgml58
-rw-r--r--doc/devel/calendar/cal-util/tmpl/cal-util.sgml7
-rw-r--r--help/devel/ChangeLog8
-rw-r--r--help/devel/Makefile.am2
-rw-r--r--help/devel/calendar/cal-client/Makefile.am8
-rw-r--r--help/devel/calendar/cal-util/Makefile.am8
-rw-r--r--help/devel/calendar/cal-util/tmpl/cal-component.sgml58
-rw-r--r--help/devel/calendar/cal-util/tmpl/cal-util.sgml7
12 files changed, 182 insertions, 0 deletions
diff --git a/doc/devel/ChangeLog b/doc/devel/ChangeLog
index fcad430d33..15d8cfe1cc 100644
--- a/doc/devel/ChangeLog
+++ b/doc/devel/ChangeLog
@@ -1,3 +1,11 @@
+2001-01-10 Federico Mena Quintero <federico@helixcode.com>
+
+ * Makefile.am: Make it work when gtk-doc is not installed.
+
+ * calendar/cal-client/Makefile.am: Likewise.
+
+ * calendar/cal-util/Makefile.am: Likewise.
+
2000-12-19 Federico Mena Quintero <federico@helixcode.com>
Added proper dependency lists to the gtk-doc mess.
diff --git a/doc/devel/Makefile.am b/doc/devel/Makefile.am
index 8e8ca1085c..77f9354ba9 100644
--- a/doc/devel/Makefile.am
+++ b/doc/devel/Makefile.am
@@ -53,6 +53,7 @@ clean-local:
maintainer-clean-local:
cd $(srcdir) && rm -rf html
+if ENABLE_GTK_DOC
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
(installfiles=`echo $(srcdir)/html/*.html`; \
@@ -68,6 +69,7 @@ install-data-local:
echo '-- Fixing Crossreferences' ; \
gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)|| true; \
fi)
+endif
dist-hook:
mkdir $(distdir)/html
diff --git a/doc/devel/calendar/cal-client/Makefile.am b/doc/devel/calendar/cal-client/Makefile.am
index 363c15b326..f3a2b39ec6 100644
--- a/doc/devel/calendar/cal-client/Makefile.am
+++ b/doc/devel/calendar/cal-client/Makefile.am
@@ -87,6 +87,7 @@ EXTRA_DIST = \
all: $(sgml_generated)
+if ENABLE_GTK_DOC
scan $(scan_generated): $(SOURCE_FILES)
-(cd $(srcdir) \
&& env CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) \
@@ -100,6 +101,13 @@ templates $(tmpl_sources) $(tmpl_generated): $(tmpl_dependencies)
sgml $(sgml_generated): $(sgml_dependencies)
cd $(srcdir) \
&& gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
+else
+scan $(scan_generated): $(SOURCE_FILES)
+
+templates $(tmpl_sources) $(tmpl_generated): $(tmpl_dependencies)
+
+sgml $(sgml_generated): $(sgml_dependencies)
+endif
clean-local:
rm -f *~ *.bak *.signals *-unused.txt
diff --git a/doc/devel/calendar/cal-util/Makefile.am b/doc/devel/calendar/cal-util/Makefile.am
index b7308800c8..7f567652ef 100644
--- a/doc/devel/calendar/cal-util/Makefile.am
+++ b/doc/devel/calendar/cal-util/Makefile.am
@@ -98,6 +98,7 @@ EXTRA_DIST = \
all: $(sgml_generated)
+if ENABLE_GTK_DOC
scan $(scan_generated): $(SOURCE_FILES)
-(cd $(srcdir) \
&& env CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) \
@@ -111,6 +112,13 @@ templates $(tmpl_sources) $(tmpl_generated): $(tmpl_dependencies)
sgml $(sgml_generated): $(sgml_dependencies)
cd $(srcdir) \
&& gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
+else
+scan $(scan_generated): $(SOURCE_FILES)
+
+templates $(tmpl_sources) $(tmpl_generated): $(tmpl_dependencies)
+
+sgml $(sgml_generated): $(sgml_dependencies)
+endif
clean-local:
rm -f *~ *.bak *.signals *-unused.txt
diff --git a/doc/devel/calendar/cal-util/tmpl/cal-component.sgml b/doc/devel/calendar/cal-util/tmpl/cal-component.sgml
index 14943a155e..cb0362f2d3 100644
--- a/doc/devel/calendar/cal-util/tmpl/cal-component.sgml
+++ b/doc/devel/calendar/cal-util/tmpl/cal-component.sgml
@@ -83,6 +83,12 @@ RFC 2445 iCalendar component object.
vtype of an uninitialized #CalComponent.
</para>
+@CAL_COMPONENT_NO_TYPE:
+@CAL_COMPONENT_EVENT:
+@CAL_COMPONENT_TODO:
+@CAL_COMPONENT_JOURNAL:
+@CAL_COMPONENT_FREEBUSY:
+@CAL_COMPONENT_TIMEZONE:
<!-- ##### ENUM CalComponentField ##### -->
<para>
@@ -90,6 +96,25 @@ RFC 2445 iCalendar component object.
are used by the calendar GUI code in &Evolution;.
</para>
+@CAL_COMPONENT_FIELD_CATEGORIES:
+@CAL_COMPONENT_FIELD_CLASSIFICATION:
+@CAL_COMPONENT_FIELD_COMPLETED:
+@CAL_COMPONENT_FIELD_DTEND:
+@CAL_COMPONENT_FIELD_DTSTART:
+@CAL_COMPONENT_FIELD_DUE:
+@CAL_COMPONENT_FIELD_GEO:
+@CAL_COMPONENT_FIELD_PERCENT:
+@CAL_COMPONENT_FIELD_PRIORITY:
+@CAL_COMPONENT_FIELD_SUMMARY:
+@CAL_COMPONENT_FIELD_TRANSPARENCY:
+@CAL_COMPONENT_FIELD_URL:
+@CAL_COMPONENT_FIELD_HAS_ALARMS:
+@CAL_COMPONENT_FIELD_ICON:
+@CAL_COMPONENT_FIELD_COMPLETE:
+@CAL_COMPONENT_FIELD_RECURRING:
+@CAL_COMPONENT_FIELD_OVERDUE:
+@CAL_COMPONENT_FIELD_COLOR:
+@CAL_COMPONENT_FIELD_NUM_FIELDS:
<!-- ##### ENUM CalComponentClassification ##### -->
<para>
@@ -97,24 +122,35 @@ RFC 2445 iCalendar component object.
component.
</para>
+@CAL_COMPONENT_CLASS_NONE:
+@CAL_COMPONENT_CLASS_PUBLIC:
+@CAL_COMPONENT_CLASS_PRIVATE:
+@CAL_COMPONENT_CLASS_CONFIDENTIAL:
+@CAL_COMPONENT_CLASS_UNKNOWN:
<!-- ##### STRUCT CalComponentDateTime ##### -->
<para>
This structure defines a date and time value.
</para>
+@value:
+@tzid:
<!-- ##### ENUM CalComponentPeriodType ##### -->
<para>
Defines how a period of time is specified.
</para>
+@CAL_COMPONENT_PERIOD_DATETIME:
+@CAL_COMPONENT_PERIOD_DURATION:
<!-- ##### STRUCT CalComponentPeriod ##### -->
<para>
This structure defines a period of time.
</para>
+@type:
+@start:
<!-- ##### STRUCT CalComponentText ##### -->
<para>
@@ -122,12 +158,18 @@ RFC 2445 iCalendar component object.
an alternate representation parameter.
</para>
+@value:
+@altrep:
<!-- ##### ENUM CalComponentTransparency ##### -->
<para>
</para>
+@CAL_COMPONENT_TRANSP_NONE:
+@CAL_COMPONENT_TRANSP_TRANSPARENT:
+@CAL_COMPONENT_TRANSP_OPAQUE:
+@CAL_COMPONENT_TRANSP_UNKNOWN:
<!-- ##### FUNCTION cal_component_gen_uid ##### -->
<para>
@@ -811,30 +853,46 @@ RFC 2445 iCalendar component object.
</para>
+@auid:
+@trigger:
+@occur:
<!-- ##### STRUCT CalComponentAlarms ##### -->
<para>
</para>
+@comp:
+@alarms:
<!-- ##### ENUM CalAlarmAction ##### -->
<para>
</para>
+@CAL_ALARM_NONE:
+@CAL_ALARM_AUDIO:
+@CAL_ALARM_DISPLAY:
+@CAL_ALARM_EMAIL:
+@CAL_ALARM_PROCEDURE:
+@CAL_ALARM_UNKNOWN:
<!-- ##### ENUM CalAlarmTriggerType ##### -->
<para>
</para>
+@CAL_ALARM_TRIGGER_NONE:
+@CAL_ALARM_TRIGGER_RELATIVE_START:
+@CAL_ALARM_TRIGGER_RELATIVE_END:
+@CAL_ALARM_TRIGGER_ABSOLUTE:
<!-- ##### STRUCT CalAlarmTrigger ##### -->
<para>
</para>
+@type:
<!-- ##### FUNCTION cal_component_has_alarms ##### -->
<para>
diff --git a/doc/devel/calendar/cal-util/tmpl/cal-util.sgml b/doc/devel/calendar/cal-util/tmpl/cal-util.sgml
index 0009f54fed..d0742746e5 100644
--- a/doc/devel/calendar/cal-util/tmpl/cal-util.sgml
+++ b/doc/devel/calendar/cal-util/tmpl/cal-util.sgml
@@ -19,6 +19,9 @@ Miscellaneous utilities
</para>
+@uid:
+@start:
+@end:
<!-- ##### FUNCTION cal_obj_instance_list_free ##### -->
<para>
@@ -33,6 +36,10 @@ Miscellaneous utilities
</para>
+@CALOBJ_TYPE_EVENT:
+@CALOBJ_TYPE_TODO:
+@CALOBJ_TYPE_JOURNAL:
+@CALOBJ_TYPE_ANY:
<!-- ##### FUNCTION cal_obj_uid_list_free ##### -->
<para>
diff --git a/help/devel/ChangeLog b/help/devel/ChangeLog
index fcad430d33..15d8cfe1cc 100644
--- a/help/devel/ChangeLog
+++ b/help/devel/ChangeLog
@@ -1,3 +1,11 @@
+2001-01-10 Federico Mena Quintero <federico@helixcode.com>
+
+ * Makefile.am: Make it work when gtk-doc is not installed.
+
+ * calendar/cal-client/Makefile.am: Likewise.
+
+ * calendar/cal-util/Makefile.am: Likewise.
+
2000-12-19 Federico Mena Quintero <federico@helixcode.com>
Added proper dependency lists to the gtk-doc mess.
diff --git a/help/devel/Makefile.am b/help/devel/Makefile.am
index 8e8ca1085c..77f9354ba9 100644
--- a/help/devel/Makefile.am
+++ b/help/devel/Makefile.am
@@ -53,6 +53,7 @@ clean-local:
maintainer-clean-local:
cd $(srcdir) && rm -rf html
+if ENABLE_GTK_DOC
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
(installfiles=`echo $(srcdir)/html/*.html`; \
@@ -68,6 +69,7 @@ install-data-local:
echo '-- Fixing Crossreferences' ; \
gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)|| true; \
fi)
+endif
dist-hook:
mkdir $(distdir)/html
diff --git a/help/devel/calendar/cal-client/Makefile.am b/help/devel/calendar/cal-client/Makefile.am
index 363c15b326..f3a2b39ec6 100644
--- a/help/devel/calendar/cal-client/Makefile.am
+++ b/help/devel/calendar/cal-client/Makefile.am
@@ -87,6 +87,7 @@ EXTRA_DIST = \
all: $(sgml_generated)
+if ENABLE_GTK_DOC
scan $(scan_generated): $(SOURCE_FILES)
-(cd $(srcdir) \
&& env CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) \
@@ -100,6 +101,13 @@ templates $(tmpl_sources) $(tmpl_generated): $(tmpl_dependencies)
sgml $(sgml_generated): $(sgml_dependencies)
cd $(srcdir) \
&& gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
+else
+scan $(scan_generated): $(SOURCE_FILES)
+
+templates $(tmpl_sources) $(tmpl_generated): $(tmpl_dependencies)
+
+sgml $(sgml_generated): $(sgml_dependencies)
+endif
clean-local:
rm -f *~ *.bak *.signals *-unused.txt
diff --git a/help/devel/calendar/cal-util/Makefile.am b/help/devel/calendar/cal-util/Makefile.am
index b7308800c8..7f567652ef 100644
--- a/help/devel/calendar/cal-util/Makefile.am
+++ b/help/devel/calendar/cal-util/Makefile.am
@@ -98,6 +98,7 @@ EXTRA_DIST = \
all: $(sgml_generated)
+if ENABLE_GTK_DOC
scan $(scan_generated): $(SOURCE_FILES)
-(cd $(srcdir) \
&& env CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) \
@@ -111,6 +112,13 @@ templates $(tmpl_sources) $(tmpl_generated): $(tmpl_dependencies)
sgml $(sgml_generated): $(sgml_dependencies)
cd $(srcdir) \
&& gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
+else
+scan $(scan_generated): $(SOURCE_FILES)
+
+templates $(tmpl_sources) $(tmpl_generated): $(tmpl_dependencies)
+
+sgml $(sgml_generated): $(sgml_dependencies)
+endif
clean-local:
rm -f *~ *.bak *.signals *-unused.txt
diff --git a/help/devel/calendar/cal-util/tmpl/cal-component.sgml b/help/devel/calendar/cal-util/tmpl/cal-component.sgml
index 14943a155e..cb0362f2d3 100644
--- a/help/devel/calendar/cal-util/tmpl/cal-component.sgml
+++ b/help/devel/calendar/cal-util/tmpl/cal-component.sgml
@@ -83,6 +83,12 @@ RFC 2445 iCalendar component object.
vtype of an uninitialized #CalComponent.
</para>
+@CAL_COMPONENT_NO_TYPE:
+@CAL_COMPONENT_EVENT:
+@CAL_COMPONENT_TODO:
+@CAL_COMPONENT_JOURNAL:
+@CAL_COMPONENT_FREEBUSY:
+@CAL_COMPONENT_TIMEZONE:
<!-- ##### ENUM CalComponentField ##### -->
<para>
@@ -90,6 +96,25 @@ RFC 2445 iCalendar component object.
are used by the calendar GUI code in &Evolution;.
</para>
+@CAL_COMPONENT_FIELD_CATEGORIES:
+@CAL_COMPONENT_FIELD_CLASSIFICATION:
+@CAL_COMPONENT_FIELD_COMPLETED:
+@CAL_COMPONENT_FIELD_DTEND:
+@CAL_COMPONENT_FIELD_DTSTART:
+@CAL_COMPONENT_FIELD_DUE:
+@CAL_COMPONENT_FIELD_GEO:
+@CAL_COMPONENT_FIELD_PERCENT:
+@CAL_COMPONENT_FIELD_PRIORITY:
+@CAL_COMPONENT_FIELD_SUMMARY:
+@CAL_COMPONENT_FIELD_TRANSPARENCY:
+@CAL_COMPONENT_FIELD_URL:
+@CAL_COMPONENT_FIELD_HAS_ALARMS:
+@CAL_COMPONENT_FIELD_ICON:
+@CAL_COMPONENT_FIELD_COMPLETE:
+@CAL_COMPONENT_FIELD_RECURRING:
+@CAL_COMPONENT_FIELD_OVERDUE:
+@CAL_COMPONENT_FIELD_COLOR:
+@CAL_COMPONENT_FIELD_NUM_FIELDS:
<!-- ##### ENUM CalComponentClassification ##### -->
<para>
@@ -97,24 +122,35 @@ RFC 2445 iCalendar component object.
component.
</para>
+@CAL_COMPONENT_CLASS_NONE:
+@CAL_COMPONENT_CLASS_PUBLIC:
+@CAL_COMPONENT_CLASS_PRIVATE:
+@CAL_COMPONENT_CLASS_CONFIDENTIAL:
+@CAL_COMPONENT_CLASS_UNKNOWN:
<!-- ##### STRUCT CalComponentDateTime ##### -->
<para>
This structure defines a date and time value.
</para>
+@value:
+@tzid:
<!-- ##### ENUM CalComponentPeriodType ##### -->
<para>
Defines how a period of time is specified.
</para>
+@CAL_COMPONENT_PERIOD_DATETIME:
+@CAL_COMPONENT_PERIOD_DURATION:
<!-- ##### STRUCT CalComponentPeriod ##### -->
<para>
This structure defines a period of time.
</para>
+@type:
+@start:
<!-- ##### STRUCT CalComponentText ##### -->
<para>
@@ -122,12 +158,18 @@ RFC 2445 iCalendar component object.
an alternate representation parameter.
</para>
+@value:
+@altrep:
<!-- ##### ENUM CalComponentTransparency ##### -->
<para>
</para>
+@CAL_COMPONENT_TRANSP_NONE:
+@CAL_COMPONENT_TRANSP_TRANSPARENT:
+@CAL_COMPONENT_TRANSP_OPAQUE:
+@CAL_COMPONENT_TRANSP_UNKNOWN:
<!-- ##### FUNCTION cal_component_gen_uid ##### -->
<para>
@@ -811,30 +853,46 @@ RFC 2445 iCalendar component object.
</para>
+@auid:
+@trigger:
+@occur:
<!-- ##### STRUCT CalComponentAlarms ##### -->
<para>
</para>
+@comp:
+@alarms:
<!-- ##### ENUM CalAlarmAction ##### -->
<para>
</para>
+@CAL_ALARM_NONE:
+@CAL_ALARM_AUDIO:
+@CAL_ALARM_DISPLAY:
+@CAL_ALARM_EMAIL:
+@CAL_ALARM_PROCEDURE:
+@CAL_ALARM_UNKNOWN:
<!-- ##### ENUM CalAlarmTriggerType ##### -->
<para>
</para>
+@CAL_ALARM_TRIGGER_NONE:
+@CAL_ALARM_TRIGGER_RELATIVE_START:
+@CAL_ALARM_TRIGGER_RELATIVE_END:
+@CAL_ALARM_TRIGGER_ABSOLUTE:
<!-- ##### STRUCT CalAlarmTrigger ##### -->
<para>
</para>
+@type:
<!-- ##### FUNCTION cal_component_has_alarms ##### -->
<para>
diff --git a/help/devel/calendar/cal-util/tmpl/cal-util.sgml b/help/devel/calendar/cal-util/tmpl/cal-util.sgml
index 0009f54fed..d0742746e5 100644
--- a/help/devel/calendar/cal-util/tmpl/cal-util.sgml
+++ b/help/devel/calendar/cal-util/tmpl/cal-util.sgml
@@ -19,6 +19,9 @@ Miscellaneous utilities
</para>
+@uid:
+@start:
+@end:
<!-- ##### FUNCTION cal_obj_instance_list_free ##### -->
<para>
@@ -33,6 +36,10 @@ Miscellaneous utilities
</para>
+@CALOBJ_TYPE_EVENT:
+@CALOBJ_TYPE_TODO:
+@CALOBJ_TYPE_JOURNAL:
+@CALOBJ_TYPE_ANY:
<!-- ##### FUNCTION cal_obj_uid_list_free ##### -->
<para>