From 23faa57aef230148a5ab1c746a325be4ba029b02 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Mon, 23 Apr 2001 20:45:39 +0000 Subject: Port builddir != srcdir patch from the evolution-0-10-branch. svn path=/trunk/; revision=9522 --- doc/C/Makefile.am | 2 +- doc/ChangeLog | 4 ++++ doc/devel/ChangeLog | 9 +++++++++ doc/devel/calendar/cal-client/Makefile.am | 2 +- doc/devel/calendar/cal-util/Makefile.am | 2 +- doc/devel/executive-summary/Makefile.am | 8 ++++---- 6 files changed, 20 insertions(+), 7 deletions(-) (limited to 'doc') diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am index 486a10ca58..6aa9035909 100644 --- a/doc/C/Makefile.am +++ b/doc/C/Makefile.am @@ -22,7 +22,7 @@ EXTRA_DIST = \ all: evolution-guide evolution-guide: $(SGML_FILES) - -db2html evolution.sgml + -db2html $(srcdir)/evolution.sgml dist-hook: mkdir $(distdir)/evolution diff --git a/doc/ChangeLog b/doc/ChangeLog index e88fca6898..16226fafc1 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2001-04-23 Ettore Perazzoli + + * C/Makefile.am (evolution-guide): Use `$(srcdir)' here. + 2001-04-23 Ettore Perazzoli * C/Makefile.am (SGML_FILES): Add `evolution.sgml'. diff --git a/doc/devel/ChangeLog b/doc/devel/ChangeLog index 0237e82112..74c7e4070d 100644 --- a/doc/devel/ChangeLog +++ b/doc/devel/ChangeLog @@ -1,3 +1,12 @@ +2001-04-23 Ettore Perazzoli + + * executive-summary/Makefile.am (scan) [ENABLE_GTK_DOC]: Kludge + builddir != srcdir behavior by symlinking the $(DOC_MODULE).types + file into the builddir. + * calendar/cal-client/Makefile.am (scan) [ENABLE_GTK_DOC]: + Likewise. + * calendar/cal-util/Makefile.am (scan) [ENABLE_GTK_DOC]: Likewise. + 2001-04-23 Ettore Perazzoli * evolution-devel-guide.sgml: Disable the importer references here diff --git a/doc/devel/calendar/cal-client/Makefile.am b/doc/devel/calendar/cal-client/Makefile.am index 9e02b21f9b..109bdcc241 100644 --- a/doc/devel/calendar/cal-client/Makefile.am +++ b/doc/devel/calendar/cal-client/Makefile.am @@ -89,7 +89,7 @@ all: $(sgml_generated) if ENABLE_GTK_DOC scan $(scan_generated): $(SOURCE_FILES) - -(cd $(srcdir) \ + -(ln -sf $(srcdir)/$(DOC_MODULE).types . \ && env CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) \ gtkdoc-scanobj --module=$(DOC_MODULE) \ && gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) \ diff --git a/doc/devel/calendar/cal-util/Makefile.am b/doc/devel/calendar/cal-util/Makefile.am index 227fbb1a9c..291cb46f2d 100644 --- a/doc/devel/calendar/cal-util/Makefile.am +++ b/doc/devel/calendar/cal-util/Makefile.am @@ -100,7 +100,7 @@ all: $(sgml_generated) if ENABLE_GTK_DOC scan $(scan_generated): $(SOURCE_FILES) - -(cd $(srcdir) \ + -(ln -sf $(srcdir)/$(DOC_MODULE).types . \ && env CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) \ gtkdoc-scanobj --module=$(DOC_MODULE) \ && gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) \ diff --git a/doc/devel/executive-summary/Makefile.am b/doc/devel/executive-summary/Makefile.am index 38664929d8..a310f6c917 100644 --- a/doc/devel/executive-summary/Makefile.am +++ b/doc/devel/executive-summary/Makefile.am @@ -83,10 +83,10 @@ all: $(sgml_generated) if ENABLE_GTK_DOC scan $(scan_generated): $(SOURCE_FILES) - -(cd $(srcdir) \ - && env CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) \ - gtkdoc-scanobj --module=$(DOC_MODULE) \ - && gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) \ + -(ln -sf $(srcdir)/$(DOC_MODULE).types . \ + && env CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) \ + gtkdoc-scanobj --module=$(DOC_MODULE) \ + && gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) \ --ignore-headers="$(IGNORED_HEADER_FILES)" ) templates $(tmpl_sources) $(tmpl_generated): $(tmpl_dependencies) -- cgit v1.2.3