diff options
author | Owen Taylor <otaylor@redhat.com> | 2001-04-13 14:48:28 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2001-04-13 14:48:28 +0000 |
commit | fb37aa1cfaeca471637e20fce6b2b3dc49716258 (patch) | |
tree | bc232f07d9c05f1491b0da31ca9657134bb5c4e4 /docs/reference/gdk | |
parent | 6070d96d1d4bc74489ab87a3f485b3f92802428a (diff) | |
download | gtk+-fb37aa1cfaeca471637e20fce6b2b3dc49716258.tar.gz |
Add $(top_builddir) to includes as necessary, Run gtkdoc-scangobj from
Fri Apr 13 10:41:10 2001 Owen Taylor <otaylor@redhat.com>
* */Makefile.am: Add $(top_builddir) to includes as necessary,
Run gtkdoc-scangobj from builddir, not srcdir, don't distribute
foo-doc.{top,bottom}, recomment in code to distribute HTML
images, with shell fixes.
* gtk/gtk.hierarchy gdk-pixbuf/gdk-pixbuf.{args,signals,hierarchy}:
Remove generated files.
Diffstat (limited to 'docs/reference/gdk')
-rw-r--r-- | docs/reference/gdk/.cvsignore | 6 | ||||
-rw-r--r-- | docs/reference/gdk/Makefile.am | 26 | ||||
-rw-r--r-- | docs/reference/gdk/gdk.types | 0 |
3 files changed, 19 insertions, 13 deletions
diff --git a/docs/reference/gdk/.cvsignore b/docs/reference/gdk/.cvsignore index c246ccc372..b029291bda 100644 --- a/docs/reference/gdk/.cvsignore +++ b/docs/reference/gdk/.cvsignore @@ -2,6 +2,12 @@ Makefile Makefile.in sgml html +gdk.args +gdk.signals +gdk.hierarchy gdk-decl.txt gdk-decl-list.txt gdk-unused.txt +*.stamp +*.lo +.libs diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am index e3dfbba41c..dcc8897245 100644 --- a/docs/reference/gdk/Makefile.am +++ b/docs/reference/gdk/Makefile.am @@ -6,8 +6,8 @@ DOC_MODULE=gdk # The top-level SGML file. DOC_MAIN_SGML_FILE=gdk-docs.sgml -# The directory containing the source code (if it contains documentation). -DOC_SOURCE_DIR=$(top_srcdir)/gdk +# The directory containing the source code. Relative to $(srcdir) +DOC_SOURCE_DIR=../../../gdk # Extra options to supply to gtkdoc-scan SCAN_OPTIONS=--deprecated-guards="GDK_ENABLE_BROKEN|GDK_DISABLE_DEPRECATED" @@ -34,9 +34,9 @@ IGNORE_HFILES= \ win32 \ x11 -# Extra files to add when scanning +# Extra files to add when scanning (relative to $srcdir) EXTRA_HFILES= \ - $(top_srcdir)/gdk/x11/gdkx.h + ../../../gdk/x11/gdkx.h # Images to copy into HTML directory HTML_IMAGES = @@ -87,14 +87,14 @@ all-local: html-build.stamp scan-build.stamp: $(HFILE_GLOB) @echo '*** Scanning header files ***' - cd $(srcdir) && ( \ - if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null ; then \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) ; \ + if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ else \ + cd $(srcdir) ; \ for i in $(SCANOBJ_FILES) ; do \ test -f $$i || touch $$i ; \ done \ - fi ) + fi cd $(srcdir) && \ gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) touch scan-build.stamp @@ -114,7 +114,7 @@ tmpl.stamp: tmpl-build.stamp #### sgml #### -sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) tmpl/*.sgml +sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) @echo '*** Building SGML ***' cd $(srcdir) && \ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS) @@ -174,12 +174,12 @@ dist-hook: dist-check-gtkdoc dist-hook-local mkdir $(distdir)/html -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl -cp $(srcdir)/sgml/*.sgml $(distdir)/sgml - -cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml -cp $(srcdir)/html/index.sgml $(distdir)/html -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html -# for i in $(HTML_IMAGES) ; do \ -# cp $(srcdir)/$$i $(distdir)/html ; \ -# done + images=$(HTML_IMAGES) ; \ + for i in $$images ; do \ + cp $(srcdir)/$$i $(distdir)/html ; \ + done .PHONY : dist-hook-local diff --git a/docs/reference/gdk/gdk.types b/docs/reference/gdk/gdk.types new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/docs/reference/gdk/gdk.types |