From fb7139bd591182f337e7d274885c10c41015067e Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 17 Dec 2021 16:53:39 +1000 Subject: Drop autotools Even the xserver is now meson only and building a desktop stack without meson is not possible anymore. So let's drop autotools for meson, which is much easier to maintain. --- .gitlab-ci.yml | 77 ++++----------------- Makefile.am | 26 ------- autogen.sh | 17 ----- compat/Makefile.am | 10 --- configure.ac | 106 ----------------------------- docs/Makefile.am | 1 - geometry/Makefile.am | 21 ------ keycodes/Makefile.am | 25 ------- man/Makefile.am | 18 ----- rules/Makefile.am | 173 ----------------------------------------------- rules/compat/Makefile.am | 63 ----------------- symbols/Makefile.am | 125 ---------------------------------- types/Makefile.am | 7 -- xkeyboard-config.pc.in | 8 --- 14 files changed, 15 insertions(+), 662 deletions(-) delete mode 100644 Makefile.am delete mode 100755 autogen.sh delete mode 100644 compat/Makefile.am delete mode 100644 configure.ac delete mode 100644 docs/Makefile.am delete mode 100644 geometry/Makefile.am delete mode 100644 keycodes/Makefile.am delete mode 100644 man/Makefile.am delete mode 100644 rules/Makefile.am delete mode 100644 rules/compat/Makefile.am delete mode 100644 symbols/Makefile.am delete mode 100644 types/Makefile.am delete mode 100644 xkeyboard-config.pc.in diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 61229af..3ef00b6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,7 @@ variables: # Changing the tag will rebuild the container images. The value is just a # string, but we use the date for human benefits. - FDO_DISTRIBUTION_TAG: '2021-12-15.0' + FDO_DISTRIBUTION_TAG: '2021-12-17.1' stages: @@ -44,7 +44,7 @@ container-prep: variables: GIT_STRATEGY: none # minimal set of packages required to build xkeyboard-config. - BASE_PACKAGES: 'xorg-util-macros autoconf automake make gettext pkg-config gcc grep m4 python meson ninja git' + BASE_PACKAGES: 'xorg-util-macros gettext pkg-config gcc grep m4 python meson ninja git diffutils' # extra packages we need for various tests EXTRA_PACKAGES: 'tree libxml2 bison xorg-xkbcomp python-pytest python-libevdev python-yaml yq libxkbcommon libxslt' FDO_DISTRIBUTION_PACKAGES: $BASE_PACKAGES $EXTRA_PACKAGES @@ -55,18 +55,6 @@ container-prep: - .fdo.distribution-image@arch -.default_build: - extends: .default_setup - script: - - rm -rf "$BUILDDIR" - - mkdir -p "$BUILDDIR" - - mkdir -p "$INSTDIR" - - autoreconf -ivf - - pushd "$BUILDDIR" - - ../configure --prefix="$INSTDIR" --disable-silent-rules --disable-runtime-deps "$CONFIGURE_ARGS" - - make - - if test x"$MAKE_EXTRA_COMMAND" != "x"; then make $MAKE_EXTRA_COMMAND; fi - .meson_build: extends: .default_setup @@ -98,38 +86,7 @@ check-merge-request: allow_failure: true dependencies: [] -make_install: - extends: .default_build - stage: build - variables: - MAKE_EXTRA_COMMAND: "install" - after_script: - - tree $INSTDIR - artifacts: - name: installed files - expire_in: 2 weeks - paths: - - $INSTDIR/ - -make_check: - extends: .default_build - stage: build - variables: - MAKE_EXTRA_COMMAND: "check" - -make_distcheck: - extends: .default_build - stage: build - variables: - # pass VERSION to make so our tarball has a fixed name. - MAKE_EXTRA_COMMAND: "VERSION=master distcheck" - artifacts: - name: tarball - expire_in: 2 weeks - paths: - - $BUILDDIR/xkeyboard-config-master.tar.bz2 - -meson_build: +meson_install: extends: .meson_build stage: build variables: @@ -153,15 +110,11 @@ meston_dist: stage: build variables: NINJA_EXTRA_COMMAND: "dist" - -meson_from_tarball: - extends: .meson_build - stage: dist - dependencies: - - make_distcheck - variables: - TARBALL: "xkeyboard-config-master.tar.bz2" - GIT_STRATEGY: none + artifacts: + name: tarball + expire_in: 2 weeks + paths: + - $BUILDDIR/meson-dist/xkeyboard-config-*.tar.xz # Checks for new evdev keycodes to be added to keycodes/evdev evdev keycode check: @@ -203,8 +156,8 @@ evdev keysym check (xorgproto master): xmllint: extends: - .default_setup - dependencies: ['make_install'] - needs: ['make_install'] + dependencies: ['meson_install'] + needs: ['meson_install'] stage: test script: - xmllint --dtdvalid "$INSTDIR/share/X11/xkb/rules/xkb.dtd" $INSTDIR/share/X11/xkb/rules/*.xml > /dev/null @@ -224,8 +177,8 @@ match group names to registry: xkbcli list check: extends: - .default_setup - dependencies: ['make_install'] - needs: ['make_install'] + dependencies: ['meson_install'] + needs: ['meson_install'] stage: test script: - xkbcli list --skip-default-paths --load-exotic "$INSTDIR/share/X11/xkb" > rmlvo.yaml @@ -245,7 +198,7 @@ xkbcli list check: layout_tests: extends: .default_setup stage: test - needs: ["make_install"] + needs: ["meson_install"] script: # make sure the custom layout resolves to something - ln -s "$INSTDIR/share/X11/xkb/symbols/us" "$INSTDIR/share/X11/xkb/symbols/custom" @@ -289,7 +242,7 @@ keymap_tests: artifacts: reports: junit: results.xml - # use the installed tree from the make_install job + # use the installed tree from the meson_install job needs: - - job: make_install + - job: meson_install artifacts: true diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 44189a4..0000000 --- a/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -AUTOMAKE_OPTIONS = foreign - -SUBDIRS = compat geometry keycodes po rules symbols types docs man - -pkgconfigdir = $(datadir)/pkgconfig -pkgconfig_DATA = xkeyboard-config.pc - -mesonfiles = meson.build \ - meson_options.txt \ - po/meson.build \ - rules/meson.build \ - rules/compat/meson.build \ - $(NULL) - -EXTRA_DIST=config.rpath COPYING README \ - autogen.sh \ - xkeyboard-config.pc.in \ - $(mesonfiles) - -ACLOCAL_AMFLAGS = -I m4 - -# we don't care about runtime dependencies during distcheck -AM_DISTCHECK_CONFIGURE_FLAGS=--disable-runtime-deps - -sync-po: - rsync -Lrtvz translationproject.org::tp/latest/xkeyboard-config/ po diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 5f595de..0000000 --- a/autogen.sh +++ /dev/null @@ -1,17 +0,0 @@ -#! /bin/sh - -srcdir=`dirname "$0"` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd "$srcdir" - -autoreconf -v --install --force || exit 1 - -git config --local --get format.subjectPrefix >/dev/null 2>&1 || - git config --local format.subjectPrefix "PATCH xkeyboard-config" - -cd "$ORIGDIR" || exit $? -if test -z "$NOCONFIGURE"; then - exec "$srcdir"/configure "$@" -fi diff --git a/compat/Makefile.am b/compat/Makefile.am deleted file mode 100644 index 3597832..0000000 --- a/compat/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -compatdir = $(xkb_base)/compat - -dist_compat_DATA = \ - accessx basic caps complete \ - iso9995 \ - japan ledcaps ledcompose \ - lednum ledscroll level5 \ - misc mousekeys \ - olpc pc pc98 xfree86 \ - xtest README diff --git a/configure.ac b/configure.ac deleted file mode 100644 index e915fcc..0000000 --- a/configure.ac +++ /dev/null @@ -1,106 +0,0 @@ -AC_INIT(xkeyboard-config, 2.34) # change version in meson.build as well -AC_CONFIG_SRCDIR(rules/base.xml) -AM_INIT_AUTOMAKE([foreign dist-bzip2]) - -# Require X.Org macros 1.12 or later for XORG_WITH_XSLTPROC -m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.12 or later before - running autoconf/autogen])]) -XORG_MACROS_VERSION(1.12) -XORG_MANPAGE_SECTIONS -XORG_WITH_XSLTPROC -AC_PROG_SED -AM_PATH_PYTHON([3.0]) - -AC_SUBST(VERSION) - -AC_ARG_WITH( xkb_base, - [AS_HELP_STRING([--with-xkb-base=DIR],[XKB base path @<:@DATADIR/X11/xkb@:>@])], - xkb_base="$withval", - xkb_base="${datadir}/X11/xkb" ) - -AC_ARG_WITH( xkb_rules_symlink, - [ --with-xkb-rules-symlink=NAME1(,NAME2)* create symlink(s) to "old style" rules files (xfree86 and/or xorg)], - xkb_rules_symlink="$withval" ) - -AC_ARG_ENABLE( compat_rules, - [ --enable-compat-rules create compatibility rules], - enable_compat_rules="$enableval", - enable_compat_rules="yes" ) - -# xkeyboard-config does not have build-time dependencies. However, it does -# have run-time dependencies and keyboard layouts may not work without the -# right libX11 or xproto installed. -# By default, we enable these run-time dependencies as build-time -# dependencies so that those building on their local machines are warned -# that the resulting build may not work. -AC_ARG_ENABLE( runtime-deps, - [ --enable-runtime-deps use run-time dependencies as build-time dependencies], - enable_runtime_deps="$enableval", - enable_runtime_deps="yes") - -if test "x$enable_runtime_deps" = "xyes"; then - PKG_CHECK_MODULES(DEPS, [xproto >= 7.0.20] [x11 >= 1.4.3], [have_deps=yes], [have_deps=no]) - if test "x$have_deps" = "xno" ; then - AC_MSG_WARN([ - Required dependencies not found. These dependencies are - run-time dependencies only and not required for building. - Skip this check with --disable-runtime-deps. - - Installing this version of xkeyboard-config on a host - without the required dependencies may result in unusable - keyboard layouts. - ]) - - AC_MSG_ERROR([$DEPS_PKG_ERRORS]) - fi -fi - -AM_CONDITIONAL(CREATE_RULES_SYMLINK, test "x$xkb_rules_symlink" != "x") - -AM_CONDITIONAL(USE_COMPAT_RULES, test "x$enable_compat_rules" = "xyes") - -# **** -# i18n -# **** -AM_GNU_GETTEXT_VERSION([0.19.8]) -AM_GNU_GETTEXT([external]) - -GETTEXT_PACKAGE=xkeyboard-config -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package]) - -AC_SUBST(xkb_base) -AC_SUBST(xkb_rules_symlink) - -# needed for out-of-tree builds -AC_CONFIG_COMMANDS([mkdir], [$MKDIR_P rules/compat/]) -AC_OUTPUT([ po/Makefile.in -Makefile -compat/Makefile -geometry/Makefile -keycodes/Makefile -rules/Makefile -symbols/Makefile -types/Makefile -xkeyboard-config.pc -docs/Makefile -man/Makefile -]) - -echo '***********************************************************' -echo " $PACKAGE_NAME is configured with the following parameters:" -echo " XKB base directory: $xkb_base" -if test -z "$xkb_rules_symlink" ; then - echo " Symbolic link(s) to legacy rules are not created" -else - echo " Symbolic link(s) to legacy rules: $xkb_rules_symlink" -fi - -if test "$enable_compat_rules" = "yes" ; then - echo " Compatibility rules are included" -else - echo " Compatibility rules are not included" -fi -echo '***********************************************************' - diff --git a/docs/Makefile.am b/docs/Makefile.am deleted file mode 100644 index 5ae0e80..0000000 --- a/docs/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST= README.config README.enhancing README.symbols HOWTO.transition HOWTO.testing diff --git a/geometry/Makefile.am b/geometry/Makefile.am deleted file mode 100644 index d88bc9f..0000000 --- a/geometry/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -geomdir = $(xkb_base)/geometry - -dist_geom_DATA = \ - amiga ataritt chicony \ - dell everex fujitsu \ - hhk hp keytronic kinesis \ - macintosh microsoft nec nokia \ - northgate pc sanwa sony thinkpad \ - sun teck steelseries typematrix winbook README - -digitaldir = $(geomdir)/digital_vndr -dist_digital_DATA = \ - digital_vndr/lk \ - digital_vndr/pc \ - digital_vndr/unix - -sgidir = $(geomdir)/sgi_vndr -dist_sgi_DATA = \ - sgi_vndr/indigo \ - sgi_vndr/indy \ - sgi_vndr/O2 diff --git a/keycodes/Makefile.am b/keycodes/Makefile.am deleted file mode 100644 index 0405030..0000000 --- a/keycodes/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -keycodesdir = $(xkb_base)/keycodes - -dist_keycodes_DATA = \ - aliases \ - amiga \ - ataritt \ - empty \ - evdev \ - fujitsu \ - hp \ - ibm \ - jolla \ - macintosh \ - olpc \ - sony \ - sun \ - xfree86 \ - xfree98 \ - README - -digitaldir = $(keycodesdir)/digital_vndr -dist_digital_DATA = digital_vndr/lk digital_vndr/pc - -sgidir = $(keycodesdir)/sgi_vndr -dist_sgi_DATA = sgi_vndr/indigo sgi_vndr/indy sgi_vndr/iris diff --git a/man/Makefile.am b/man/Makefile.am deleted file mode 100644 index 8b3946d..0000000 --- a/man/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -EXTRA_DIST = man.xsl - -if HAVE_XSLTPROC -miscmandir = $(MISC_MAN_DIR) -miscman_PRE = xkeyboard-config.man -miscman_DATA = $(miscman_PRE:man=@MISC_MAN_SUFFIX@) -CLEANFILES = $(miscman_DATA) $(miscman_PRE) -SUFFIXES = .$(MISC_MAN_SUFFIX) .man -MAN_SUBSTS += -e 's|__xkb_base__|$(xkb_base)|g' - -xkeyboard-config.man: $(top_srcdir)/rules/evdev.xml $(srcdir)/man.xsl - $(XSLTPROC) -nonet $(srcdir)/man.xsl $(top_srcdir)/rules/evdev.xml > $@ - -# First sed swaps @appmansuffix@ back to __appmansuffix__ for the MAN_SUBSTS -.man.$(MISC_MAN_SUFFIX): - $(SED) -e 's|@\(\<[a-z_]*\>\)@|__\1__|g' < $< | $(SED) $(MAN_SUBSTS) > $@ - -endif diff --git a/rules/Makefile.am b/rules/Makefile.am deleted file mode 100644 index d23f043..0000000 --- a/rules/Makefile.am +++ /dev/null @@ -1,173 +0,0 @@ -rulesdir = $(xkb_base)/rules -xmldir = $(rulesdir) - -EXTRA_DIST = -CLEANFILES = -BUILT_SOURCES = - -if CREATE_RULES_SYMLINK -# extra_rules_file = $(xkb_rules_symlink) -# extra_dir_file = $(extra_rules_file).xml -# extra_lst_file = $(extra_rules_file).lst - -install-data-hook: - for file in `echo "$(xkb_rules_symlink)" | sed 's/,/ /'` ; do \ - extra_rules_file=$$file ; \ - extra_dir_file=$$extra_rules_file.xml ; \ - extra_lst_file=$$extra_rules_file.lst ; \ - ln -sf base $(DESTDIR)$(rulesdir)/$$extra_rules_file ; \ - ln -sf base.lst $(DESTDIR)$(rulesdir)/$$extra_lst_file ; \ - ln -sf base.xml $(DESTDIR)$(rulesdir)/$$extra_dir_file ; \ - done - -else -install-data-hook: - -endif - -# rules/compat parts -# Because we rely on the generated sources of that file, we need to keep these -# in the same Makefile.am - -layout_mappings=$(srcdir)/compat/layoutsMapping.lst -variant_mappings=$(srcdir)/compat/variantsMapping.lst - -compat_dist_parts = \ - compat/0003-lists.part \ - compat/0028-lv_c.part \ - compat/0029-l1v1_c.part \ - compat/0030-l2v2_c.part \ - compat/0031-l3v3_c.part \ - compat/0032-l4v4_c.part \ - compat/0041-o_s.part \ - compat/0041-o_s.part \ - compat/0028-lv_c.part \ - compat/0029-l1v1_c.part \ - compat/0030-l2v2_c.part \ - compat/0031-l3v3_c.part \ - compat/0032-l4v4_c.part \ - $(NULL) - -compat_generated_parts = \ - compat/0012-ml_s.part \ - compat/0014-ml1_s.part \ - compat/0017-ml2_s.part \ - compat/0019-ml3_s.part \ - compat/0021-ml4_s.part \ - compat/0010-mlv_s.part \ - compat/0016-ml1v1_s.part \ - compat/0023-ml2v2_s.part \ - compat/0024-ml3v3_s.part \ - compat/0025-ml4v4_s.part \ - $(NULL) - -compat_parts = $(compat_generated_parts) $(compat_dist_parts) -if USE_COMPAT_RULES -BUILT_SOURCES += $(compat_parts) -endif - -map_script = $(srcdir)/compat/map-variants.py - -compat/0014-ml1_s.part: $(map_script) $(layout_mappings) $(variant_mappings) - $(map_script) --want=mls --number=1 $@ $(layout_mappings) $(variant_mappings) - -compat/0017-ml2_s.part: $(map_script) $(layout_mappings) $(variant_mappings) - $(map_script) --want=mls --number=2 $@ $(layout_mappings) $(variant_mappings) - -compat/0019-ml3_s.part: $(map_script) $(layout_mappings) $(variant_mappings) - $(map_script) --want=mls --number=3 $@ $(layout_mappings) $(variant_mappings) - -compat/0021-ml4_s.part: $(map_script) $(layout_mappings) $(variant_mappings) - $(map_script) --want=mls --number=4 $@ $(layout_mappings) $(variant_mappings) - -compat/0016-ml1v1_s.part: $(map_script) $(variant_mappings) - $(map_script) --want=mlvs --number=1 $@ $(variant_mappings) - -compat/0023-ml2v2_s.part: $(map_script) $(variant_mappings) - $(map_script) --want=mlvs --number=2 $@ $(variant_mappings) - -compat/0024-ml3v3_s.part: $(map_script) $(variant_mappings) - $(map_script) --want=mlvs --number=3 $@ $(variant_mappings) - -compat/0025-ml4v4_s.part: $(map_script) $(variant_mappings) - $(map_script) --want=mlvs --number=4 $@ $(variant_mappings) - -compat/0012-ml_s.part: $(map_script) $(layout_mappings) $(variant_mappings) - $(map_script) --want=mls $@ $(layout_mappings) $(variant_mappings) - -compat/0010-mlv_s.part: $(map_script) $(layout_mappings) $(variant_mappings) - $(map_script) --want=mlvs $@ $(variant_mappings) - -EXTRA_DIST += $(layout_mappings) $(variant_mappings) $(compat_dist_parts) $(map_script) -CLEANFILES += $(compat_generated_parts) - -# end of the rules/compat parts, now for the parts in rules/ - -parts = \ - 0000-hdr.part \ - 0001-lists.part \ - 0002-RULESET.lists.part \ - 0004-RULESET.m_k.part \ - 0005-l1_k.part \ - 0006-l_k.part \ - 0007-o_k.part \ - 0008-ml_g.part \ - 0009-m_g.part \ - 0011-mlv_s.part \ - 0013-ml_s.part \ - 0015-ml1_s.part \ - 0018-ml2_s.part \ - 0020-ml3_s.part \ - 0022-ml4_s.part \ - 0026-RULESET.m_s.part \ - 0027-RULESET.ml_s1.part \ - 0033-ml_c.part \ - 0034-ml1_c.part \ - 0035-m_t.part \ - 0036-lo_s.part \ - 0037-l1o_s.part \ - 0038-l2o_s.part \ - 0039-l3o_s.part \ - 0040-l4o_s.part \ - 0042-o_s.part \ - 0043-o_c.part \ - 0044-o_t.part - -if USE_COMPAT_RULES -parts += $(compat_parts) -endif - -rules_files = base evdev xfree98 - -lst_files = base.lst evdev.lst - -SUFFIXES = .xml .lst - -.xml.lst: - perl $(srcdir)/xml2lst.pl < $< > $@ - -base_parts=$(subst RULESET,base,$(parts)) -base: $(base_parts) merge.py - $(srcdir)/merge.py --srcdir=$(srcdir) --builddir=$(builddir) $(base_parts) > $@ - -evdev_parts=$(subst RULESET,evdev,$(parts)) -evdev: $(evdev_sources) merge.py - $(srcdir)/merge.py --srcdir=$(srcdir) --builddir=$(builddir) $(evdev_parts) > $@ - -dist_files = xkb.dtd README - -rules_DATA = $(rules_files) $(lst_files) $(dist_files) - -xml_DATA = base.xml evdev.xml base.extras.xml evdev.extras.xml - -$(srcdir)/evdev.xml: base.xml - cp $(srcdir)/base.xml $@ - -$(srcdir)/evdev.extras.xml: base.extras.xml - cp $(srcdir)/base.extras.xml $@ - -EXTRA_DIST += $(xml_DATA) xfree98 \ - $(base_parts) $(evdev_parts) $(compat_parts) \ - xml2lst.pl merge.py xkb.its $(dist_files) - -CLEANFILES += base base.lst evdev evdev.lst diff --git a/rules/compat/Makefile.am b/rules/compat/Makefile.am deleted file mode 100644 index afb720f..0000000 --- a/rules/compat/Makefile.am +++ /dev/null @@ -1,63 +0,0 @@ -layout_mappings=$(srcdir)/layoutsMapping.lst -variant_mappings=$(srcdir)/variantsMapping.lst - -dist_parts= \ - 0041-o_s.part \ - 0028-lv_c.part \ - 0029-l1v1_c.part \ - 0030-l2v2_c.part \ - 0031-l3v3_c.part \ - 0032-l4v4_c.part - -scripts= \ - 0012-ml_s.part \ - 0014-ml1_s.part \ - 0017-ml2_s.part \ - 0019-ml3_s.part \ - 0021-ml4_s.part \ - 0010-mlv_s.part \ - 0016-ml1v1_s.part \ - 0023-ml2v2_s.part \ - 0024-ml3v3_s.part \ - 0025-ml4v4_s.part \ - $(NULL) - -BUILT_SOURCES = - -if USE_COMPAT_RULES -BUILT_SOURCES += $(scripts) $(dist_parts) -endif - -0014-ml1_s.part: map-variants.py $(layout_mappings) $(variant_mappings) - $(srcdir)/map-variants.py --want=mls --number=1 $@ $(layout_mappings) $(variant_mappings) - -0017-ml2_s.part: map-variants.py $(layout_mappings) $(variant_mappings) - $(srcdir)/map-variants.py --want=mls --number=2 $@ $(layout_mappings) $(variant_mappings) - -0019-ml3_s.part: map-variants.py $(layout_mappings) $(variant_mappings) - $(srcdir)/map-variants.py --want=mls --number=3 $@ $(layout_mappings) $(variant_mappings) - -0021-ml4_s.part: map-variants.py $(layout_mappings) $(variant_mappings) - $(srcdir)/map-variants.py --want=mls --number=4 $@ $(layout_mappings) $(variant_mappings) - -0016-ml1v1_s.part: map-variants.py $(variant_mappings) - $(srcdir)/map-variants.py --want=mlvs --number=1 $@ $(variant_mappings) - -0023-ml2v2_s.part: map-variants.py $(variant_mappings) - $(srcdir)/map-variants.py --want=mlvs --number=2 $@ $(variant_mappings) - -0024-ml3v3_s.part: map-variants.py $(variant_mappings) - $(srcdir)/map-variants.py --want=mlvs --number=3 $@ $(variant_mappings) - -0025-ml4v4_s.part: map-variants.py $(variant_mappings) - $(srcdir)/map-variants.py --want=mlvs --number=4 $@ $(variant_mappings) - -0012-ml_s.part: map-variants.py $(layout_mappings) $(variant_mappings) - $(srcdir)/map-variants.py --want=mls $@ $(layout_mappings) $(variant_mappings) - -0010-mlv_s.part: map-variants.py $(layout_mappings) $(variant_mappings) - $(srcdir)/map-variants.py --want=mlvs $@ $(variant_mappings) - -EXTRA_DIST=0003-lists.part $(layout_mappings) $(variant_mappings) $(dist_parts) map-variants.py - -CLEANFILES=$(scripts) diff --git a/symbols/Makefile.am b/symbols/Makefile.am deleted file mode 100644 index 28d4f7b..0000000 --- a/symbols/Makefile.am +++ /dev/null @@ -1,125 +0,0 @@ -symbolsdir = $(xkb_base)/symbols -dist_symbols_DATA = \ - af al am apl \ - ara at au az \ - ba bd be \ - bg br brai \ - bt bw by \ - ca cd ch \ - cm cn cz \ - de dk dz \ - ee eg es et epo eu \ - fi fo fr \ - gb ge gh gn \ - gr hr hu \ - id ie il \ - in iq \ - ir is it \ - jp jv \ - ke kg kh \ - kr kz \ - la latam latin \ - lk lt lv \ - ma mao md me \ - mk ml mm \ - mn mt mv my \ - ng nl no np \ - parens pc ph pk pl pt \ - ro rs ru \ - se si sk sn \ - sy th \ - terminate tg \ - tj tm tr trans tw tz \ - ua us uz vn \ - za \ - altwin capslock compose ctrl empty eurosign rupeesign group inet \ - keypad kpdl level2 level3 level5 nbsp olpc shift srvr_ctrl typo - -digitaldir = $(symbolsdir)/digital_vndr -dist_digital_DATA = digital_vndr/lk digital_vndr/pc digital_vndr/us digital_vndr/vt - -fujitsudir = $(symbolsdir)/fujitsu_vndr -dist_fujitsu_DATA = fujitsu_vndr/jp fujitsu_vndr/us - -hpdir = $(symbolsdir)/hp_vndr -dist_hp_DATA = hp_vndr/us - -jolladir = $(symbolsdir)/jolla_vndr -dist_jolla_DATA = jolla_vndr/sbj - -macintoshdir = $(symbolsdir)/macintosh_vndr -dist_macintosh_DATA = \ - macintosh_vndr/apple \ - macintosh_vndr/ch \ - macintosh_vndr/de \ - macintosh_vndr/dk \ - macintosh_vndr/fi \ - macintosh_vndr/fr \ - macintosh_vndr/gb \ - macintosh_vndr/is \ - macintosh_vndr/it \ - macintosh_vndr/jp \ - macintosh_vndr/latam \ - macintosh_vndr/nl \ - macintosh_vndr/no \ - macintosh_vndr/pt \ - macintosh_vndr/se \ - macintosh_vndr/us - -necdir = $(symbolsdir)/nec_vndr -dist_nec_DATA = nec_vndr/jp - -nokiadir = $(symbolsdir)/nokia_vndr -dist_nokia_DATA = nokia_vndr/rx-44 nokia_vndr/rx-51 nokia_vndr/su-8w - -sgidir = $(symbolsdir)/sgi_vndr -dist_sgi_DATA = sgi_vndr/jp - -sharpdir = $(symbolsdir)/sharp_vndr -dist_sharp_DATA = \ - sharp_vndr/sl-c3x00 \ - sharp_vndr/ws003sh \ - sharp_vndr/ws007sh \ - sharp_vndr/ws011sh \ - sharp_vndr/ws020sh - -sonydir = $(symbolsdir)/sony_vndr -dist_sony_DATA = sony_vndr/us - -sundir = $(symbolsdir)/sun_vndr -dist_sun_DATA = \ - sun_vndr/ara \ - sun_vndr/be \ - sun_vndr/br \ - sun_vndr/ca \ - sun_vndr/ch \ - sun_vndr/cz \ - sun_vndr/de \ - sun_vndr/dk \ - sun_vndr/ee \ - sun_vndr/es \ - sun_vndr/fi \ - sun_vndr/fr \ - sun_vndr/gb \ - sun_vndr/gr \ - sun_vndr/it \ - sun_vndr/jp \ - sun_vndr/kr \ - sun_vndr/lt \ - sun_vndr/lv \ - sun_vndr/nl \ - sun_vndr/no \ - sun_vndr/pl \ - sun_vndr/pt \ - sun_vndr/ro \ - sun_vndr/ru \ - sun_vndr/se \ - sun_vndr/sk \ - sun_vndr/solaris \ - sun_vndr/tr \ - sun_vndr/tw \ - sun_vndr/ua \ - sun_vndr/us - -xfree68dir = $(symbolsdir)/xfree68_vndr -dist_xfree68_DATA = xfree68_vndr/amiga xfree68_vndr/ataritt diff --git a/types/Makefile.am b/types/Makefile.am deleted file mode 100644 index c16c6e8..0000000 --- a/types/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -typesdir = $(xkb_base)/types - -dist_types_DATA = \ - basic cancel caps \ - complete default extra \ - iso9995 level5 mousekeys nokia numpad \ - pc README diff --git a/xkeyboard-config.pc.in b/xkeyboard-config.pc.in deleted file mode 100644 index d44ba14..0000000 --- a/xkeyboard-config.pc.in +++ /dev/null @@ -1,8 +0,0 @@ -prefix=@prefix@ -datarootdir=@datarootdir@ -datadir=@datadir@ -xkb_base=@xkb_base@ - -Name: XKeyboardConfig -Description: X Keyboard configuration data -Version: @VERSION@ -- cgit v1.2.1