updating the build process

diff --git a/ChangeLog b/ChangeLog
index a820df4..ee27228 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-08-04 svu
 
+       * *Makefile.am, configure.in, xkbrules.am:
+       Taking nice ideas from xkbdata. 
+       Thanks to Daniel Stone for his knowledge of autofoo
+
+2005-08-04 svu
+
        * symbols/in, symbols/lk,
        rules/base.xml.in, rules/compat/variantRename.lst:
        a bit reogranizing tamil stuff

diff --git a/Makefile.am b/Makefile.am
index bd393a0..d4ffb92 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = foreign
+
 SUBDIRS = compat geometry keycodes keymap po rules semantics symbols types docs
 
 EXTRA_DIST=config.rpath COPYING CREDITS README \

diff --git a/compat/Makefile.am b/compat/Makefile.am
index ea4b3a6..f8dd837 100644 (file)
--- a/compat/Makefile.am
+++ b/compat/Makefile.am
@@ -1,4 +1,6 @@
-compat_DATA = \
+compatdir = $(xkb_base)/compat
+
+dist_compat_DATA = \
 accessx basic complete \
 default iso9995 \
 japan keypad ledcaps \
@@ -6,9 +8,6 @@ lednum ledscroll \
 misc mousekeys norepeat \
 pc pc98 xfree86 \
 xtest README
-                                                                                          
-EXTRA_DIST= $(compat_DATA)
-                                                                                          
-compatdir = $(xkb_base)/compat
 
+include $(top_srcdir)/xkbrules.am
 

diff --git a/configure.in b/configure.in
index 722fc28..ceace64 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,22 +1,17 @@
-AC_INIT(rules/base.xml.in)
+AC_INIT(xkeyboard-config, 0.5)
+AC_CONFIG_SRCDIR(rules/base.xml.in)
+AM_INIT_AUTOMAKE([dist-bzip2])
+AM_MAINTAINER_MODE
 
-PACKAGE=xkeyboard-config
-GETTEXT_PACKAGE=$PACKAGE
-MAJOR_VERSION=0
-MINOR_VERSION=5
-VERSION=$MAJOR_VERSION.$MINOR_VERSION
-
-AC_SUBST(MAJOR_VERSION)
-AC_SUBST(MINOR_VERSION)
-AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
-AC_SUBST(GETTEXT_PACKAGE)
-
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 
 prefix=/usr
 
+AC_PATH_PROG([XKBCOMP], [xkbcomp], [not_found])
+if test x$XKBCOMP = xnot_found ; then
+        AC_ERROR([xkbcomp is required to install the xkb data files])
+fi
+
 AC_ARG_WITH( xkb_base,
              [  --with-xkb-base=DIR        XKB base path (by default it is /usr/X11R6/lib/X11/xkb)],
              xkb_base="$withval", 
@@ -43,8 +38,7 @@ AM_CONDITIONAL(CREATE_XKBCOMP_SYMLINK, test "x$enable_xkbcomp_symlink" == "xyes"
 AM_CONDITIONAL(USE_COMPAT_RULES, test "x$enable_compat_rules" == "xyes")
 
 AC_PROG_INTLTOOL(0.30)
-dnl AM_GNU_GETTEXT([external])
-dnl AM_GNU_GETTEXT()
+
 ALL_LINGUAS="af az bg cs da el en_GB fr hu nl ru rw sk sq sr sv tr uk vi zh_CN"
 
 AC_SUBST(xkb_base)

diff --git a/geometry/Makefile.am b/geometry/Makefile.am
index c059375..26a19c0 100644 (file)
--- a/geometry/Makefile.am
+++ b/geometry/Makefile.am
@@ -1,6 +1,8 @@
 SUBDIRS = digital_vndr  ibm_vndr  sgi_vndr
 
-geom_DATA = \
+geomdir = $(xkb_base)/geometry
+
+dist_geom_DATA = \
 amiga ataritt chicony \
 dell everex fujitsu \
 hp keytronic kinesis \
@@ -8,8 +10,4 @@ macintosh microsoft nec \
 northgate pc sony \
 sun winbook README
 
-EXTRA_DIST= $(geom_DATA)
-                                                                                          
-geomdir = $(xkb_base)/geometry
-
-
+include $(top_srcdir)/xkbrules.am

diff --git a/geometry/digital_vndr/Makefile.am b/geometry/digital_vndr/Makefile.am
index 24535df..821c0cc 100644 (file)
--- a/geometry/digital_vndr/Makefile.am
+++ b/geometry/digital_vndr/Makefile.am
@@ -1,6 +1,4 @@
-geom_DATA = \
-lk  pc  unix
-
-EXTRA_DIST= $(geom_DATA)
-                                                                                          
 geomdir = $(xkb_base)/geometry/digital_vndr
+
+dist_geom_DATA = \
+lk  pc  unix

diff --git a/geometry/ibm_vndr/Makefile.am b/geometry/ibm_vndr/Makefile.am
index 6e80f01..84130ac 100644 (file)
--- a/geometry/ibm_vndr/Makefile.am
+++ b/geometry/ibm_vndr/Makefile.am
@@ -1,6 +1,4 @@
-geom_DATA = \
-thinkpad
-
-EXTRA_DIST= $(geom_DATA)
-                                                                                          
 geomdir = $(xkb_base)/geometry/ibm_vndr
+
+dist_geom_DATA = \
+thinkpad

diff --git a/geometry/sgi_vndr/Makefile.am b/geometry/sgi_vndr/Makefile.am
index 52ce17d..5c76e4b 100644 (file)
--- a/geometry/sgi_vndr/Makefile.am
+++ b/geometry/sgi_vndr/Makefile.am
@@ -1,6 +1,4 @@
-geom_DATA = \
-indigo  indy  O2
-
-EXTRA_DIST= $(geom_DATA)
-                                                                                          
 geomdir = $(xkb_base)/geometry/sgi_vndr
+
+dist_geom_DATA = \
+indigo  indy  O2

diff --git a/keycodes/Makefile.am b/keycodes/Makefile.am
index 75629d2..d9af6c0 100644 (file)
--- a/keycodes/Makefile.am
+++ b/keycodes/Makefile.am
@@ -1,12 +1,12 @@
 SUBDIRS = digital_vndr sgi_vndr
 
-kc_DATA = \
+keycodesdir = $(xkb_base)/keycodes
+
+dist_keycodes_DATA = \
 aliases amiga ataritt \
 fujitsu hp ibm \
 macintosh powerpcps2 sony \
 sun xfree86 xfree98 \
 README
-                                                                                          
-EXTRA_DIST= $(kc_DATA)
-                                                                                          
-kcdir = $(xkb_base)/keycodes
+
+include $(top_srcdir)/xkbrules.am

diff --git a/keycodes/digital_vndr/Makefile.am b/keycodes/digital_vndr/Makefile.am
index 471f8bb..4f4cc4f 100644 (file)
--- a/keycodes/digital_vndr/Makefile.am
+++ b/keycodes/digital_vndr/Makefile.am
@@ -1,6 +1,4 @@
-kc_DATA = \
+keycodesdir = $(xkb_base)/keycodes/digital_vndr
+
+dist_keycodes_DATA = \
 lk pc
-                                                                                          
-EXTRA_DIST= $(kc_DATA)
-                                                                                          
-kcdir = $(xkb_base)/keycodes/digital_vndr

diff --git a/keycodes/sgi_vndr/Makefile.am b/keycodes/sgi_vndr/Makefile.am
index 9cf7804..f601268 100644 (file)
--- a/keycodes/sgi_vndr/Makefile.am
+++ b/keycodes/sgi_vndr/Makefile.am
@@ -1,6 +1,4 @@
-kc_DATA = \
+keycodesdir = $(xkb_base)/keycodes/sgi_vndr
+
+dist_keycodes_DATA = \
 indigo indy iris
-                                                                                          
-EXTRA_DIST= $(kc_DATA)
-                                                                                          
-kcdir = $(xkb_base)/keycodes/sgi_vndr

diff --git a/keymap/Makefile.am b/keymap/Makefile.am
index 7a1c112..621e5c8 100644 (file)
--- a/keymap/Makefile.am
+++ b/keymap/Makefile.am
@@ -1,10 +1,10 @@
 SUBDIRS = digital_vndr sgi_vndr sun_vndr
 
-km_DATA = \
+keymapdir = $(xkb_base)/keymap
+
+dist_keymap_DATA = \
 amiga ataritt macintosh \
 sony xfree86 xfree98 \
 README
-                                                                                          
-EXTRA_DIST= $(km_DATA)
-                                                                                          
-kmdir = $(xkb_base)/keymap
+
+include $(top_srcdir)/xkbrules.am

diff --git a/keymap/digital_vndr/Makefile.am b/keymap/digital_vndr/Makefile.am
index b17bbe3..b1961e5 100644 (file)
--- a/keymap/digital_vndr/Makefile.am
+++ b/keymap/digital_vndr/Makefile.am
@@ -1,8 +1,4 @@
-km_DATA = \
-us
-                                                                                          
-EXTRA_DIST= $(km_DATA)
-                                                                                          
-kmdir = $(xkb_base)/keymap/digital_vndr
-
+keymapdir = $(xkb_base)/keymap/digital_vndr
 
+dist_keymap_DATA = \
+us

diff --git a/keymap/sgi_vndr/Makefile.am b/keymap/sgi_vndr/Makefile.am
index 4acb4f2..234a336 100644 (file)
--- a/keymap/sgi_vndr/Makefile.am
+++ b/keymap/sgi_vndr/Makefile.am
@@ -1,4 +1,6 @@
-km_DATA = \
+keymapdir = $(xkb_base)/keymap/sgi_vndr
+
+dist_keymap_DATA = \
 be bg ca \
 ch cz de \
 dk dvorak \
@@ -8,7 +10,3 @@ hu it jp \
 no pl pt \
 ru se sk \
 th us
-                                                                                          
-EXTRA_DIST= $(km_DATA)
-                                                                                          
-kmdir = $(xkb_base)/keymap/sgi_vndr

diff --git a/keymap/sun_vndr/Makefile.am b/keymap/sun_vndr/Makefile.am
index 47953c4..0049ad9 100644 (file)
--- a/keymap/sun_vndr/Makefile.am
+++ b/keymap/sun_vndr/Makefile.am
@@ -1,9 +1,7 @@
-km_DATA = \
+keymapdir = $(xkb_base)/keymap/sun_vndr
+
+dist_keymap_DATA = \
 de es fi \
 fr no pl \
 ru se uk \
 us
-                                                                                          
-EXTRA_DIST= $(km_DATA)
-                                                                                          
-kmdir = $(xkb_base)/keymap/sun_vndr

diff --git a/semantics/Makefile.am b/semantics/Makefile.am
index 7830955..75cd189 100644 (file)
--- a/semantics/Makefile.am
+++ b/semantics/Makefile.am
@@ -1,7 +1,7 @@
-sem_DATA = \
+semanticsdir = $(xkb_base)/semantics
+
+dist_semantics_DATA = \
 basic complete default \
 xtest
-                                                                                          
-EXTRA_DIST= $(sem_DATA)
-                                                                                          
-semdir = $(xkb_base)/semantics
+
+include $(top_srcdir)/xkbrules.am

diff --git a/symbols/Makefile.am b/symbols/Makefile.am
index ef29101..f130f50 100644 (file)
--- a/symbols/Makefile.am
+++ b/symbols/Makefile.am
@@ -1,6 +1,7 @@
 SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
 
-symbols_DATA = \
+symbolsdir = $(xkb_base)/symbols
+dist_symbols_DATA = \
 al am ara \
 az be bd \
 bg br ba bt \
@@ -28,6 +29,4 @@ uz vn \
 altwin capslock compose ctrl group inet keypad level3 srvr_ctrl \
 eurosign
                                                                                           
-EXTRA_DIST= $(symbols_DATA)
-                                                                                          
-symbolsdir = $(xkb_base)/symbols
+include $(top_srcdir)/xkbrules.am

diff --git a/symbols/digital_vndr/Makefile.am b/symbols/digital_vndr/Makefile.am
index 8ae7f35..063fc8d 100644 (file)
--- a/symbols/digital_vndr/Makefile.am
+++ b/symbols/digital_vndr/Makefile.am
@@ -1,7 +1,5 @@
-symbols_DATA = \
+symbolsdir = $(xkb_base)/symbols/digital_vndr
+
+dist_symbols_DATA = \
 lk pc us \
 vt
-
-EXTRA_DIST= $(symbols_DATA)
-
-symbolsdir = $(xkb_base)/symbols/digital_vndr

diff --git a/symbols/fujitsu_vndr/Makefile.am b/symbols/fujitsu_vndr/Makefile.am
index 801bbf1..4e3a96e 100644 (file)
--- a/symbols/fujitsu_vndr/Makefile.am
+++ b/symbols/fujitsu_vndr/Makefile.am
@@ -1,6 +1,4 @@
-symbols_DATA = \
-jp us
-
-EXTRA_DIST= $(symbols_DATA)
-
 symbolsdir = $(xkb_base)/symbols/fujitsu_vndr
+
+dist_symbols_DATA = \
+jp us

diff --git a/symbols/hp_vndr/Makefile.am b/symbols/hp_vndr/Makefile.am
index d874bb6..6bcd4da 100644 (file)
--- a/symbols/hp_vndr/Makefile.am
+++ b/symbols/hp_vndr/Makefile.am
@@ -1,6 +1,4 @@
-symbols_DATA = \
-us
-
-EXTRA_DIST= $(symbols_DATA)
-
 symbolsdir = $(xkb_base)/symbols/hp_vndr
+
+dist_symbols_DATA = \
+us

diff --git a/symbols/macintosh_vndr/Makefile.am b/symbols/macintosh_vndr/Makefile.am
index 35d75c7..e2375d6 100644 (file)
--- a/symbols/macintosh_vndr/Makefile.am
+++ b/symbols/macintosh_vndr/Makefile.am
@@ -1,10 +1,8 @@
-symbols_DATA = \
+symbolsdir = $(xkb_base)/symbols/macintosh_vndr
+
+dist_symbols_DATA = \
 apple ch de dk \
 es fi fr \
 gb is it \
 nl no pt \
 se us
-
-EXTRA_DIST= $(symbols_DATA)
-
-symbolsdir = $(xkb_base)/symbols/macintosh_vndr

diff --git a/symbols/nec_vndr/Makefile.am b/symbols/nec_vndr/Makefile.am
index 2de1420..ff07006 100644 (file)
--- a/symbols/nec_vndr/Makefile.am
+++ b/symbols/nec_vndr/Makefile.am
@@ -1,6 +1,4 @@
-symbols_DATA = \
-jp
-
-EXTRA_DIST= $(symbols_DATA)
-
 symbolsdir = $(xkb_base)/symbols/nec_vndr
+
+dist_symbols_DATA = \
+jp

diff --git a/symbols/sgi_vndr/Makefile.am b/symbols/sgi_vndr/Makefile.am
index d16aa2b..b1123e7 100644 (file)
--- a/symbols/sgi_vndr/Makefile.am
+++ b/symbols/sgi_vndr/Makefile.am
@@ -1,6 +1,4 @@
-symbols_DATA = \
-jp
-
-EXTRA_DIST= $(symbols_DATA)
-
 symbolsdir = $(xkb_base)/symbols/sgi_vndr
+
+dist_symbols_DATA = \
+jp

diff --git a/symbols/sony_vndr/Makefile.am b/symbols/sony_vndr/Makefile.am
index 06ad913..e1a77d9 100644 (file)
--- a/symbols/sony_vndr/Makefile.am
+++ b/symbols/sony_vndr/Makefile.am
@@ -1,6 +1,4 @@
-symbols_DATA = \
-us
-
-EXTRA_DIST= $(symbols_DATA)
-
 symbolsdir = $(xkb_base)/symbols/sony_vndr
+
+dist_symbols_DATA = \
+us

diff --git a/symbols/sun_vndr/Makefile.am b/symbols/sun_vndr/Makefile.am
index af2a258..488c419 100644 (file)
--- a/symbols/sun_vndr/Makefile.am
+++ b/symbols/sun_vndr/Makefile.am
@@ -1,6 +1,4 @@
-symbols_DATA = \
-se us usb
-
-EXTRA_DIST= $(symbols_DATA)
-
 symbolsdir = $(xkb_base)/symbols/sun_vndr
+
+dist_symbols_DATA = \
+se us usb

diff --git a/symbols/xfree68_vndr/Makefile.am b/symbols/xfree68_vndr/Makefile.am
index 66669a8..50be49b 100644 (file)
--- a/symbols/xfree68_vndr/Makefile.am
+++ b/symbols/xfree68_vndr/Makefile.am
@@ -1,6 +1,4 @@
-symbols_DATA = \
-amiga ataritt
-
-EXTRA_DIST= $(symbols_DATA)
-
 symbolsdir = $(xkb_base)/symbols/xfree68_vndr
+
+dist_symbols_DATA = \
+amiga ataritt

diff --git a/types/Makefile.am b/types/Makefile.am
index ba1ee76..19f1c5e 100644 (file)
--- a/types/Makefile.am
+++ b/types/Makefile.am
@@ -1,9 +1,9 @@
-types_DATA = \
+typesdir = $(xkb_base)/types
+
+dist_types_DATA = \
 basic cancel caps \
 complete default extra \
 iso9995 mousekeys numpad \
 pc README
 
-EXTRA_DIST= $(types_DATA)
-                                                                                          
-typesdir = $(xkb_base)/types
+include $(top_srcdir)/xkbrules.am

diff --git a/xkbrules.am b/xkbrules.am
new file mode 100644 (file)
index 0000000..48ef07f
--- /dev/null
+++ b/xkbrules.am
@@ -0,0 +1,14 @@
+# Common rules for building *.dir files in all xkb subdirectories
+# Replaces Imake's MakeXkbDir() rule
+# svu: taken from xkbdata
+
+MOSTLYCLEANFILES = $(subdir).dir
+
+dir_DATA = $(subdir).dir
+
+dirdir = $(xkb_base)
+
+$(subdir).dir:
+       -rm -f $@
+       $(XKBCOMP) -lfhlpR -o $@ '*'
+