From d8eb3aab3678d034d49446b0f275b12ecd378ab1 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Mon, 29 Nov 2010 14:26:33 +0900 Subject: [PATCH] Move the desktop files into their own directory. --- Makefile.am | 3 +- config.d/ac_config_files.m4 | 1 + desktop/Makefile.am | 49 +++++++++++++++++++ .../quakeforge-nq-glx.desktop | 0 .../quakeforge-nq-sdl.desktop | 0 .../quakeforge-nq-sdl32.desktop | 0 .../quakeforge-nq-sgl.desktop | 0 .../quakeforge-nq-x11.desktop | 0 .../quakeforge-qw-glx.desktop | 0 .../quakeforge-qw-sdl.desktop | 0 .../quakeforge-qw-sdl32.desktop | 0 .../quakeforge-qw-sgl.desktop | 0 .../quakeforge-qw-x11.desktop | 0 nq/source/Makefile.am | 6 --- qw/source/Makefile.am | 6 --- 15 files changed, 52 insertions(+), 13 deletions(-) create mode 100644 desktop/Makefile.am rename {nq/source => desktop}/quakeforge-nq-glx.desktop (100%) rename {nq/source => desktop}/quakeforge-nq-sdl.desktop (100%) rename {nq/source => desktop}/quakeforge-nq-sdl32.desktop (100%) rename {nq/source => desktop}/quakeforge-nq-sgl.desktop (100%) rename {nq/source => desktop}/quakeforge-nq-x11.desktop (100%) rename {qw/source => desktop}/quakeforge-qw-glx.desktop (100%) rename {qw/source => desktop}/quakeforge-qw-sdl.desktop (100%) rename {qw/source => desktop}/quakeforge-qw-sdl32.desktop (100%) rename {qw/source => desktop}/quakeforge-qw-sgl.desktop (100%) rename {qw/source => desktop}/quakeforge-qw-x11.desktop (100%) diff --git a/Makefile.am b/Makefile.am index 0e2246816..e5e2a1757 100644 --- a/Makefile.am +++ b/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 \ diff --git a/config.d/ac_config_files.m4 b/config.d/ac_config_files.m4 index 32e247c24..1b5ca4ac9 100644 --- a/config.d/ac_config_files.m4 +++ b/config.d/ac_config_files.m4 @@ -89,3 +89,4 @@ doc/man/Makefile debian/Makefile + desktop/Makefile diff --git a/desktop/Makefile.am b/desktop/Makefile.am new file mode 100644 index 000000000..3a16d6597 --- /dev/null +++ b/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 +# +# 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) diff --git a/nq/source/quakeforge-nq-glx.desktop b/desktop/quakeforge-nq-glx.desktop similarity index 100% rename from nq/source/quakeforge-nq-glx.desktop rename to desktop/quakeforge-nq-glx.desktop diff --git a/nq/source/quakeforge-nq-sdl.desktop b/desktop/quakeforge-nq-sdl.desktop similarity index 100% rename from nq/source/quakeforge-nq-sdl.desktop rename to desktop/quakeforge-nq-sdl.desktop diff --git a/nq/source/quakeforge-nq-sdl32.desktop b/desktop/quakeforge-nq-sdl32.desktop similarity index 100% rename from nq/source/quakeforge-nq-sdl32.desktop rename to desktop/quakeforge-nq-sdl32.desktop diff --git a/nq/source/quakeforge-nq-sgl.desktop b/desktop/quakeforge-nq-sgl.desktop similarity index 100% rename from nq/source/quakeforge-nq-sgl.desktop rename to desktop/quakeforge-nq-sgl.desktop diff --git a/nq/source/quakeforge-nq-x11.desktop b/desktop/quakeforge-nq-x11.desktop similarity index 100% rename from nq/source/quakeforge-nq-x11.desktop rename to desktop/quakeforge-nq-x11.desktop diff --git a/qw/source/quakeforge-qw-glx.desktop b/desktop/quakeforge-qw-glx.desktop similarity index 100% rename from qw/source/quakeforge-qw-glx.desktop rename to desktop/quakeforge-qw-glx.desktop diff --git a/qw/source/quakeforge-qw-sdl.desktop b/desktop/quakeforge-qw-sdl.desktop similarity index 100% rename from qw/source/quakeforge-qw-sdl.desktop rename to desktop/quakeforge-qw-sdl.desktop diff --git a/qw/source/quakeforge-qw-sdl32.desktop b/desktop/quakeforge-qw-sdl32.desktop similarity index 100% rename from qw/source/quakeforge-qw-sdl32.desktop rename to desktop/quakeforge-qw-sdl32.desktop diff --git a/qw/source/quakeforge-qw-sgl.desktop b/desktop/quakeforge-qw-sgl.desktop similarity index 100% rename from qw/source/quakeforge-qw-sgl.desktop rename to desktop/quakeforge-qw-sgl.desktop diff --git a/qw/source/quakeforge-qw-x11.desktop b/desktop/quakeforge-qw-x11.desktop similarity index 100% rename from qw/source/quakeforge-qw-x11.desktop rename to desktop/quakeforge-qw-x11.desktop diff --git a/nq/source/Makefile.am b/nq/source/Makefile.am index 83738a91d..005512692 100644 --- a/nq/source/Makefile.am +++ b/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 \ diff --git a/qw/source/Makefile.am b/qw/source/Makefile.am index d3e34bd20..a80c80b51 100644 --- a/qw/source/Makefile.am +++ b/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 \