From ea63f0fae5c393ccf198aad0ae4dbda6d2a4391a Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 24 Jul 2009 17:45:11 +0000 Subject: Added xkeyboard-config-1.6.tar.gz --- xorg-server/xkbdata.src/keymap/Makefile.in | 153 +++++----- .../xkbdata.src/keymap/digital_vndr/Makefile.in | 106 +++---- xorg-server/xkbdata.src/keymap/keymap.dir | 316 ++++++++++----------- .../xkbdata.src/keymap/sgi_vndr/Makefile.in | 106 +++---- .../xkbdata.src/keymap/sun_vndr/Makefile.in | 106 +++---- xorg-server/xkbdata.src/keymap/xfree86 | 4 +- 6 files changed, 367 insertions(+), 424 deletions(-) (limited to 'xorg-server/xkbdata.src/keymap') diff --git a/xorg-server/xkbdata.src/keymap/Makefile.in b/xorg-server/xkbdata.src/keymap/Makefile.in index dab44ddd0..e9ea9ca8e 100644 --- a/xorg-server/xkbdata.src/keymap/Makefile.in +++ b/xorg-server/xkbdata.src/keymap/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,15 +18,11 @@ # Replaces Imake's MakeXkbDir() rule # svu: taken from xkbdata -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -52,10 +48,11 @@ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -66,14 +63,14 @@ am__installdirs = "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(keymapdir)" dist_dirDATA_INSTALL = $(INSTALL_DATA) dist_keymapDATA_INSTALL = $(INSTALL_DATA) DATA = $(dist_dir_DATA) $(dist_keymap_DATA) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -86,10 +83,6 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@ -CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@ -CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@ -CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ @@ -103,43 +96,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ @@ -159,15 +133,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@ -USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XKBCOMP = @XKBCOMP@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -175,6 +149,7 @@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -198,8 +173,12 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ xkb_base = @xkb_base@ xkb_rules_symlink = @xkb_rules_symlink@ SUBDIRS = digital_vndr sgi_vndr sun_vndr @@ -220,8 +199,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -245,10 +224,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: install-dist_dirDATA: $(dist_dir_DATA) @$(NORMAL_INSTALL) - test -z "$(dirdir)" || $(mkdir_p) "$(DESTDIR)$(dirdir)" + test -z "$(dirdir)" || $(MKDIR_P) "$(DESTDIR)$(dirdir)" @list='$(dist_dir_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -265,7 +243,7 @@ uninstall-dist_dirDATA: done install-dist_keymapDATA: $(dist_keymap_DATA) @$(NORMAL_INSTALL) - test -z "$(keymapdir)" || $(mkdir_p) "$(DESTDIR)$(keymapdir)" + test -z "$(keymapdir)" || $(MKDIR_P) "$(DESTDIR)$(keymapdir)" @list='$(dist_keymap_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -312,8 +290,7 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -357,8 +334,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -383,8 +360,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -394,13 +371,12 @@ ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -414,23 +390,21 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -444,7 +418,7 @@ distdir: $(DISTFILES) list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -452,6 +426,8 @@ distdir: $(DISTFILES) $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -462,7 +438,7 @@ all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(keymapdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive install-exec: install-exec-recursive @@ -509,12 +485,20 @@ info-am: install-data-am: install-dist_dirDATA install-dist_keymapDATA +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -533,24 +517,25 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-dist_dirDATA uninstall-dist_keymapDATA \ - uninstall-info-am +uninstall-am: uninstall-dist_dirDATA uninstall-dist_keymapDATA -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-recursive distclean-tags \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic ctags \ + ctags-recursive distclean distclean-generic distclean-tags \ distdir dvi dvi-am html html-am info info-am install \ install-am install-data install-data-am install-dist_dirDATA \ - install-dist_keymapDATA install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-dist_keymapDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ uninstall uninstall-am uninstall-dist_dirDATA \ - uninstall-dist_keymapDATA uninstall-info-am + uninstall-dist_keymapDATA $(subdir).dir: $(dir_data) diff --git a/xorg-server/xkbdata.src/keymap/digital_vndr/Makefile.in b/xorg-server/xkbdata.src/keymap/digital_vndr/Makefile.in index 08bf4b750..808af57f2 100644 --- a/xorg-server/xkbdata.src/keymap/digital_vndr/Makefile.in +++ b/xorg-server/xkbdata.src/keymap/digital_vndr/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -57,8 +53,6 @@ DATA = $(dist_keymap_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -71,10 +65,6 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@ -CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@ -CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@ -CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ @@ -88,43 +78,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ @@ -144,15 +115,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@ -USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XKBCOMP = @XKBCOMP@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -160,6 +131,7 @@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -183,8 +155,12 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ xkb_base = @xkb_base@ xkb_rules_symlink = @xkb_rules_symlink@ keymapdir = $(xkb_base)/keymap/digital_vndr @@ -198,8 +174,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -223,10 +199,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: install-dist_keymapDATA: $(dist_keymap_DATA) @$(NORMAL_INSTALL) - test -z "$(keymapdir)" || $(mkdir_p) "$(DESTDIR)$(keymapdir)" + test -z "$(keymapdir)" || $(MKDIR_P) "$(DESTDIR)$(keymapdir)" @list='$(dist_keymap_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -249,22 +224,21 @@ CTAGS: distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -280,7 +254,7 @@ check: check-am all-am: Makefile $(DATA) installdirs: for dir in "$(DESTDIR)$(keymapdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -326,12 +300,20 @@ info-am: install-data-am: install-dist_keymapDATA +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -350,17 +332,21 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_keymapDATA uninstall-info-am +uninstall-am: uninstall-dist_keymapDATA + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am \ - install-dist_keymapDATA install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-dist_keymapDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am uninstall uninstall-am \ - uninstall-dist_keymapDATA uninstall-info-am + uninstall-dist_keymapDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/xorg-server/xkbdata.src/keymap/keymap.dir b/xorg-server/xkbdata.src/keymap/keymap.dir index 6dbb8f1b7..7b8f07a92 100644 --- a/xorg-server/xkbdata.src/keymap/keymap.dir +++ b/xorg-server/xkbdata.src/keymap/keymap.dir @@ -1,11 +1,135 @@ -d------ -------- macintosh(macintosh) -------- -------- macintosh(macintosh_old) --------- -------- sun_vndr/de(type4_de) --------- -------- sun_vndr/de(type4_de_nodeadkeys) --------- -------- sun_vndr/de(type4_de_openlook) --d------ -------- sun_vndr/de(type5_de) --------- -------- sun_vndr/de(type5_de_nodeadkeys) --------- -------- sun_vndr/de(type5_de_openlook) +-d------ -------- xfree98(jp) +-d------ -------- sgi_vndr/fr(indy) +-------- -------- sgi_vndr/fr(indy_nodeadkeys) +-------- -------- sgi_vndr/fr(indigo) +-------- -------- sgi_vndr/fr(indigo_nodeadkeys) +-d------ -------- sgi_vndr/dvorak(indy) +-------- -------- sgi_vndr/dvorak(indigo) +-d------ -------- sgi_vndr/ch(de_indy) +-------- -------- sgi_vndr/ch(de_indy_nodeadkeys) +-------- -------- sgi_vndr/ch(de_indigo) +-------- -------- sgi_vndr/ch(de_indigo_nodeadkeys) +-------- -------- sgi_vndr/ch(fr_indy) +-------- -------- sgi_vndr/ch(fr_indy_nodeadkeys) +-------- -------- sgi_vndr/ch(fr_indigo) +-------- -------- sgi_vndr/ch(fr_indigo_nodeadkeys) +-d------ -------- sgi_vndr/pl(indy) +-------- -------- sgi_vndr/pl(indy_nodeadkeys) +-------- -------- sgi_vndr/pl(indigo) +-------- -------- sgi_vndr/pl(indigo_nodeadkeys) +-d------ -------- sgi_vndr/th(indy) +-------- -------- sgi_vndr/th(indigo) +-d------ -------- sgi_vndr/no(indy) +-------- -------- sgi_vndr/no(indy_nodeadkeys) +-------- -------- sgi_vndr/no(indigo) +-------- -------- sgi_vndr/no(indigo_nodeadkeys) +-d------ -------- sgi_vndr/es(indy) +-------- -------- sgi_vndr/es(indy_nodeadkeys) +-------- -------- sgi_vndr/es(indigo) +-------- -------- sgi_vndr/es(indigo_nodeadkeys) +-d------ -------- sgi_vndr/cz(indy) +-------- -------- sgi_vndr/cz(indigo) +-------- -------- sgi_vndr/cz(indy_qwerty) +-------- -------- sgi_vndr/cz(indigo_qwerty) +-d------ -------- sgi_vndr/hu(indy) +-------- -------- sgi_vndr/hu(indy_toggle) +-------- -------- sgi_vndr/hu(indy_shift_toggle) +-------- -------- sgi_vndr/hu(indy_ctrl_shift_toggle) +-------- -------- sgi_vndr/hu(indy_ctrl_alt_toggle) +-------- -------- sgi_vndr/hu(indy_caps_toggle) +-------- -------- sgi_vndr/hu(indigo) +-------- -------- sgi_vndr/hu(indigo_toggle) +-------- -------- sgi_vndr/hu(indigo_shift_toggle) +-------- -------- sgi_vndr/hu(indigo_ctrl_shift_toggle) +-------- -------- sgi_vndr/hu(indigo_ctrl_alt_toggle) +-------- -------- sgi_vndr/hu(indigo_caps_toggle) +-d------ -------- sgi_vndr/en_US(indy) +-------- -------- sgi_vndr/en_US(indy_nodeadkeys) +-------- -------- sgi_vndr/en_US(indy101) +-------- -------- sgi_vndr/en_US(indy101_nodeadkeys) +-------- -------- sgi_vndr/en_US(indy104) +-------- -------- sgi_vndr/en_US(indy104_nodeadkeys) +-------- -------- sgi_vndr/en_US(indigo) +-------- -------- sgi_vndr/en_US(indigo_nodeadkeys) +-d------ -------- sgi_vndr/jp(indy) +-d------ -------- sgi_vndr/gb(indy) +-------- -------- sgi_vndr/gb(indy_nodeadkeys) +-------- -------- sgi_vndr/gb(indigo) +-------- -------- sgi_vndr/gb(indigo_nodeadkeys) +-d------ -------- sgi_vndr/se(indy) +-------- -------- sgi_vndr/se(indy_nodeadkeys) +-------- -------- sgi_vndr/se(indigo) +-------- -------- sgi_vndr/se(indigo_nodeadkeys) +-d------ -------- sgi_vndr/dk(indy) +-------- -------- sgi_vndr/dk(indy_nodeadkeys) +-------- -------- sgi_vndr/dk(indigo) +-------- -------- sgi_vndr/dk(indigo_nodeadkeys) +-d------ -------- sgi_vndr/sk(indy) +-------- -------- sgi_vndr/sk(indigo) +-------- -------- sgi_vndr/sk(indy_qwerty) +-------- -------- sgi_vndr/sk(indigo_qwerty) +-d------ -------- sgi_vndr/pt(indy) +-------- -------- sgi_vndr/pt(indy_nodeadkeys) +-------- -------- sgi_vndr/pt(indigo) +-------- -------- sgi_vndr/pt(indigo_nodeadkeys) +-d------ -------- sgi_vndr/us(indy) +-------- -------- sgi_vndr/us(indy101_euro) +-------- -------- sgi_vndr/us(indy_compose) +-------- -------- sgi_vndr/us(indigo) +-------- -------- sgi_vndr/us(indigo_compose) +-------- -------- sgi_vndr/us(indigo101_compose) +-d------ -------- sgi_vndr/ca(indy) +-------- -------- sgi_vndr/ca(indy_nodeadkeys) +-------- -------- sgi_vndr/ca(indigo) +-------- -------- sgi_vndr/ca(indigo_nodeadkeys) +-d------ -------- sgi_vndr/de(indy) +-------- -------- sgi_vndr/de(indy_nodeadkeys) +-------- -------- sgi_vndr/de(indigo) +-------- -------- sgi_vndr/de(indigo_nodeadkeys) +-d------ -------- sgi_vndr/it(indy) +-------- -------- sgi_vndr/it(indy_nodeadkeys) +-------- -------- sgi_vndr/it(indigo) +-------- -------- sgi_vndr/it(indigo_nodeadkeys) +-d------ -------- sgi_vndr/bg(indy) +-------- -------- sgi_vndr/bg(indigo) +-d------ -------- sgi_vndr/be(indy) +-------- -------- sgi_vndr/be(indy_nodeadkeys) +-------- -------- sgi_vndr/be(indigo) +-------- -------- sgi_vndr/be(indigo_nodeadkeys) +-d------ -------- sgi_vndr/ru(indy) +-------- -------- sgi_vndr/ru(indy_toggle) +-------- -------- sgi_vndr/ru(indy_shift_toggle) +-------- -------- sgi_vndr/ru(indy_ctrl_shift_toggle) +-------- -------- sgi_vndr/ru(indy_ctrl_alt_toggle) +-------- -------- sgi_vndr/ru(indy_caps_toggle) +-------- -------- sgi_vndr/ru(indigo) +-------- -------- sgi_vndr/ru(indigo_toggle) +-------- -------- sgi_vndr/ru(indigo_shift_toggle) +-------- -------- sgi_vndr/ru(indigo_ctrl_shift_toggle) +-------- -------- sgi_vndr/ru(indigo_ctrl_alt_toggle) +-------- -------- sgi_vndr/ru(indigo_caps_toggle) +-d------ -------- sgi_vndr/fi(indy) +-------- -------- sgi_vndr/fi(indy_nodeadkeys) +-------- -------- sgi_vndr/fi(indigo) +-------- -------- sgi_vndr/fi(indigo_nodeadkeys) +-------- -------- sun_vndr/fr(type4_fr) +-------- -------- sun_vndr/fr(type4_fr_openlook) +-d------ -------- sun_vndr/fr(type5_fr) +-------- -------- sun_vndr/fr(type5_fr_openlook) +-------- -------- sun_vndr/pl(type4_pl) +-------- -------- sun_vndr/pl(type4_pl_openlook) +-d------ -------- sun_vndr/pl(type5_pl) +-------- -------- sun_vndr/pl(type5_pl_openlook) +-------- -------- sun_vndr/no(type4_no) +-------- -------- sun_vndr/no(type4_no_openlook) +-d------ -------- sun_vndr/no(type5_no) +-------- -------- sun_vndr/no(type5_no_openlook) +-------- -------- sun_vndr/es(type4_es) +-------- -------- sun_vndr/es(type4_es_openlook) +-d------ -------- sun_vndr/es(type5_es) +-------- -------- sun_vndr/es(type5_es_openlook) -------- -------- sun_vndr/all(Belgian6) -------- -------- sun_vndr/all(Belgian6_usb) -------- -------- sun_vndr/all(Canada4) @@ -140,22 +264,6 @@ -------- -------- sun_vndr/uk(type4_uk_openlook) -d------ -------- sun_vndr/uk(type5_uk) -------- -------- sun_vndr/uk(type5_uk_openlook) --------- -------- sun_vndr/fi(type4_fi) --------- -------- sun_vndr/fi(type4_fi_openlook) --d------ -------- sun_vndr/fi(type5_fi) --------- -------- sun_vndr/fi(type5_fi_openlook) --------- -------- sun_vndr/no(type4_no) --------- -------- sun_vndr/no(type4_no_openlook) --d------ -------- sun_vndr/no(type5_no) --------- -------- sun_vndr/no(type5_no_openlook) --------- -------- sun_vndr/pl(type4_pl) --------- -------- sun_vndr/pl(type4_pl_openlook) --d------ -------- sun_vndr/pl(type5_pl) --------- -------- sun_vndr/pl(type5_pl_openlook) --------- -------- sun_vndr/fr(type4_fr) --------- -------- sun_vndr/fr(type4_fr_openlook) --d------ -------- sun_vndr/fr(type5_fr) --------- -------- sun_vndr/fr(type5_fr_openlook) -d------ -------- sun_vndr/se(type5c_se_fixdollar) -------- -------- sun_vndr/se(type5c_se) -------- -------- sun_vndr/se(type5_se) @@ -168,147 +276,21 @@ -------- -------- sun_vndr/us(type5_us_openlook) -------- -------- sun_vndr/us(type5_unix) -------- -------- sun_vndr/us(type5_unix_openlook) --------- -------- sun_vndr/es(type4_es) --------- -------- sun_vndr/es(type4_es_openlook) --d------ -------- sun_vndr/es(type5_es) --------- -------- sun_vndr/es(type5_es_openlook) +-------- -------- sun_vndr/de(type4_de) +-------- -------- sun_vndr/de(type4_de_nodeadkeys) +-------- -------- sun_vndr/de(type4_de_openlook) +-d------ -------- sun_vndr/de(type5_de) +-------- -------- sun_vndr/de(type5_de_nodeadkeys) +-------- -------- sun_vndr/de(type5_de_openlook) -------- -------- sun_vndr/ru(type4_ru) -------- -------- sun_vndr/ru(type4_ru_openlook) -d------ -------- sun_vndr/ru(type5_ru) -------- -------- sun_vndr/ru(type5_ru_openlook) +-------- -------- sun_vndr/fi(type4_fi) +-------- -------- sun_vndr/fi(type4_fi_openlook) +-d------ -------- sun_vndr/fi(type5_fi) +-------- -------- sun_vndr/fi(type5_fi_openlook) -------- -------- sony(news5000-nwp5461) --d------ -------- xfree98(jp) --d------ -------- amiga(usa1) --------- -------- amiga(de) --d------ -------- sgi_vndr/de(indy) --------- -------- sgi_vndr/de(indy_nodeadkeys) --------- -------- sgi_vndr/de(indigo) --------- -------- sgi_vndr/de(indigo_nodeadkeys) --d------ -------- sgi_vndr/fi(indy) --------- -------- sgi_vndr/fi(indy_nodeadkeys) --------- -------- sgi_vndr/fi(indigo) --------- -------- sgi_vndr/fi(indigo_nodeadkeys) --d------ -------- sgi_vndr/be(indy) --------- -------- sgi_vndr/be(indy_nodeadkeys) --------- -------- sgi_vndr/be(indigo) --------- -------- sgi_vndr/be(indigo_nodeadkeys) --d------ -------- sgi_vndr/dk(indy) --------- -------- sgi_vndr/dk(indy_nodeadkeys) --------- -------- sgi_vndr/dk(indigo) --------- -------- sgi_vndr/dk(indigo_nodeadkeys) --d------ -------- sgi_vndr/hu(indy) --------- -------- sgi_vndr/hu(indy_toggle) --------- -------- sgi_vndr/hu(indy_shift_toggle) --------- -------- sgi_vndr/hu(indy_ctrl_shift_toggle) --------- -------- sgi_vndr/hu(indy_ctrl_alt_toggle) --------- -------- sgi_vndr/hu(indy_caps_toggle) --------- -------- sgi_vndr/hu(indigo) --------- -------- sgi_vndr/hu(indigo_toggle) --------- -------- sgi_vndr/hu(indigo_shift_toggle) --------- -------- sgi_vndr/hu(indigo_ctrl_shift_toggle) --------- -------- sgi_vndr/hu(indigo_ctrl_alt_toggle) --------- -------- sgi_vndr/hu(indigo_caps_toggle) --d------ -------- sgi_vndr/cz(indy) --------- -------- sgi_vndr/cz(indigo) --------- -------- sgi_vndr/cz(indy_qwerty) --------- -------- sgi_vndr/cz(indigo_qwerty) --d------ -------- sgi_vndr/bg(indy) --------- -------- sgi_vndr/bg(indigo) --d------ -------- sgi_vndr/sk(indy) --------- -------- sgi_vndr/sk(indigo) --------- -------- sgi_vndr/sk(indy_qwerty) --------- -------- sgi_vndr/sk(indigo_qwerty) --d------ -------- sgi_vndr/en_US(indy) --------- -------- sgi_vndr/en_US(indy_nodeadkeys) --------- -------- sgi_vndr/en_US(indy101) --------- -------- sgi_vndr/en_US(indy101_nodeadkeys) --------- -------- sgi_vndr/en_US(indy104) --------- -------- sgi_vndr/en_US(indy104_nodeadkeys) --------- -------- sgi_vndr/en_US(indigo) --------- -------- sgi_vndr/en_US(indigo_nodeadkeys) --d------ -------- sgi_vndr/jp(indy) --d------ -------- sgi_vndr/no(indy) --------- -------- sgi_vndr/no(indy_nodeadkeys) --------- -------- sgi_vndr/no(indigo) --------- -------- sgi_vndr/no(indigo_nodeadkeys) --d------ -------- sgi_vndr/pl(indy) --------- -------- sgi_vndr/pl(indy_nodeadkeys) --------- -------- sgi_vndr/pl(indigo) --------- -------- sgi_vndr/pl(indigo_nodeadkeys) --d------ -------- sgi_vndr/gb(indy) --------- -------- sgi_vndr/gb(indy_nodeadkeys) --------- -------- sgi_vndr/gb(indigo) --------- -------- sgi_vndr/gb(indigo_nodeadkeys) --d------ -------- sgi_vndr/ch(de_indy) --------- -------- sgi_vndr/ch(de_indy_nodeadkeys) --------- -------- sgi_vndr/ch(de_indigo) --------- -------- sgi_vndr/ch(de_indigo_nodeadkeys) --------- -------- sgi_vndr/ch(fr_indy) --------- -------- sgi_vndr/ch(fr_indy_nodeadkeys) --------- -------- sgi_vndr/ch(fr_indigo) --------- -------- sgi_vndr/ch(fr_indigo_nodeadkeys) --d------ -------- sgi_vndr/pt(indy) --------- -------- sgi_vndr/pt(indy_nodeadkeys) --------- -------- sgi_vndr/pt(indigo) --------- -------- sgi_vndr/pt(indigo_nodeadkeys) --d------ -------- sgi_vndr/ca(indy) --------- -------- sgi_vndr/ca(indy_nodeadkeys) --------- -------- sgi_vndr/ca(indigo) --------- -------- sgi_vndr/ca(indigo_nodeadkeys) --d------ -------- sgi_vndr/fr(indy) --------- -------- sgi_vndr/fr(indy_nodeadkeys) --------- -------- sgi_vndr/fr(indigo) --------- -------- sgi_vndr/fr(indigo_nodeadkeys) --d------ -------- sgi_vndr/se(indy) --------- -------- sgi_vndr/se(indy_nodeadkeys) --------- -------- sgi_vndr/se(indigo) --------- -------- sgi_vndr/se(indigo_nodeadkeys) --d------ -------- sgi_vndr/us(indy) --------- -------- sgi_vndr/us(indy101_euro) --------- -------- sgi_vndr/us(indy_compose) --------- -------- sgi_vndr/us(indigo) --------- -------- sgi_vndr/us(indigo_compose) --------- -------- sgi_vndr/us(indigo101_compose) --d------ -------- sgi_vndr/dvorak(indy) --------- -------- sgi_vndr/dvorak(indigo) --d------ -------- sgi_vndr/es(indy) --------- -------- sgi_vndr/es(indy_nodeadkeys) --------- -------- sgi_vndr/es(indigo) --------- -------- sgi_vndr/es(indigo_nodeadkeys) --d------ -------- sgi_vndr/it(indy) --------- -------- sgi_vndr/it(indy_nodeadkeys) --------- -------- sgi_vndr/it(indigo) --------- -------- sgi_vndr/it(indigo_nodeadkeys) --d------ -------- sgi_vndr/th(indy) --------- -------- sgi_vndr/th(indigo) --d------ -------- sgi_vndr/ru(indy) --------- -------- sgi_vndr/ru(indy_toggle) --------- -------- sgi_vndr/ru(indy_shift_toggle) --------- -------- sgi_vndr/ru(indy_ctrl_shift_toggle) --------- -------- sgi_vndr/ru(indy_ctrl_alt_toggle) --------- -------- sgi_vndr/ru(indy_caps_toggle) --------- -------- sgi_vndr/ru(indigo) --------- -------- sgi_vndr/ru(indigo_toggle) --------- -------- sgi_vndr/ru(indigo_shift_toggle) --------- -------- sgi_vndr/ru(indigo_ctrl_shift_toggle) --------- -------- sgi_vndr/ru(indigo_ctrl_alt_toggle) --------- -------- sgi_vndr/ru(indigo_caps_toggle) --------- -------- digital_vndr/us(lk201) --------- -------- digital_vndr/us(lk401) --------- -------- digital_vndr/us(lk411) --------- -------- digital_vndr/us(lk421) --------- -------- digital_vndr/us(lk441) --------- -------- digital_vndr/us(lk443) --------- -------- digital_vndr/us(lk44x) --------- -------- digital_vndr/us(lk450) --------- -------- digital_vndr/us(pcxalaa) --------- -------- digital_vndr/us(pcxalfa) --------- -------- digital_vndr/us(pcxalga) --------- -------- digital_vndr/us(pcxalka) --------- -------- digital_vndr/us(pcxal) --------- -------- digital_vndr/us(mnk) --d------ -------- ataritt(us) --------- -------- ataritt(de) -d------ -------- xfree86(us) -------- -------- xfree86(ar) -------- -------- xfree86(be) @@ -360,3 +342,21 @@ -------- -------- xfree86(fr_CH) -------- -------- xfree86(mt_us) -------- -------- xfree86(sk_qwerty) +-d------ -------- ataritt(us) +-------- -------- ataritt(de) +-------- -------- digital_vndr/us(lk201) +-------- -------- digital_vndr/us(lk401) +-------- -------- digital_vndr/us(lk411) +-------- -------- digital_vndr/us(lk421) +-------- -------- digital_vndr/us(lk441) +-------- -------- digital_vndr/us(lk443) +-------- -------- digital_vndr/us(lk44x) +-------- -------- digital_vndr/us(lk450) +-------- -------- digital_vndr/us(pcxalaa) +-------- -------- digital_vndr/us(pcxalfa) +-------- -------- digital_vndr/us(pcxalga) +-------- -------- digital_vndr/us(pcxalka) +-------- -------- digital_vndr/us(pcxal) +-------- -------- digital_vndr/us(mnk) +-d------ -------- amiga(usa1) +-------- -------- amiga(de) diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.in b/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.in index a1fac16bd..9afff68fc 100644 --- a/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.in +++ b/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -57,8 +53,6 @@ DATA = $(dist_keymap_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -71,10 +65,6 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@ -CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@ -CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@ -CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ @@ -88,43 +78,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ @@ -144,15 +115,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@ -USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XKBCOMP = @XKBCOMP@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -160,6 +131,7 @@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -183,8 +155,12 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ xkb_base = @xkb_base@ xkb_rules_symlink = @xkb_rules_symlink@ keymapdir = $(xkb_base)/keymap/sgi_vndr @@ -206,8 +182,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -231,10 +207,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: install-dist_keymapDATA: $(dist_keymap_DATA) @$(NORMAL_INSTALL) - test -z "$(keymapdir)" || $(mkdir_p) "$(DESTDIR)$(keymapdir)" + test -z "$(keymapdir)" || $(MKDIR_P) "$(DESTDIR)$(keymapdir)" @list='$(dist_keymap_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -257,22 +232,21 @@ CTAGS: distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -288,7 +262,7 @@ check: check-am all-am: Makefile $(DATA) installdirs: for dir in "$(DESTDIR)$(keymapdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -334,12 +308,20 @@ info-am: install-data-am: install-dist_keymapDATA +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -358,17 +340,21 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_keymapDATA uninstall-info-am +uninstall-am: uninstall-dist_keymapDATA + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am \ - install-dist_keymapDATA install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-dist_keymapDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am uninstall uninstall-am \ - uninstall-dist_keymapDATA uninstall-info-am + uninstall-dist_keymapDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/Makefile.in b/xorg-server/xkbdata.src/keymap/sun_vndr/Makefile.in index 4de9e71eb..e728e0869 100644 --- a/xorg-server/xkbdata.src/keymap/sun_vndr/Makefile.in +++ b/xorg-server/xkbdata.src/keymap/sun_vndr/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -57,8 +53,6 @@ DATA = $(dist_keymap_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -71,10 +65,6 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@ -CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@ -CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@ -CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ @@ -88,43 +78,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ @@ -144,15 +115,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@ -USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XKBCOMP = @XKBCOMP@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -160,6 +131,7 @@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -183,8 +155,12 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ xkb_base = @xkb_base@ xkb_rules_symlink = @xkb_rules_symlink@ keymapdir = $(xkb_base)/keymap/sun_vndr @@ -201,8 +177,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -226,10 +202,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: install-dist_keymapDATA: $(dist_keymap_DATA) @$(NORMAL_INSTALL) - test -z "$(keymapdir)" || $(mkdir_p) "$(DESTDIR)$(keymapdir)" + test -z "$(keymapdir)" || $(MKDIR_P) "$(DESTDIR)$(keymapdir)" @list='$(dist_keymap_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -252,22 +227,21 @@ CTAGS: distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -283,7 +257,7 @@ check: check-am all-am: Makefile $(DATA) installdirs: for dir in "$(DESTDIR)$(keymapdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -329,12 +303,20 @@ info-am: install-data-am: install-dist_keymapDATA +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -353,17 +335,21 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_keymapDATA uninstall-info-am +uninstall-am: uninstall-dist_keymapDATA + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am \ - install-dist_keymapDATA install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-dist_keymapDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am uninstall uninstall-am \ - uninstall-dist_keymapDATA uninstall-info-am + uninstall-dist_keymapDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/xorg-server/xkbdata.src/keymap/xfree86 b/xorg-server/xkbdata.src/keymap/xfree86 index aa70c9792..e4255a633 100644 --- a/xorg-server/xkbdata.src/keymap/xfree86 +++ b/xorg-server/xkbdata.src/keymap/xfree86 @@ -33,7 +33,7 @@ xkb_keymap "bg" { }; // us_intl and br by Ricardo Y. Igarashi (iga@that.com.br) xkb_keymap "br" { - xkb_keycodes { include "xfree86(abnt2)" }; + xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "us(pc101)+br" }; @@ -141,7 +141,7 @@ xkb_keymap "it" { xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "jp106" { - xkb_keycodes { include "xfree86(jp106)" }; + xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "jp(jp106)" }; -- cgit v1.2.3