mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-25 10:47:00 +00:00
Code Issues Releases Activity
103,031 Commits 225 Branches 190 Tags 536 MiB
804a4315bd
Commit Graph

72 Commits

Author SHA1 Message Date
Chong Yidong
f7d75b4bba Bump version to 24.0.90. 
Regenerate AUTHORS and ldefs-boot.el.
 2011-09-25 23:20:03 -04:00
Eli Zaretskii
d37f40ed38 Update the Windows build according to 2011-02-08T21:42:56Z!tromey@redhat.com and 2011-02-09T17:04:43Z!schwab@linux-m68k.org. 
src/makefile.w32-in (GLOBAL_SOURCES, SOME_MACHINE_OBJECTS, obj): New
 macros.
 (globals.h, gl-stamp): New targets.
 (clean): Clean gl-stamp and globals.h.
 nt/makefile.w32-in (bootstrap-nmake, bootstrap-gmake): Make the
 "make-docfile" target in lib-src, before bootstrapping the src
 directory.  Needed since building in src needs to run make-docfile
 to produce globals.h.
 2011-02-09 22:50:17 +02:00
Eli Zaretskii
1e338cfca8 Fix the bootstrap on MS-Windows. 
makefile.w32-in (bootstrap-nmake, bootstrap-gmake): Fix the bootstrap.
 2011-01-29 15:41:34 +02:00
Eli Zaretskii
f915f0f7c8 Fix the MS-Windows build broken by 2011-01-17T19:01:01Z!eggert@cs.ucla.edu and emacs-23/2010-05-21T19:51:48Z!acm@muc.de. 
lib/makefile.w32-in:
 lib/getopt_.h: New files.
 src/s/ms-w32.h (HAVE_MKTIME): Remove.
 src/makefile.w32-in (LOCAL_FLAGS): Add -I../lib.
 (GNULIB): New variable.
 (LIBS): Add $(GNULIB).
 $(TEMACS): Depend on $(GNULIB).
 <top-level>: Fix font-lock disrupted by a lone `"'.
 src/makefile.w32-in (LOCAL_FLAGS): Add -I../lib.
 (GETOPTOBJS, GETOPTDEPS): Remove targets.
 (MOVEMAILOBJS): Replace $(GETOPTOBJS) with ../lib/$(BLD)/libgnu.$(A).
 ($(BLD)/movemail.exe): Depend on ../lib/getopt.h.
 (ECLIENTOBJS, ETAGSOBJ, CTAGSOBJ, EBROWSEOBJ): Replace getopt.o
 and getopt1.o with ../lib/$(BLD)/libgnu.$(A).
 (clean): Don't remove getopt.h.
 (getopt.h, $(BLD)/getopt.$(O), $(BLD)/getopt1.$(O)): Remove targets.
 ($(BLD)/ctags.$(O), $(BLD)/etags.$(O)): Replace getopt.h with
 $(EMACS_ROOT)/lib/getopt.h.
 nt/makefile.w32-in (all-other-dirs-nmake, all-other-dirs-gmake)
 (bootstrap-nmake, bootstrap-gmake, bootstrap-clean-nmake)
 (bootstrap-clean-gmake, clean-other-dirs-nmake)
 (clean-other-dirs-gmake, cleanall-other-dirs-nmake)
 (cleanall-other-dirs-gmake, distclean-other-dirs-nmake)
 (distclean-other-dirs-gmake, maintainer-clean-other-dirs-nmake)
 (maintainer-clean-other-dirs-gmake): Recurse into ../lib as well.
 nt/configure.bat: Create lib/makefile.
 nt/config.nt (HAVE_MKTIME, BROKEN_MKTIME): Remove.
 (HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV)
 (HAVE_DECL_LOCALTIME_R, HAVE_WCHAR_T, PACKAGE, VERSION, inline)
 (_GL_UNUSED, _UNUSED_PARAMETER_): Add definitions, for gnulib.
 2011-01-29 14:36:11 +02:00
Glenn Morris
73b0cd5003 Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
Stefan Monnier
77ab81d054 Merge from emacs-23 2011-01-14 12:18:41 -05:00
Glenn Morris
5df4f04cd3 Add 2011 to FSF/AIST copyright years. 2011-01-02 15:50:46 -08:00
Eli Zaretskii
73077a9af5 Support TAGS targets in the w32 build. 
nt/makefile.w32-in (frc, TAGS, TAGS-gmake, TAGS-nmake): New targets.
 emacs-src.tags: New file.
 src/makefile.w32-in (TAGS, frc, TAGS-LISP, ../nt/TAGS, tags)
 (TAGS-gmake, TAGS-nmake, TAGS-LISP-gmake, TAGS-LISP-nmake)
 (nt-TAGS-gmake, nt-TAGS-nmake): New targets.
 lisp/makefile.w32-in (DEST, TAGS, TAGS-LISP, TAGS-nmake)
 (TAGS-LISP-nmake, TAGS-gmake, TAGS-LISP-gmake, TAGS-SH)
 (TAGS-LISP-SH, TAGS-CMD, TAGS-LISP-CMD): New targets.
 lib-src/makefile.w32-in (tags, TAGS): New targets.
 2010-10-01 13:45:16 +02:00
Christoph Scholtes
d24076a601 Added README.W32 to distclean. Updated Changelog. 2010-07-24 21:07:15 -06:00
Christoph Scholtes
5904117d3c Fixed whitespace. 2010-07-24 16:07:04 -06:00
Christoph Scholtes
e0d6af9cc6 Code cleanup. Added ChangeLog entry. 2010-07-24 16:04:10 -06:00
Christoph Scholtes
4ad28e2787 Refactoring of make dist target 2010-07-24 15:35:36 -06:00
Christoph Scholtes
e3aef5c688 New make target for Windows platform: make dist (bug#6602) 
* admin/admin.el: Write version number to nt/makefile.w32-in.
* admin/nt/makedist.bat: Remove; replaced with `zipdist.bat'
  in the nt/ directory.
* admin/nt/README.W32: Relocate to nt/ directory.
* etc/NEWS: Document new --distfiles configure.bat option and
  `dist' make target on Windows.
* nt/INSTALL: Document new dist target and add section about
  creating binary distributions.
* nt/configure.bat: New parameter `--distfiles'.
* nt/makefile.w32-in: Add version number, new target `dist'.
  Add new target `install-shortcuts'.
* nt/zipdist.bat: New file; create zipped binary distribution,
  replaces admin/nt/makedist.bat.
 2010-07-24 15:35:31 +02:00
Glenn Morris
114f9c9679 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
Jason Rumney
7207c1a9e3 ($(BLD)/addpm.exe): Link with SHELL and OLE libs. 2009-01-15 15:17:44 +00:00
Glenn Morris
f5d0ac07d6 Add 2009 to copyright years. 2009-01-08 03:38:51 +00:00
Glenn Morris
eef0be9e86 Switch to recommended form of GPLv3 permissions notice. 2008-05-09 05:14:16 +00:00
Miles Bader
a113b3ca32 Merge from emacs--rel--22 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1121
 2008-04-23 05:55:42 +00:00
Eli Zaretskii
4cbb903fcb (ALL): Move $(CLIENTRES) from here... 
(all): ...to here.  $(ALL) is a prerequisite of .PHONY, so having a real file
there is not a good idea.
 2008-04-11 18:59:13 +00:00
Jason Rumney
99e0bf597e (CLIENTRES): New variable and build target. 
(all): Depend on it.
($(TRES)): Use $(TRES) in rule.
 2008-04-10 09:44:59 +00:00
Jason Rumney
cc48598c5a (clean-other-dirs-nmake): Don't clean lisp dir. 
(clean-other-dirs-gmake): Likewise. Clean doc dirs.
(top-distclean, distclean, distclean-other-dirs-nmake)
(distclean-other-dirs-gmake, maintainer-clean-other-dirs-nmake)
(maintainer-clean-other-dirs-gmake, maintainer-clean): New targets.
 2008-04-09 16:32:08 +00:00
Jason Rumney
480a77b543 ($(TRES)): Depend on icon and manifest. 2008-03-02 19:03:12 +00:00
Jason Rumney
4134dd158a Remove unidata-gen related rules. 2008-02-11 09:18:19 +00:00
Eli Zaretskii
f0c58e1063 (unidatagen-SH, unidatagen-clean-SH): Ignore return status. 2008-02-02 15:15:13 +00:00
Eli Zaretskii
ef764ddd1d (unidatagen-nmake, unidatagen-clean-nmake, unidatagen-CMD) 
(unidatagen-clean-CMD, unidatagen-SH, unidatagen-clean-SH): New targets.
(bootstrap-nmake): Invoke unidatagen-nmake.
(bootstrap-gmake): Invoke unidatagen-$(SHELLTYPE).
 2008-02-02 15:03:26 +00:00
Miles Bader
59ce725a3b Merge from emacs--rel--22 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
 2008-01-08 20:46:54 +00:00
Glenn Morris
6d344054d1 Add 2008 to copyright years. 2008-01-07 08:15:16 +00:00
Jason Rumney
059d1e6662 (info-nmake): Change into correct directories. 2007-10-20 13:05:54 +00:00
Miles Bader
5a95db215e Merge from emacs--rel--22 
Patches applied:

 * emacs--rel--22  (patch 125-127)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-896
 2007-10-18 21:07:49 +00:00
Jason Rumney
da3ef617bf (install): Install COPYING in top-level and bin dirs. 2007-10-18 00:57:12 +00:00
Glenn Morris
d038b84d6c (info-nmake, info-gmake, clean-other-dirs-nmake): Change from ../man 
to ../doc/emacs and ../doc/misc; and from ../lispref, ../lispintro to
../doc/lispref, ../doc/lispintro.
 2007-09-06 07:19:48 +00:00
Jason Rumney
128c101310 (bootstrap-nmake): Change directories once more. 2007-08-14 23:01:03 +00:00
Glenn Morris
4a9f99bdfb Switch license to GPLv3 or later. 2007-07-25 05:08:27 +00:00
Eli Zaretskii
f37b8e41a1 (bootstrap, bootstrap-nmake, bootstrap-gmake): Depend on cmdproxy. 
(cleanall): Don't delete *~.
 2007-07-20 19:32:26 +00:00
Glenn Morris
4e6835dbc4 Add 2007 to copyright years. 2007-01-21 04:57:37 +00:00
Eli Zaretskii
7e5f4e579b Add comment about DOS EOLs in this file. 2006-12-27 13:42:43 +00:00
Eli Zaretskii
2126efcc17 ($(TRES)): Don't use $<, as nmake supports it only in implicit rules. 
Use literal "emacs.rc" instead.
 2006-12-24 07:22:10 +00:00
Eli Zaretskii
d572c0057f (all-other-dirs-nmake, recompile-nmake): Don't use $(XMFLAGS). 2006-12-23 10:28:08 +00:00
Eli Zaretskii
55b5878dfe (bootstrap): Make `all' explicitly in a recursive Make. 2006-12-22 20:54:52 +00:00
Eli Zaretskii
e313b518e8 (clean): Delete stamp_BLD. 2006-12-22 20:41:35 +00:00
Eli Zaretskii
01b3b0dd62 (bootstrap-gmake): Pass XMFLAGS="$(XMFLAGS)" command-line argument to sub-Make 
in src, since src/makefile.w32-in invokes Make recursively during bootstrap.
 2006-12-22 19:28:11 +00:00
Eli Zaretskii
b47342e3bf (addpm, ddeclient, cmdproxy, addsection) 
(preprep, $(TRES), runemacs)
($(BLD)/addpm.$(O), $(BLD)/ddeclient.$(O), $(BLD)/runemacs.$(O))
($(BLD)/cmdproxy.$(O), (BLD)/addsection.$(O), $(BLD)/preprep.$(O)):
Depend on stamp_BLD instead of on $(BLD).
(XMFLAGS): New macro.
(all-other-dirs-nmake, all-other-dirs-gmake, recompile-nmake)
(recompile-gmake, bootstrap-gmake, bootstrap-clean-gmake)
(install-other-dirs-gmake, info-gmake, clean-other-dirs-gmake)
(cleanall-other-dirs-gmake): Pass $(XMFLAGS) to sub-Make.
 2006-12-22 18:23:48 +00:00
Eli Zaretskii
32d0013e43 ($(TRES)): Depend on $(BLD). Use $< instead of $(ALL_DEPS). 
($(BLD)/addpm.$(O):
$(BLD)/ddeclient.$(O):
$(BLD)/runemacs.$(O):
$(BLD)/cmdproxy.$(O):
$(BLD)/addsection.$(O):
$(BLD)/preprep.$(O)): New dependency on $(BLD).
(all-other-dirs-nmake, all-other-dirs-gmake, bootstrap-nmake)
(bootstrap-gmake): Depend on addsection.
 2006-12-20 23:52:16 +00:00
Jason Rumney
f898506184 (install): Use -q when invoking addpm. Avoids problem with MSYS trying 
to interpret it as a fake path and messing with it.
 2006-03-12 17:20:13 +00:00
Thien-Thi Nguyen
ceb4c4d303 Update years in copyright notice; nfc. 2006-02-06 12:31:40 +00:00
Thien-Thi Nguyen
b65d8176e6 Update years in copyright notice; nfc. 2005-08-10 15:40:54 +00:00
Lute Kamstra
364c38d3af Update FSF's address. 2005-07-04 15:47:28 +00:00
Ben Key
d5ef6196df Removed the various "echo." lines from lisp\makefile.w32-in and nt\makefile.w32-in. 
They caused mingw32-make.exe bootstrap to fail with the following error if cmd.exe
was being used as the shell:
  "process_begin: CreateProcess((null), echo., ...) failed."

I replaced the "@echo." lines in nt\makefile.w32-in with "@echo ."  This writes a .
to the screen but that is far more desirable than make bootstrap failing.

I replaced the "echo. ..." line in lisp\makefile.w32-in with "echo ;;; ...".  This
writes an extra comment line to loaddefs.el.  Again this is far more desirable than
make bootstrap failing.

NOTE: I am using cmd.exe as my shell when building Emacs with MinGW instead of
the sh.exe that comes with msys because when I use sh.exe as my shell, loaddefs.el
does not get properly generated and I get various auto load errors.
 2004-07-24 04:52:27 +00:00
Miles Bader
48d67035ea Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-396 
Tweak arch tagging to make build/install-in-place less annoying

Previously, autoconf-created Makefiles and the like would contain
duplicate taglines (unfortunately, autoconf doesn't seem to have a
`strip in generated file' comment mechanism) leading to conflicts, and
installing in place would create unknown directories and copies of
source directories (leading to conflicts with the source directories).

This changeset makes all autoconf-processed files use explicit id-tags
and adds .arch-inventory entries to ignore installation directories.
 2004-06-11 02:39:51 +00:00
Juanma Barranquero
73dfa0bf16 (bootstrap-nmake): When nmake'ing bootstrap on the lisp/ directory, set SHELL to 
$(SHELLTYPE); this avoids calling non-existent cmdproxy.exe on boostrappings
after a previous install followed by realclean.
 2004-06-06 02:00:18 +00:00