diff options
Diffstat (limited to 'doc/reference')
| -rw-r--r-- | doc/reference/Makefile.am | 2 | ||||
| -rw-r--r-- | doc/reference/matchbox/Makefile.am (renamed from doc/reference/matchbox2/Makefile.am) | 14 | ||||
| -rw-r--r-- | doc/reference/matchbox/matchbox2-docs.sgml (renamed from doc/reference/matchbox2/matchbox2-docs.sgml) | 0 | ||||
| -rw-r--r-- | doc/reference/matchbox/matchbox2-sections.txt (renamed from doc/reference/matchbox2/matchbox2-sections.txt) | 0 | ||||
| -rw-r--r-- | doc/reference/matchbox/version.xml.in | 1 | ||||
| -rw-r--r-- | doc/reference/matchbox2/version.xml.in | 1 |
6 files changed, 9 insertions, 9 deletions
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index e8bc530..76b77b3 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -1 +1 @@ -SUBDIRS=matchbox2 +SUBDIRS=matchbox diff --git a/doc/reference/matchbox2/Makefile.am b/doc/reference/matchbox/Makefile.am index f3987d6..8649c74 100644 --- a/doc/reference/matchbox2/Makefile.am +++ b/doc/reference/matchbox/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=matchbox2 +DOC_MODULE=matchbox # The top-level SGML file. You can change this if you want to. DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml @@ -18,14 +18,14 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml # gtk-doc will search all .c & .h files beneath here for inline comments # documenting the functions and macros. # e.g. DOC_SOURCE_DIR=../../../gtk -DOC_SOURCE_DIR=../../../matchbox2 +DOC_SOURCE_DIR=../../../matchbox # 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=--deprecated-guards="MATCHBOX2_DISABLE_DEPRECATED" +SCAN_OPTIONS=--deprecated-guards="MATCHBOX_DISABLE_DEPRECATED" # Extra options to supply to gtkdoc-mkdb. # e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml @@ -44,12 +44,12 @@ 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)/matchbox2/*.h +HFILE_GLOB=$(top_srcdir)/matchbox/*.h CFILE_GLOB= # Header files to ignore when scanning. # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h -IGNORE_HFILES=$(top_srcdir)/matchbox2/*-private.h +IGNORE_HFILES=$(top_srcdir)/matchbox/*-private.h EXTRA_HFILES= @@ -74,10 +74,10 @@ expand_content_files= # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) INCLUDES=\ - @MBWM_INCS@ + $(MBWM_INCS) $(MBWM_CFLAGS) GTKDOC_LIBS=\ @MBWM_LIBS@ \ - $(top_builddir)/matchbox2/libmatchbox2-@MBWM2_API_VERSION@.la + $(top_builddir)/matchbox/libmatchbox-@MBWM_API_VERSION@.la # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make diff --git a/doc/reference/matchbox2/matchbox2-docs.sgml b/doc/reference/matchbox/matchbox2-docs.sgml index 51933f7..51933f7 100644 --- a/doc/reference/matchbox2/matchbox2-docs.sgml +++ b/doc/reference/matchbox/matchbox2-docs.sgml diff --git a/doc/reference/matchbox2/matchbox2-sections.txt b/doc/reference/matchbox/matchbox2-sections.txt index eaa3e15..eaa3e15 100644 --- a/doc/reference/matchbox2/matchbox2-sections.txt +++ b/doc/reference/matchbox/matchbox2-sections.txt diff --git a/doc/reference/matchbox/version.xml.in b/doc/reference/matchbox/version.xml.in new file mode 100644 index 0000000..4314820 --- /dev/null +++ b/doc/reference/matchbox/version.xml.in @@ -0,0 +1 @@ +@MBW2_VERSION@ diff --git a/doc/reference/matchbox2/version.xml.in b/doc/reference/matchbox2/version.xml.in deleted file mode 100644 index 557b997..0000000 --- a/doc/reference/matchbox2/version.xml.in +++ /dev/null @@ -1 +0,0 @@ -@MBWM2_VERSION@ |