HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add conflict detection/resolution to vc-hg (bug#10709)
[bpt/emacs.git]
/
msdos
/
mainmake.v2
diff --git
a/msdos/mainmake.v2
b/msdos/mainmake.v2
index
3b65fcc
..
3df6ca1
100644
(file)
--- a/
msdos/mainmake.v2
+++ b/
msdos/mainmake.v2
@@
-1,6
+1,6
@@
# Top-level Makefile for Emacs under MS-DOS/DJGPP v2.0 or higher. -*-makefile-*-
# Top-level Makefile for Emacs under MS-DOS/DJGPP v2.0 or higher. -*-makefile-*-
-# Copyright (C) 1996-201
1
Free Software Foundation, Inc.
+# Copyright (C) 1996-201
2
Free Software Foundation, Inc.
# This file is part of GNU Emacs.
# This file is part of GNU Emacs.
@@
-161,8
+161,7
@@
TAGS tags: lib-src FRC
cd src
../bin/etags --include=../lisp/TAGS \
--regex='/[ ]*DEFVAR_[A-Z_ (]+"\([^"]+\)"/' \
cd src
../bin/etags --include=../lisp/TAGS \
--regex='/[ ]*DEFVAR_[A-Z_ (]+"\([^"]+\)"/' \
- $(CURDIR)/src/*.c $(CURDIR)/src/*.h \
- $(CURDIR)/src/s/msdos.h $(CURDIR)/src/m/intel386.h
+ $(CURDIR)/src/*.c $(CURDIR)/src/*.h
cd ..
./bin/etags --include=src/TAGS
cd ..
./bin/etags --include=src/TAGS
@@
-269,7
+268,7
@@
extraclean:
bootstrap-clean: FRC
cd lib
bootstrap-clean: FRC
cd lib
- $(MAKE) $(MFLAGS) $@
+ -$(MAKE) $(MFLAGS) maintainer-clean
cd ..
cd src
$(MAKE) $(MFLAGS) $@
cd ..
cd src
$(MAKE) $(MFLAGS) $@
@@
-299,4
+298,3
@@
bootstrap-clean: FRC
bootstrap: bootstrap-clean FRC
command.com /e:2048 /c config msdos
$(MAKE) $(MFLAGS) info all
bootstrap: bootstrap-clean FRC
command.com /e:2048 /c config msdos
$(MAKE) $(MFLAGS) info all
-