diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 15 | ||||
| -rw-r--r-- | doc/reference/tmpl/xklavier.sgml | 19 | ||||
| -rw-r--r-- | gtk-doc.make | 20 |
4 files changed, 27 insertions, 32 deletions
@@ -1,3 +1,8 @@ +2007-03-22 svu + + * configure.in: make build process a bit smarter (in relation to + xkbcomp), preparing 3.2 + 2007-03-19 svu * libxklavier/xklavier_toplevel.c: fixing the default group processing. diff --git a/configure.in b/configure.in index e34732a..1b72a15 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ AC_INIT(libxklavier/xklavier.c) PACKAGE=libxklavier MAJOR_VERSION=3 -MINOR_VERSION=1 +MINOR_VERSION=2 VERSION=$MAJOR_VERSION.$MINOR_VERSION VERSION_INFO=11:0:0 @@ -58,20 +58,26 @@ jm_LANGINFO_CODESET AC_CHECK_FUNCS(setlocale) AC_PATH_XTRA AC_ARG_WITH( xkb_base, - [ --with-xkb-base=DIR XKB base path (by default it is /usr/X11R6/lib/X11/xkb)], + [ --with-xkb-base=DIR XKB base path (by default it is /usr/share/X11/xkb)], xkb_base="$withval", if test -z "$x_libraries" ; then - xkb_base="/usr/lib/X11/xkb" + xkb_base="/usr/share/X11/xkb" else xkb_base="$x_libraries/X11/xkb" fi ) AC_DEFINE_UNQUOTED(XKB_BASE,"${xkb_base}",Base for XKB configuration) +AC_PATH_PROG(XKBCOMP, xkbcomp, ,$PATH:/usr/X11R6/bin:/usr/bin/X11) + AC_ARG_WITH( xkb_bin_base, [ --with-xkb-bin-base=DIR XKB executables base path], xkb_bin_base="$withval", - xkb_bin_base="$xkb_base" ) + if test -z "$XKBCOMP" ; then + xkb_bin_base="${xkb_base}" + else + xkb_bin_base="`dirname $XKBCOMP`" + fi ) AC_DEFINE_UNQUOTED(XKB_BIN_BASE,"${xkb_bin_base}",Base for XKB executables) @@ -169,6 +175,7 @@ if test "$enable_xkb_support" == "yes" ; then echo " XKB, libxkbfile is present" echo " default ruleset: $xkb_default_ruleset" echo " base: $xkb_base" + echo " xkbcomp is used from: $xkb_bin_base" else echo " XKB, libxkbfile is NOT present" fi diff --git a/doc/reference/tmpl/xklavier.sgml b/doc/reference/tmpl/xklavier.sgml index 48e22c2..f0154e2 100644 --- a/doc/reference/tmpl/xklavier.sgml +++ b/doc/reference/tmpl/xklavier.sgml @@ -71,25 +71,6 @@ Utility functions </para> @level: -@...: -@...: -@...: -@...: -@...: -@...: -@...: -@...: -@...: -@...: -@...: -@...: -@...: -@...: -@...: -@...: -@...: -@...: -@...: @...: diff --git a/gtk-doc.make b/gtk-doc.make index d50629a..8056cd6 100644 --- a/gtk-doc.make +++ b/gtk-doc.make @@ -42,12 +42,19 @@ CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-unused.txt $(DOC_STAMPS) if ENABLE_GTK_DOC all-local: html-build.stamp +else +all-local: +endif + +docs: html-build.stamp #### scan #### scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) @echo 'gtk-doc: Scanning header files' @-chmod -R u+w $(srcdir) + cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ else \ @@ -56,11 +63,9 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) 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 +$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true #### templates #### @@ -76,7 +81,7 @@ tmpl.stamp: tmpl-build.stamp #### xml #### -sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml $(expand_content_files) +sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) @echo 'gtk-doc: Building XML' @-chmod -R u+w $(srcdir) cd $(srcdir) && \ @@ -98,9 +103,6 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @echo 'gtk-doc: Fixing cross-references' cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) touch html-build.stamp -else -all-local: -endif ############## @@ -145,9 +147,9 @@ dist-hook: dist-check-gtkdoc dist-hook-local mkdir $(distdir)/html -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl -cp $(srcdir)/xml/*.xml $(distdir)/xml - -cp $(srcdir)/html/* $(distdir)/html + cp $(srcdir)/html/* $(distdir)/html if test -f $(srcdir)/$(DOC_MODULE).types; then \ cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \ fi -.PHONY : dist-hook-local +.PHONY : dist-hook-local docs |