aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkbdata.src/rules/compat/Makefile.am
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-09-20 20:25:03 +0000
committermarha <marha@users.sourceforge.net>2009-09-20 20:25:03 +0000
commit6341b97eda007223acfe2f7a64dc2c5718867e0a (patch)
tree1793a3e7cda31b9455df3106b60cc01a096b43f7 /xorg-server/xkbdata.src/rules/compat/Makefile.am
parent650fd857a97752ff5ff8b1654ec78b813b78d9c2 (diff)
parentf3d88db0960f1c23e55f2529764b096ac92d78d9 (diff)
downloadvcxsrv-6341b97eda007223acfe2f7a64dc2c5718867e0a.tar.gz
vcxsrv-6341b97eda007223acfe2f7a64dc2c5718867e0a.tar.bz2
vcxsrv-6341b97eda007223acfe2f7a64dc2c5718867e0a.zip
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/xkbdata.src/rules/compat/Makefile.am')
-rw-r--r--xorg-server/xkbdata.src/rules/compat/Makefile.am55
1 files changed, 24 insertions, 31 deletions
diff --git a/xorg-server/xkbdata.src/rules/compat/Makefile.am b/xorg-server/xkbdata.src/rules/compat/Makefile.am
index 20bf3d9a1..755be6d07 100644
--- a/xorg-server/xkbdata.src/rules/compat/Makefile.am
+++ b/xorg-server/xkbdata.src/rules/compat/Makefile.am
@@ -1,17 +1,10 @@
-transform_files=layoutRename.lst variantRename.lst
-
-transform_scripts= \
-ln_s.sh \
-lnv_s.sh \
-ml_s.sh \
-mlv_s.sh \
-ml1_s.sh \
-ml1v_s.sh \
-ml1v1_s.sh
+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 \
@@ -35,36 +28,36 @@ noinst_SCRIPTS=
endif
-base.l2_s.part: ln_s.sh $(transform_files)
- sh $< 2
+base.l2_s.part: $(scripts_dir)/ln_s.sh $(transform_files)
+ sh $< 2 $(srcdir)
-base.l3_s.part: ln_s.sh $(transform_files)
- sh $< 3
+base.l3_s.part: $(scripts_dir)/ln_s.sh $(transform_files)
+ sh $< 3 $(srcdir)
-base.l4_s.part: ln_s.sh $(transform_files)
- sh $< 4
+base.l4_s.part: $(scripts_dir)/ln_s.sh $(transform_files)
+ sh $< 4 $(srcdir)
-base.l2v2_s.part: lnv_s.sh $(transform_files)
- sh $< 2
+base.l2v2_s.part: $(scripts_dir)/lnv_s.sh $(transform_files)
+ sh $< 2 $(srcdir)
-base.l3v3_s.part: lnv_s.sh $(transform_files)
- sh $< 3
+base.l3v3_s.part: $(scripts_dir)/lnv_s.sh $(transform_files)
+ sh $< 3 $(srcdir)
-base.l4v4_s.part: lnv_s.sh $(transform_files)
- sh $< 4
+base.l4v4_s.part: $(scripts_dir)/lnv_s.sh $(transform_files)
+ sh $< 4 $(srcdir)
-base.ml_s.part: ml_s.sh $(transform_files)
- sh $<
+base.ml_s.part: $(scripts_dir)/ml_s.sh $(transform_files)
+ sh $< $(srcdir)
-base.ml1_s.part: ml1_s.sh $(transform_files)
- sh $<
+base.ml1_s.part: $(scripts_dir)/ml1_s.sh $(transform_files)
+ sh $< $(srcdir)
-base.mlv_s.part: mlv_s.sh $(transform_files)
- sh $<
+base.mlv_s.part: $(scripts_dir)/mlv_s.sh $(transform_files)
+ sh $< $(srcdir)
-base.ml1v1_s.part: ml1v1_s.sh $(transform_files)
- sh $<
+base.ml1v1_s.part: $(scripts_dir)/ml1v1_s.sh $(transform_files)
+ sh $< $(srcdir)
-EXTRA_DIST=base.lists.part $(transform_files) $(transform_scripts) $(dist_parts)
+EXTRA_DIST=base.lists.part $(transform_files) $(dist_parts)
CLEANFILES=$(scripts)