improving build process

9 files changed, 29 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 65d212e3..ffa3f8ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-06  Sergey Udaltsov
+
+	* compat/Makefile.am, geometry/Makefile.am, keycodes/Makefile.am,
+	keymap/Makefile.am, rules/compat/Makefile.am, semantics/Makefile.am,
+	symbols/Makefile.am, types/Makefile.am, xkbrules.am: improving the
+	build, http://bugs.freedesktop.org/show_bug.cgi?id=17008
+
 2008-08-03  Sergey Udaltsov
 
 	* rules/compat/variantRename.lst: fixing compat rules for Romania,
diff --git a/compat/Makefile.am b/compat/Makefile.am
index d1db8e52..4e56a242 100644
--- a/compat/Makefile.am
+++ b/compat/Makefile.am
@@ -9,5 +9,7 @@ misc mousekeys norepeat \
 olpc pc pc98 xfree86 \
 xtest README
 
+dir_data = $(dist_compat_DATA)
+
 include $(top_srcdir)/xkbrules.am
 
diff --git a/geometry/Makefile.am b/geometry/Makefile.am
index d57d1b1d..8dccdc28 100644
--- a/geometry/Makefile.am
+++ b/geometry/Makefile.am
@@ -10,4 +10,6 @@ macintosh microsoft nec \
 northgate pc sony thinkpad \
 sun winbook README
 
+dir_data = $(dist_geom_DATA)
+
 include $(top_srcdir)/xkbrules.am
diff --git a/keycodes/Makefile.am b/keycodes/Makefile.am
index 9720e5cf..c289e145 100644
--- a/keycodes/Makefile.am
+++ b/keycodes/Makefile.am
@@ -17,4 +17,6 @@ xfree86 \
 xfree98 \
 README
 
+dir_data = $(dist_keycodes_DATA)
+
 include $(top_srcdir)/xkbrules.am
diff --git a/keymap/Makefile.am b/keymap/Makefile.am
index 621e5c8f..98da8f2b 100644
--- a/keymap/Makefile.am
+++ b/keymap/Makefile.am
@@ -7,4 +7,6 @@ amiga ataritt macintosh \
 sony xfree86 xfree98 \
 README
 
+dir_data = $(dist_keymap_DATA)
+
 include $(top_srcdir)/xkbrules.am
diff --git a/rules/compat/Makefile.am b/rules/compat/Makefile.am
index 96cf3886..331265ae 100644
--- a/rules/compat/Makefile.am
+++ b/rules/compat/Makefile.am
@@ -5,13 +5,15 @@ transform_scripts=ln_s.sh lnv_s.sh ml_s.sh mlv_s.sh ml1_s.sh ml1v_s.sh ml1v1_s.s
 
 dist_parts=base.o_s.part
 
-if USE_COMPAT_RULES
-
-noinst_SCRIPTS=base.l2_s.part base.l3_s.part base.l4_s.part \
+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 $(dist_parts)
+base.ml_s.part
+
+if USE_COMPAT_RULES
+
+noinst_SCRIPTS=$(scripts) $(dist_parts)
 
 else
 
@@ -50,3 +52,5 @@ base.ml1v1_s.part: ml1v1_s.sh $(transform_files)
 	sh $<
 
 EXTRA_DIST=base.lists.part $(transform_files) $(transform_scripts) $(dist_parts)
+
+CLEANFILES=$(scripts)
diff --git a/semantics/Makefile.am b/semantics/Makefile.am
index 75cd1895..9e92daac 100644
--- a/semantics/Makefile.am
+++ b/semantics/Makefile.am
@@ -4,4 +4,6 @@ dist_semantics_DATA = \
 basic complete default \
 xtest
 
+dir_data = $(dist_semantics_DATA)
+
 include $(top_srcdir)/xkbrules.am
diff --git a/symbols/Makefile.am b/symbols/Makefile.am
index 97c816dd..371d1aa3 100644
--- a/symbols/Makefile.am
+++ b/symbols/Makefile.am
@@ -32,4 +32,6 @@ za \
 altwin capslock compose ctrl eurosign group inet \
 keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl
 
+dir_data = $(dist_symbols_DATA)
+
 include $(top_srcdir)/xkbrules.am
diff --git a/types/Makefile.am b/types/Makefile.am
index bcec0602..43bd2c6b 100644
--- a/types/Makefile.am
+++ b/types/Makefile.am
@@ -6,4 +6,6 @@ complete default extra \
 iso9995 level5 mousekeys numpad \
 pc README
 
+dir_data = $(dist_types_DATA)
+
 include $(top_srcdir)/xkbrules.am