diff options
| author | marha <marha@users.sourceforge.net> | 2011-02-21 07:21:53 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-02-21 07:21:53 +0000 |
| commit | 248adea786d4a5a9d2c71679722eda734d4e7be7 (patch) | |
| tree | 4c3295a508b054e6cbe36169326c2eef0692d41c /xorg-server/xkeyboard-config | |
| parent | 8a191c08ddda2e66fa26f148d6c21959bb08f923 (diff) | |
| download | vcxsrv-248adea786d4a5a9d2c71679722eda734d4e7be7.tar.gz vcxsrv-248adea786d4a5a9d2c71679722eda734d4e7be7.tar.bz2 vcxsrv-248adea786d4a5a9d2c71679722eda734d4e7be7.zip | |
xserver xkeyboard-config mesa git update 21 Feb 2011
Diffstat (limited to 'xorg-server/xkeyboard-config')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/compat/Makefile.am | 3 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/extras/Makefile.am | 103 |
2 files changed, 52 insertions, 54 deletions
diff --git a/xorg-server/xkeyboard-config/rules/compat/Makefile.am b/xorg-server/xkeyboard-config/rules/compat/Makefile.am index 087263427..814bd25cf 100644 --- a/xorg-server/xkeyboard-config/rules/compat/Makefile.am +++ b/xorg-server/xkeyboard-config/rules/compat/Makefile.am @@ -20,8 +20,7 @@ base.ml4v4_s.part \ base.ml_s.part \ base.ml1_s.part \ base.mlv_s.part \ -base.ml1v1_s.part \ -base.ml_s.part +base.ml1v1_s.part if USE_COMPAT_RULES diff --git a/xorg-server/xkeyboard-config/rules/extras/Makefile.am b/xorg-server/xkeyboard-config/rules/extras/Makefile.am index 16119a3f0..fafed6033 100644 --- a/xorg-server/xkeyboard-config/rules/extras/Makefile.am +++ b/xorg-server/xkeyboard-config/rules/extras/Makefile.am @@ -1,52 +1,51 @@ -transform_files=layoutsMapping.lst variantsMapping.lst
-
-scripts_dir=$(srcdir)/../bin
-
-scripts= \
-base.ml2_s.part \
-base.ml3_s.part \
-base.ml4_s.part \
-base.ml2v2_s.part \
-base.ml3v3_s.part \
-base.ml4v4_s.part \
-base.ml_s.part \
-base.ml1_s.part \
-base.mlv_s.part \
-base.ml1v1_s.part \
-base.ml_s.part
-
-noinst_SCRIPTS=$(scripts)
-
-base.ml2_s.part: $(scripts_dir)/mln_s.sh $(transform_files)
- sh $< 2 $(srcdir)
-
-base.ml3_s.part: $(scripts_dir)/mln_s.sh $(transform_files)
- sh $< 3 $(srcdir)
-
-base.ml4_s.part: $(scripts_dir)/mln_s.sh $(transform_files)
- sh $< 4 $(srcdir)
-
-base.ml2v2_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files)
- sh $< 2 $(srcdir)
-
-base.ml3v3_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files)
- sh $< 3 $(srcdir)
-
-base.ml4v4_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files)
- sh $< 4 $(srcdir)
-
-base.ml_s.part: $(scripts_dir)/ml_s.sh $(transform_files)
- sh $< $(srcdir)
-
-base.ml1_s.part: $(scripts_dir)/ml1_s.sh $(transform_files)
- sh $< $(srcdir)
-
-base.mlv_s.part: $(scripts_dir)/mlv_s.sh $(transform_files)
- sh $< $(srcdir)
-
-base.ml1v1_s.part: $(scripts_dir)/ml1v1_s.sh $(transform_files)
- sh $< $(srcdir)
-
-EXTRA_DIST=$(transform_files)
-
-CLEANFILES=$(scripts)
+transform_files=layoutsMapping.lst variantsMapping.lst + +scripts_dir=$(srcdir)/../bin + +scripts= \ +base.ml2_s.part \ +base.ml3_s.part \ +base.ml4_s.part \ +base.ml2v2_s.part \ +base.ml3v3_s.part \ +base.ml4v4_s.part \ +base.ml_s.part \ +base.ml1_s.part \ +base.mlv_s.part \ +base.ml1v1_s.part + +noinst_SCRIPTS=$(scripts) + +base.ml2_s.part: $(scripts_dir)/mln_s.sh $(transform_files) + sh $< 2 $(srcdir) + +base.ml3_s.part: $(scripts_dir)/mln_s.sh $(transform_files) + sh $< 3 $(srcdir) + +base.ml4_s.part: $(scripts_dir)/mln_s.sh $(transform_files) + sh $< 4 $(srcdir) + +base.ml2v2_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files) + sh $< 2 $(srcdir) + +base.ml3v3_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files) + sh $< 3 $(srcdir) + +base.ml4v4_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files) + sh $< 4 $(srcdir) + +base.ml_s.part: $(scripts_dir)/ml_s.sh $(transform_files) + sh $< $(srcdir) + +base.ml1_s.part: $(scripts_dir)/ml1_s.sh $(transform_files) + sh $< $(srcdir) + +base.mlv_s.part: $(scripts_dir)/mlv_s.sh $(transform_files) + sh $< $(srcdir) + +base.ml1v1_s.part: $(scripts_dir)/ml1v1_s.sh $(transform_files) + sh $< $(srcdir) + +EXTRA_DIST=$(transform_files) + +CLEANFILES=$(scripts) |