Increase compartmentalization of Nextstep builds rules,

and store Emacs version number in fewer versioned files.

* configure.ac (ns_appsrc): Use relative names.
(ns_frag): Remove.
(Info-gnustep.plist, Emacs.desktop, Info.plist, InfoPlist.strings)
(nextstep/Makefile): Generate these nextstep files.
(SUBDIR_MAKEFILES): Add nextstep.

* Makefile.in (clean, distclean, bootstrap-clean): Add nextstep.

* make-dist (nextstep/templates): Add directory.
(nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj): Remove.
(nextstep/Cocoa/Emacs.base/Contents)
(nextstep/GNUstep/Emacs.base/Resources): Update contents.

* .bzrignore: Add some nextstep files.

* admin/admin.el (set-version): No more need to set nextstep versions.
(set-copyright): Update for moved nextstep files.

* nextstep/Makefile.in: New file.
* nextstep/templates: New directory.
* nextstep/templates/Emacs.desktop.in, nextstep/templates/Info-gnustep.plist.in:
* nextstep/templates/Info.plist.in, nextstep/templates/InfoPlist.strings.in:
Move here from various Cocoa/, GNUstep/ locations.
Let configure set the version number.
* nextstep/Cocoa/Emacs.base/Contents/Info.plist:
* nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
* nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist:
* nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop: Move to templates/.
* nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj: Remove directory.

* src/Makefile.in (ns_appdir, ns_appbindir, ns_appsrc): Remove variables.
(ns_frag): Remove.
(ns-app): Move here from ns.mk, and simplify.
(clean): Simplify nextstep entry.
* src/ns.mk: Remove file.

2 files changed, 0 insertions, 147 deletions

diff --git a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop
deleted file mode 100644
index a36eafaadb0..00000000000
--- a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Version=24.2.50
-Categories=GNUstep
-Name=Emacs
-Comment=GNU Emacs for NeXT/Open/GNUstep and OS X
-Icon=emacs.tiff
-Exec=openapp Emacs.app
-#TryExec=Emacs.app
-FilePattern=Emacs.app;Emacs
diff --git a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
deleted file mode 100644
index 6cde01b0d05..00000000000
--- a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-    ApplicationDescription = "GNU Emacs for GNUstep / OS X";
-    ApplicationIcon = emacs.tiff;
-    ApplicationName = Emacs;
-    ApplicationRelease = "24.2.50";
-    Authors = (
-	"Adrian Robert (GNUstep)",
-	"Christophe de Dinechin (MacOS X)",
-	"Scott Bender (OpenStep)",
-	"Christian Limpach (NeXTstep)",
-	"Carl Edman (NeXTstep)",
-	"..see etc/NEXTSTEP"
-    );
-    Copyright = "Copyright (C) 2012 Free Software Foundation, Inc.";
-    CopyrightDescription = "Released under the GNU General Public License Version 3 or later";
-    FullVersionID = "Emacs 24.2.50, NS Windowing";
-    NSExecutable = Emacs;
-    NSIcon = emacs.tiff;
-    NSPrincipalClass = NSApplication;
-    NSRole = Application;
-    NSTypes = (
-	{
-	    NSDocumentClass = "";
-	    NSHumanReadableName = "";
-	    NSIcon = "";
-	    NSName = "";
-	    NSRole = "";
-	    NSUnixExtensions = (
-		txt
-	    );
-	},
-	{
-	    NSDocumentClass = "";
-	    NSHumanReadableName = "";
-	    NSIcon = "";
-	    NSName = "";
-	    NSRole = "";
-	    NSUnixExtensions = (
-		c,
-		h
-	    );
-	},
-	{
-	    NSDocumentClass = "";
-	    NSHumanReadableName = "";
-	    NSIcon = "";
-	    NSName = "";
-	    NSRole = "";
-	    NSUnixExtensions = (
-		m
-	    );
-	},
-	{
-	    NSDocumentClass = "";
-	    NSHumanReadableName = "";
-	    NSIcon = "";
-	    NSName = "";
-	    NSRole = "";
-	    NSUnixExtensions = (
-		C,
-		cpp,
-		H,
-		cc
-	    );
-	},
-	{
-	    NSDocumentClass = "";
-	    NSHumanReadableName = "";
-	    NSIcon = "";
-	    NSName = "";
-	    NSRole = "";
-	    NSUnixExtensions = (
-		java
-	    );
-	},
-	{
-	    NSDocumentClass = "";
-	    NSHumanReadableName = "";
-	    NSIcon = "";
-	    NSName = "";
-	    NSRole = "";
-	    NSUnixExtensions = (
-		el
-	    );
-	},
-	{
-	    NSDocumentClass = "";
-	    NSHumanReadableName = "";
-	    NSIcon = "";
-	    NSName = "";
-	    NSRole = "";
-	    NSUnixExtensions = (
-		*
-	    );
-	}
-    );
-    NSServices = (
-	{
-	    NSPortName = Emacs;
-	    NSMessage = requestService;
-	    NSUserData = open-selection;
-	    NSSendTypes = (NSStringPboardType);
-	    NSMenuItem = {
-		default = "Emacs.app/New Buffer Containing Selection";
-	    };
-	},
-	{
-	    NSPortName = Emacs;
-	    NSMessage = requestService;
-	    NSUserData = open-file;
-	    NSSendTypes = (NSStringPboardType);
-	    NSMenuItem = {
-		default = "Emacs.app/Open Selected File";
-	    };
-	},
-	{
-	    NSPortName = Emacs;
-	    NSMessage = requestService;
-	    NSUserData = mail-selection;
-	    NSSendTypes = (NSStringPboardType);
-	    NSMenuItem = {
-		default = "Emacs.app/Email Selection";
-	    };
-	},
-	{
-	    NSPortName = Emacs;
-	    NSMessage = requestService;
-	    NSUserData = mail-to;
-	    NSSendTypes = (NSStringPboardType);
-	    NSMenuItem = {
-		default = "Emacs.app/Send Email to Selected Address";
-	    };
-	},
-    );
-    URL = "http://www.gnu.org/software/emacs";
-}