From: Braden M. <br...@us...> - 2006-09-30 03:11:32
|
Update of /cvsroot/openvrml/openvrml/lib/gtkglext/docs/reference/gtkglext In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5605/docs/reference/gtkglext Modified Files: Tag: OpenVRML-GtkPlug-BRANCH .cvsignore Makefile.am Log Message: Use gtk-doc.make (from gtkdocize); copy version.xml to the srcdir so that non-srcdir builds work. Index: .cvsignore =================================================================== RCS file: /cvsroot/openvrml/openvrml/lib/gtkglext/docs/reference/gtkglext/Attic/.cvsignore,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** .cvsignore 27 Sep 2006 05:07:24 -0000 1.1.2.1 --- .cvsignore 30 Sep 2006 03:11:30 -0000 1.1.2.2 *************** *** 1 **** --- 1,17 ---- Makefile.in + gtkglext-decl.txt + gtkglext-decl-list.txt + gtkglext-overrides.txt + gtkglext-undocumented.txt + gtkglext-unused.txt + gtkglext.args + gtkglext.hierarchy + gtkglext.interfaces + gtkglext.prerequisites + gtkglext.signals + html + html.stamp + sgml.stamp + tmpl.stamp + version.xml + xml Index: Makefile.am =================================================================== RCS file: /cvsroot/openvrml/openvrml/lib/gtkglext/docs/reference/gtkglext/Makefile.am,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -C2 -d -r1.1.1.1.2.2 -r1.1.1.1.2.3 *** Makefile.am 29 Sep 2006 23:35:08 -0000 1.1.1.1.2.2 --- Makefile.am 30 Sep 2006 03:11:30 -0000 1.1.1.1.2.3 *************** *** 2,5 **** --- 2,19 ---- ## Makefile.am for gtkglext/docs/reference/gtkglext + GTKDOC_CFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/gdk \ + -I$(top_srcdir)/gtk \ + -I$(top_builddir) \ + -I$(top_builddir)/gdk \ + -I$(top_builddir)/gtk \ + $(GTKGLEXT_DEBUG_FLAGS) \ + $(GTKGLEXT_DEP_CFLAGS) + + GTKDOC_LIBS = \ + $(top_builddir)/gdk/$(gdkglext_targetlib) \ + $(top_builddir)/gtk/$(gtkglext_targetlib) + # The name of the module, e.g. 'glib'. DOC_MODULE = gtkglext *************** *** 23,27 **** # Extra options to supply to gtkdoc-fixref. ! FIXXREF_OPTIONS = # Used for dependencies. --- 37,41 ---- # Extra options to supply to gtkdoc-fixref. ! FIXXREF_OPTIONS = --extra-dir=$(builddir) # Used for dependencies. *************** *** 53,57 **** # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). content_files = \ ! version.xml \ building.sgml \ running.sgml --- 67,71 ---- # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). content_files = \ ! $(top_srcdir)/docs/reference/gtkglext/version.xml \ building.sgml \ running.sgml *************** *** 61,190 **** version.xml.in ! # CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib ! # contains GtkObjects/GObjects and you want to document signals and properties. ! GTKDOC_CFLAGS = \ ! @CFLAGS@ \ ! -I$(top_srcdir) \ ! -I$(top_srcdir)/gdk \ ! -I$(top_srcdir)/gtk \ ! -I$(top_builddir) \ ! -I$(top_builddir)/gdk \ ! -I$(top_builddir)/gtk \ ! $(GTKGLEXT_DEBUG_FLAGS) \ ! $(GTKGLEXT_DEP_CFLAGS) ! ! GTKDOC_LIBS = \ ! $(top_builddir)/gdk/$(gdkglext_targetlib) \ ! $(top_builddir)/gtk/$(gtkglext_targetlib) ! ! GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC) ! GTKDOC_LD=$(LIBTOOL) --mode=link $(CC) ! ! # If you need to override some of the declarations, place them in the ! # $(DOC_MODULE)-overrides.txt file and uncomment the second line here. ! DOC_OVERRIDES = ! #DOC_OVERRIDES = $(DOC_MODULE)-overrides.txt ! ! ! ! ########################################################################### ! # Everything below here is generic and you shouldn't need to change it. ! ########################################################################### ! ! TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) ! ! EXTRA_DIST = \ ! $(content_files) \ ! $(extra_files) \ ! $(HTML_IMAGES) \ ! $(DOC_MAIN_SGML_FILE) \ ! $(DOC_MODULE).types \ ! $(DOC_MODULE)-sections.txt \ ! $(DOC_OVERRIDES) ! ! DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ ! $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp ! ! SCANOBJ_FILES = \ ! $(DOC_MODULE).args \ ! $(DOC_MODULE).hierarchy \ ! $(DOC_MODULE).interfaces \ ! $(DOC_MODULE).prerequisites \ ! $(DOC_MODULE).signals ! ! if ENABLE_GTK_DOC ! all-local: html-build.stamp ! ! #### scan #### ! ! scan-build.stamp: $(HFILE_GLOB) ! @echo '*** Scanning header files ***' ! if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \ ! CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ ! else \ ! cd $(srcdir) ; \ ! for i in $(SCANOBJ_FILES) ; do \ ! test -f $$i || touch $$i ; \ ! done \ ! 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 ! ! $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp ! @true ! ! #### templates #### ! ! tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_OVERRIDES) ! @echo '*** Rebuilding template files ***' ! cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) ! touch tmpl-build.stamp ! ! tmpl.stamp: tmpl-build.stamp ! @true ! ! #### sgml #### ! ! sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml ! @echo '*** Building SGML ***' ! cd $(srcdir) && \ ! gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) ! touch sgml-build.stamp ! ! sgml.stamp: sgml-build.stamp ! @true ! ! #### html #### ! ! html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) ! @echo '*** Building HTML ***' ! test -d $(srcdir)/html || mkdir $(srcdir)/html ! cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) ! test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) ! @echo '-- Fixing Crossreferences' ! cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) ! touch html-build.stamp ! endif ! ! ############## ! ! clean-local: ! rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS) ! ! maintainer-clean-local: clean ! cd $(srcdir) && rm -rf sgml xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt ! install-data-local: ! $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) ! (installfiles=`echo $(srcdir)/html/*`; \ ! if test "$$installfiles" = '$(srcdir)/html/*'; \ ! then echo '-- Nothing to install' ; \ ! else \ ! for i in $$installfiles; do \ ! echo '-- Installing '$$i ; \ ! $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ ! done; \ ! echo '-- Installing $(srcdir)/html/index.sgml' ; \ ! $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ ! fi) --- 75,80 ---- version.xml.in ! $(top_srcdir)/docs/reference/gtkglext/version.xml: ! cp $(top_builddir)/docs/reference/gtkglext/version.xml $@ ! include $(top_srcdir)/gtk-doc.make |