Move the desktop files into their own directory.

Makefile.am

@@ -3,7 +3,8 @@ AUTOMAKE_OPTIONS= foreign
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS=	RPM debian doc include libs hw nq qtv qw tools ruamoko pkg-config
+SUBDIRS=RPM debian desktop doc include libs hw nq qtv qw tools ruamoko \
+		pkg-config
 
 ## configure.ac needs to be listed here for older autoconfs
 EXTRA_DIST=	ChangeLog configure.ac \

config.d/ac_config_files.m4

@@ -89,3 +89,4 @@
 	doc/man/Makefile
 
 	debian/Makefile
+	desktop/Makefile

desktop/Makefile.am

@@ -0,0 +1,49 @@
+## Process this file with automake to produce Makefile.in
+#
+#	Makefile.am
+#
+#	Automake-using build system for QuakeForge
+#
+#	Copyright (C) 2000 Jeff Teunissen <deek@quakeforge.net>
+#
+#	This Makefile is free software; you can redistribute it and/or
+#	modify it under the terms of the GNU General Public License
+#	as published by the Free Software Foundation; either version 2
+#	of the License, or (at your option) any later version.
+#
+#	This program is distributed in the hope that it will be useful,
+#	but WITHOUT ANY WARRANTY; without even the implied warranty of
+#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#	See the GNU General Public License for more details.
+#
+#	You should have received a copy of the GNU General Public License
+#	along with this program; if not, write to:
+#
+#		Free Software Foundation, Inc.
+#		59 Temple Place - Suite 330
+#		Boston, MA  02111-1307, USA
+#
+#	$Id$
+#
+
+AUTOMAKE_OPTIONS=	foreign
+
+# Stuff that is common to both client and server
+# Desktop files
+if HAVE_XDG
+desktopdir=$(datarootdir)/applications
+desktop_DATA= @NQ_DESKTOP_DATA@ @QW_DESKTOP_DATA@
+endif
+
+# Stuff that doesn't get linked into an executable NEEDS to be mentioned here,
+# or it won't be distributed with 'make dist'
+
+EXTRA_DATA= quakeforge-nq-glx.desktop quakeforge-nq-sdl.desktop \
+	quakeforge-nq-sdl32.desktop quakeforge-nq-sgl.desktop \
+	quakeforge-nq-x11.desktop quakeforge-qw-glx.desktop \
+	quakeforge-qw-sdl.desktop quakeforge-qw-sdl32.desktop \
+	quakeforge-qw-sgl.desktop quakeforge-qw-x11.desktop
+
+# Kill the temp files, hopefully.
+CLEANFILES	= *.i *.s $(YACCLEX_CLEANFILES)

nq/source/Makefile.am

@@ -33,12 +33,6 @@ AUTOMAKE_OPTIONS= foreign
 INCLUDES=	-I$(top_srcdir)/include -I$(top_srcdir)/nq/include
 SDL_LIBS = @SDL_LIBS@
 
-# Desktop files
-if HAVE_XDG
-desktopdir=$(datarootdir)/applications
-desktop_DATA= @NQ_DESKTOP_DATA@
-endif
-
 bin_PROGRAMS=	@NQ_TARGETS@
 
 EXTRA_PROGRAMS= nq-fbdev nq-glx nq-mgl nq-sdl nq-sdl32 nq-sgl nq-svga nq-3dfx \

qw/source/Makefile.am

@@ -33,12 +33,6 @@ AUTOMAKE_OPTIONS=	foreign
 INCLUDES=	-I$(top_srcdir)/include -I$(top_srcdir)/qw/include
 SDL_LIBS = @SDL_LIBS@
 
-# Desktop files
-if HAVE_XDG
-desktopdir=$(datarootdir)/applications
-desktop_DATA= @QW_DESKTOP_DATA@
-endif
-
 bin_PROGRAMS=	@QW_TARGETS@
 
 EXTRA_PROGRAMS= qw-client-fbdev qw-client-glx qw-client-mgl qw-client-sdl \