diff options
Diffstat (limited to 'docs')
-rw-r--r-- | docs/Makefile.am | 105 | ||||
-rw-r--r-- | docs/manual/Makefile.am | 19 | ||||
-rw-r--r-- | docs/manual/install/linux.rst | 4 |
3 files changed, 2 insertions, 126 deletions
diff --git a/docs/Makefile.am b/docs/Makefile.am deleted file mode 100644 index f50639e..0000000 --- a/docs/Makefile.am +++ /dev/null @@ -1,105 +0,0 @@ -## Process this file with automake to produce Makefile.in -SUBDIRS = manual - -# We require automake 1.6 at least. -AUTOMAKE_OPTIONS = 1.6 - -# This is a blank Makefile.am for using gtk-doc. -# Copy this to your project's API docs directory and modify the variables to -# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples -# of using the various options. - -# The name of the module, e.g. 'glib'. -DOC_MODULE=Ufo - -# Uncomment for versioned docs and specify the version of the module, e.g. '2'. -DOC_MODULE_VERSION=@VMAJ@ - -# The top-level XML file (SGML in the past). You can change this if you want to. -DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml - -# Directories containing the source code. -# gtk-doc will search all .c and .h files beneath these paths -# for inline comments documenting functions and macros. -# e.g. DOC_SOURCE_DIR=$(top_srcdir)/gtk $(top_srcdir)/gdk -DOC_SOURCE_DIR=$(top_srcdir)/ufo - -# Extra options to pass to gtkdoc-scangobj. Not normally needed. -SCANGOBJ_OPTIONS= - -# Extra options to supply to gtkdoc-scan. -# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" -SCAN_OPTIONS=--rebuild-types --rebuild-sections - -# Extra options to supply to gtkdoc-mkdb. -# e.g. MKDB_OPTIONS=--xml-mode --output-format=xml -MKDB_OPTIONS=--xml-mode --output-format=xml - -# Extra options to supply to gtkdoc-mktmpl -# e.g. MKTMPL_OPTIONS=--only-section-tmpl -MKTMPL_OPTIONS= - -# Extra options to supply to gtkdoc-mkhtml -MKHTML_OPTIONS= - -# Extra options to supply to gtkdoc-fixref. Not normally needed. -# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html -FIXXREF_OPTIONS= - -# Used for dependencies. The docs will be rebuilt if any of these change. -# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h -# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c -HFILE_GLOB=$(top_srcdir)/ufo/*.h -CFILE_GLOB=$(top_srcdir)/ufo/*.c - -# Extra header to include when scanning, which are not under DOC_SOURCE_DIR -# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h -EXTRA_HFILES= - -# Header files or dirs to ignore when scanning. Use base file/dir names -# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code -IGNORE_HFILES=ufo-mpi-messenger.h ufo-mpi-messenger.c - -# Images to copy into HTML directory. -# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png -HTML_IMAGES= - -# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). -# e.g. content_files=running.sgml building.sgml changes-2.0.sgml -content_files= - -# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded -# These files must be listed here *and* in content_files -# e.g. expand_content_files=running.sgml -expand_content_files= - -# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library. -# Only needed if you are using gtkdoc-scangobj to dynamically query widget -# signals and properties. -# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) -# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) -GTKDOC_CFLAGS= -GTKDOC_LIBS=$(top_builddir)/ufo/libufo.la - -# This includes the standard gtk-doc make rules, copied by gtkdocize. -include $(top_srcdir)/gtk-doc.make - -# Other files to distribute -# e.g. EXTRA_DIST += version.xml.in -EXTRA_DIST += - -# Files not to distribute -# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types -# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt -DISTCLEANFILES = $(DOC_MODULE).types $(DOC_MODULE)-sections.txt - -# Comment this out if you want 'make check' to test you doc status -# and run some sanity checks -if ENABLE_GTK_DOC -TESTS_ENVIRONMENT = cd $(srcdir) && \ - DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \ - SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) -#TESTS = $(GTKDOC_CHECK) -endif - --include $(top_srcdir)/git.mk diff --git a/docs/manual/Makefile.am b/docs/manual/Makefile.am deleted file mode 100644 index f6d68f5..0000000 --- a/docs/manual/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -EXTRA_DIST = \ - bugs.rst \ - changelog.rst \ - conf.py \ - copyright.rst \ - faq.rst \ - index.rst \ - json.rst \ - install/index.rst \ - install/linux.rst \ - install/mac.rst \ - _static/ufo-logo.png \ - using/background.rst \ - using/cluster.rst \ - using/filters.rst \ - using/index.rst \ - using/quickstart.rst - --include $(top_srcdir)/sphinx.make diff --git a/docs/manual/install/linux.rst b/docs/manual/install/linux.rst index 14721ba..f176f09 100644 --- a/docs/manual/install/linux.rst +++ b/docs/manual/install/linux.rst @@ -122,7 +122,7 @@ CMake will notify you, if some of the dependencies are not met. In case you want to install the library system-wide on a 64-bit machine you should generate the Makefiles with :: - $ cmake -DCMAKE_INSTALL_LIBDIR=/usr/lib64 <path-to-ufo> + $ cmake -DCMAKE_INSTALL_LIBDIR=lib64 <path-to-ufo> For earlier versions of PyGObject, it is necessary that the introspection files are located under ``/usr`` not ``/usr/local``. You can force the prefix by @@ -154,7 +154,7 @@ way :: $ mkdir -p build/ufo-filters $ cd build/ufo-filters - $ cmake <path-to-ufo-filters> -DLIBDIR=/usr/lib64 -DPREFIX=/usr + $ cmake <path-to-ufo-filters> -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib64 $ make $ make install |