diff options
| author | Robert Bragg <robert@linux.intel.com> | 2011-07-05 20:27:07 +0100 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2011-07-11 15:40:02 +0100 |
| commit | 40970ce9150ee7599ffd646f75b154f734d53c4b (patch) | |
| tree | 89deae1e6cddea415cb2215b64d254ee06b7929e | |
| parent | c6b0efb42d25300356831fa45aab44f48b10f72c (diff) | |
| download | cogl-40970ce9150ee7599ffd646f75b154f734d53c4b.tar.gz | |
dist: give 2.0 manual unique DOC_MODULE name
The experimental 2.0 reference manual was setup with DOC_MODULE name of
"cogl" which conflicted with the 1.x API manual. This meant that when
running make install for both the reference manuals all the html files
would end up bundled together in the same location. The 2.0 API
reference now has a DOC_MODULE name of "cogl-2.0-experimental" the
corresponding -sections.txt and -docs.xml.in files have also been
renamed to match this.
Signed-off-by: Neil Roberts <neil@linux.intel.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/reference/cogl-2.0-experimental/Makefile.am | 2 | ||||
| -rw-r--r-- | doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in (renamed from doc/reference/cogl-2.0-experimental/cogl-docs.xml.in) | 0 | ||||
| -rw-r--r-- | doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-sections.txt (renamed from doc/reference/cogl-2.0-experimental/cogl-sections.txt) | 0 |
4 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index cba739cf..015101d0 100644 --- a/configure.ac +++ b/configure.ac @@ -937,7 +937,7 @@ doc/reference/Makefile doc/reference/cogl/Makefile doc/reference/cogl/cogl-docs.xml doc/reference/cogl-2.0-experimental/Makefile -doc/reference/cogl-2.0-experimental/cogl-docs.xml +doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml examples/Makefile po/Makefile.in ) diff --git a/doc/reference/cogl-2.0-experimental/Makefile.am b/doc/reference/cogl-2.0-experimental/Makefile.am index 441e276e..05171493 100644 --- a/doc/reference/cogl-2.0-experimental/Makefile.am +++ b/doc/reference/cogl-2.0-experimental/Makefile.am @@ -9,7 +9,7 @@ AUTOMAKE_OPTIONS = 1.6 # of using the various options. # The name of the module, e.g. 'glib'. -DOC_MODULE=cogl +DOC_MODULE=cogl-2.0-experimental # The top-level SGML file. You can change this if you want to. DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml diff --git a/doc/reference/cogl-2.0-experimental/cogl-docs.xml.in b/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in index d8d676c9..d8d676c9 100644 --- a/doc/reference/cogl-2.0-experimental/cogl-docs.xml.in +++ b/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in diff --git a/doc/reference/cogl-2.0-experimental/cogl-sections.txt b/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-sections.txt index c4f83329..c4f83329 100644 --- a/doc/reference/cogl-2.0-experimental/cogl-sections.txt +++ b/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-sections.txt |