diff options
| author | marha <marha@users.sourceforge.net> | 2010-02-28 21:21:07 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-02-28 21:21:07 +0000 |
| commit | e85e0b6942e6eb9447fcf6c9a5045ba813aa6844 (patch) | |
| tree | 1fc646212f66bdf6449fe23b8a47813114095600 /xorg-server/xkbdata.src/rules/compat | |
| parent | fedd99993946dd8fc22b60e3611e447f3b8092ca (diff) | |
| parent | 9370f043060a1d08bb51484a58c52db85a4ea656 (diff) | |
| download | vcxsrv-e85e0b6942e6eb9447fcf6c9a5045ba813aa6844.tar.gz vcxsrv-e85e0b6942e6eb9447fcf6c9a5045ba813aa6844.tar.bz2 vcxsrv-e85e0b6942e6eb9447fcf6c9a5045ba813aa6844.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkbdata.src/rules/compat')
| -rw-r--r-- | xorg-server/xkbdata.src/rules/compat/Makefile.am | 126 | ||||
| -rw-r--r-- | xorg-server/xkbdata.src/rules/compat/makefile | 40 |
2 files changed, 83 insertions, 83 deletions
diff --git a/xorg-server/xkbdata.src/rules/compat/Makefile.am b/xorg-server/xkbdata.src/rules/compat/Makefile.am index 755be6d07..7c84f4996 100644 --- a/xorg-server/xkbdata.src/rules/compat/Makefile.am +++ b/xorg-server/xkbdata.src/rules/compat/Makefile.am @@ -1,63 +1,63 @@ - -transform_files=layoutsMapping.lst variantsMapping.lst - -dist_parts=base.o_s.part - -scripts_dir=$(srcdir)/../bin - -scripts= \ -base.l2_s.part \ -base.l3_s.part \ -base.l4_s.part \ -base.l2v2_s.part \ -base.l3v3_s.part \ -base.l4v4_s.part \ -base.ml_s.part \ -base.ml1_s.part \ -base.mlv_s.part \ -base.ml1v1_s.part \ -base.ml_s.part - -if USE_COMPAT_RULES - -noinst_SCRIPTS=$(scripts) $(dist_parts) - -else - -noinst_SCRIPTS= - -endif - -base.l2_s.part: $(scripts_dir)/ln_s.sh $(transform_files) - sh $< 2 $(srcdir) - -base.l3_s.part: $(scripts_dir)/ln_s.sh $(transform_files) - sh $< 3 $(srcdir) - -base.l4_s.part: $(scripts_dir)/ln_s.sh $(transform_files) - sh $< 4 $(srcdir) - -base.l2v2_s.part: $(scripts_dir)/lnv_s.sh $(transform_files) - sh $< 2 $(srcdir) - -base.l3v3_s.part: $(scripts_dir)/lnv_s.sh $(transform_files) - sh $< 3 $(srcdir) - -base.l4v4_s.part: $(scripts_dir)/lnv_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=base.lists.part $(transform_files) $(dist_parts) - -CLEANFILES=$(scripts) +
+transform_files=layoutsMapping.lst variantsMapping.lst
+
+dist_parts=base.o_s.part
+
+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
+
+if USE_COMPAT_RULES
+
+noinst_SCRIPTS=$(scripts) $(dist_parts)
+
+else
+
+noinst_SCRIPTS=
+
+endif
+
+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=base.lists.part $(transform_files) $(dist_parts)
+
+CLEANFILES=$(scripts)
diff --git a/xorg-server/xkbdata.src/rules/compat/makefile b/xorg-server/xkbdata.src/rules/compat/makefile index 4a1a7b832..75610a8e9 100644 --- a/xorg-server/xkbdata.src/rules/compat/makefile +++ b/xorg-server/xkbdata.src/rules/compat/makefile @@ -1,14 +1,14 @@ -TRANSFORM_FILES=layoutsMapping.lst variantsMapping.lst +transform_files=layoutsMapping.lst variantsMapping.lst scripts_dir=..\bin SCRIPTS= \ -base.l2_s.part \ -base.l3_s.part \ -base.l4_s.part \ -base.l2v2_s.part \ -base.l3v3_s.part \ -base.l4v4_s.part \ +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 \ @@ -17,37 +17,37 @@ base.ml_s.part SH=cmd /c -%.bat: $(scripts_dir)\%.sh - copy $< $@ - -base.l2_s.part: ln_s.bat $(TRANSFORM_FILES) +base.ml2_s.part: mln_s.bat $(transform_files) $(SH) $< 2 -base.l3_s.part: ln_s.bat $(TRANSFORM_FILES) +base.ml3_s.part: mln_s.bat $(transform_files) $(SH) $< 3 -base.l4_s.part: ln_s.bat $(TRANSFORM_FILES) +base.ml4_s.part: mln_s.bat $(transform_files) $(SH) $< 4 -base.l2v2_s.part: lnv_s.bat $(TRANSFORM_FILES) +base.ml2v2_s.part: mlnvn_s.bat $(transform_files) $(SH) $< 2 -base.l3v3_s.part: lnv_s.bat $(TRANSFORM_FILES) +base.ml3v3_s.part: mlnvn_s.bat $(transform_files) $(SH) $< 3 -base.l4v4_s.part: lnv_s.bat $(TRANSFORM_FILES) +base.ml4v4_s.part: mlnvn_s.bat $(transform_files) $(SH) $< 4 -base.ml_s.part: ml_s.bat $(TRANSFORM_FILES) +base.ml_s.part: ml_s.bat $(transform_files) $(SH) $< -base.ml1_s.part: ml1_s.bat $(TRANSFORM_FILES) +base.ml1_s.part: ml1_s.bat $(transform_files) $(SH) $< -base.mlv_s.part: mlv_s.bat $(TRANSFORM_FILES) +base.mlv_s.part: mlv_s.bat $(transform_files) $(SH) $< -base.ml1v1_s.part: ml1v1_s.bat $(TRANSFORM_FILES) +base.ml1v1_s.part: ml1v1_s.bat $(transform_files) $(SH) $< +%.bat: $(scripts_dir)\%.sh + copy $< $@ + all: $(SCRIPTS) |