gok r2502 - trunk

[gerdk svn gnome org]

Author: gerdk
Date: Thu Jul 10 13:25:41 2008
New Revision: 2502
URL: http://svn.gnome.org/viewvc/gok?rev=2502&view=rev

Log:
2008-07-10  Gerd Kohlberger  <gerdk svn gnome org>

	* Makfile.am: Fix make distcheck. Bug #542061.



Removed:
   trunk/gok-controls.kbd
   trunk/hide.kbd
   trunk/launcher.kbd
   trunk/main.kbd
   trunk/mouse.kbd
   trunk/move-resize.kbd
   trunk/quit.kbd
   trunk/text-operations.kbd
Modified:
   trunk/ChangeLog
   trunk/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Thu Jul 10 13:25:41 2008
@@ -10,8 +10,6 @@
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-xmldir = $(pkgdatadir)
-
 kbd_in_files = \
 	main.kbd.in			\
 	gok-controls.kbd.in		\
@@ -33,17 +31,15 @@
 	singlekey-automatic-scanning.xml.in		\
 	singlekey-inverse-scanning.xml.in 
 
-xam_files = $(xml_in_files:.xml.in=.xam)
+xamdir = $(pkgdatadir)
+xam_DATA = $(xml_in_files:.xml.in=.xam)
 @INTLTOOL_XAM_RULE@
 
+noinst_DATA = $(kbd_files)
 kbd_files = $(kbd_in_files:.kbd.in=.kbd)
 @INTLTOOL_KBD_RULE@
 
-xml_DATA = $(xam_files) \
-	$(kbd_files)
-
 gladedir = $(pkgdatadir)/glade
-
 glade_DATA = gok.glade2
 
 icondir = $(datadir)/icons/hicolor/48x48/apps
@@ -178,4 +174,4 @@
 	gok-with-references.schemas.in	\
 	gok-with-references.schemas	\
 	$(schema_DATA)		\
-	$(xam_files)
+	$(xam_DATA)