Increase compartmentalization of Nextstep builds rules,
authorGlenn Morris <rgm@gnu.org>
Sun, 16 Sep 2012 18:49:00 +0000 (11:49 -0700)
committerGlenn Morris <rgm@gnu.org>
Sun, 16 Sep 2012 18:49:00 +0000 (11:49 -0700)
commit83da1b5565d518aa02984bf2f474c56eb61f41ef
tree5a912cbf397765da7c1a2325b5b2aa7325edb174
parent40d70ecb6d11f87363b500db5665d8b433278687
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.
15 files changed:
ChangeLog
Makefile.in
admin/ChangeLog
admin/admin.el
configure.ac
make-dist
nextstep/ChangeLog
nextstep/Makefile.in [new file with mode: 0644]
nextstep/templates/Emacs.desktop.in [moved from nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop with 92% similarity]
nextstep/templates/Info-gnustep.plist.in [moved from nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist with 96% similarity]
nextstep/templates/Info.plist.in [moved from nextstep/Cocoa/Emacs.base/Contents/Info.plist with 99% similarity]
nextstep/templates/InfoPlist.strings.in [moved from nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings with 56% similarity]
src/ChangeLog
src/Makefile.in
src/ns.mk [deleted file]