From 2e8ae828445817a89abe8db16f38f3a05d70b5a8 Mon Sep 17 00:00:00 2001 From: Sergey Udaltsov Date: Sun, 5 Mar 2006 02:09:45 +0000 Subject: build process improved --- Doxyfile.in | 5 ++++- Makefile.am | 6 +++++- configure.in | 8 ++++---- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Doxyfile.in b/Doxyfile.in index 371a6a0..40e2611 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -433,7 +433,10 @@ INPUT = libxklavier # *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm FILE_PATTERNS = xklavier.h \ - xklavier_config.h + xkl_config_item.h \ + xkl_config_rec.h \ + xkl_config_registry.h \ + xkl_engine.h # The RECURSIVE tag can be used to turn specify whether or not subdirectories # should be searched for input files as well. Possible values are YES and NO. diff --git a/Makefile.am b/Makefile.am index f531b81..a8a53e5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,11 @@ EXTRA_DIST = libxklavier.spec libxklavier.spec.in \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libxklavier.pc -doxydocs: libxklavier/xklavier.h libxklavier/xklavier_config.h +doxydocs: libxklavier/xklavier.h \ + libxklavier/xkl_config_item.h \ + libxklavier/xkl_config_rec.h \ + libxklavier/xkl_config_registry.h \ + libxklavier/xkl_engine.h if test "x$(DO_DOXYGEN)" = "xyes" ; then \ doxygen Doxyfile; \ fi; diff --git a/configure.in b/configure.in index 878c65b..67f9100 100644 --- a/configure.in +++ b/configure.in @@ -1,10 +1,10 @@ AC_INIT(libxklavier/xklavier.c) PACKAGE=libxklavier -MAJOR_VERSION=3 -MINOR_VERSION=0 +MAJOR_VERSION=2 +MINOR_VERSION=91 VERSION=$MAJOR_VERSION.$MINOR_VERSION -VERSION_INFO=10:0:0 +VERSION_INFO=11:0:0 AC_SUBST(MAJOR_VERSION) AC_SUBST(MINOR_VERSION) @@ -136,7 +136,7 @@ AC_SUBST(XML_LIBS) AC_SUBST(XML_CFLAGS) PKG_CHECK_MODULES(GLIB, \ - glib-2.0 >= 2.6.0, gobject-2.0 >= 2.6.0) + glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0) AC_SUBST(GLIB_LIBS) AC_SUBST(GLIB_CFLAGS) -- cgit v1.2.1