mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-05 11:21:04 -08:00
Code Issues Projects Releases Wiki Activity
86414 commits 243 branches 194 tags 712 MiB
Commit graph

56 commits

Author SHA1 Message Date
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
Jason Rumney
5eb3d2a514 (info-gmake, info-nmake): New targets. 
(info): Use them.
 2004-05-03 13:51:59 +00:00
Juanma Barranquero
bd6766d34d Add "-*- makefile -*-" mode tag. 2004-04-23 00:24:35 +00:00
Juanma Barranquero
134d967186 (install): Don't try to copy ../lib-src/fns-*.el, as it isn't used anymore. 2004-03-10 21:40:58 +00:00
Jason Rumney
fd1f2f1e99 (force-info, info): New targets. 2003-09-03 23:05:32 +00:00
Miles Bader
a2fcf0296f Fix some DOS line-ending inconsistencies introduced with arch-tag: 2003-09-02 19:14:00 +00:00
Miles Bader
ab5796a9f9 Add arch taglines 2003-09-01 15:45:59 +00:00
Juanma Barranquero
177c0ea743 Trailing whitespace deleted. 2003-02-04 14:56:31 +00:00
Jason Rumney
c3c5777766 (maybe-bootstrap, doit, maybe-bootstrap-CMD) 
(maybe-bootstrap-SH): New targets.
(all): Depend on maybe-bootstrap.
 2002-06-13 18:40:14 +00:00
Juanma Barranquero
dc7285149f (bootstrap-nmake, bootstrap-gmake): Make DOC after compiling .el files. 2002-04-11 07:16:13 +00:00
Andrew Innes
0e4435bed6 (bootstrap): Build addsection program before 
bootstrap (required for post-processing temacs.exe).
 2001-12-14 18:14:22 +00:00
Andrew Innes
8af54a640d (bootstrap-nmake): 
(bootstrap-gmake): Extend bootstrap process to first do
bootstrap-clean in lisp dir and rebuild the DOC file.
(bootstrap): Do a "normal" make after the bootstrap work.
 2001-12-03 11:40:21 +00:00
Eli Zaretskii
83536c16cd ($(INSTALL_DIR)/bin): Depend on $(INSTALL_DIR), 
since some versions of `mkdir' don't automatically create parent
directories.  From Bruno Grossniklaus <bruno.grossniklaus@ubs.com>.
 2001-09-04 11:28:50 +00:00
Eli Zaretskii
bd6ccd78ad (install): Copy subdirs.el to the installation directory. 2001-08-31 10:25:55 +00:00
Andrew Innes
41eca17b1d Add copyright notice. 2001-02-24 22:00:47 +00:00
Andrew Innes
daae70def3 (cleanall-other-dirs-nmake): 
(cleanall-other-dirs-gmake): New targets.
(cleanall): Invoke them.
 2001-01-24 12:31:07 +00:00
Andrew Innes
aef625b1a3 Use $(MAKETYPE) instead of $(SHELLTYPE) to 
select correct rule for invoking make in another directory.  Amend
rules accordingly.
(clean): Delete $(COMPILER_TEMP_FILES) instead of *.pdb.
 2001-01-06 21:18:42 +00:00