diff options
| author | Glenn Morris | 2010-05-19 23:11:27 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-05-19 23:11:27 -0700 |
| commit | 9d5cf9b6b62d2a3e4e063e180b4b2a659b6ab4f0 (patch) | |
| tree | 04d04a57b4fd023e0fb4508a94d9c1e5269c54b4 /msdos | |
| parent | 21566ba7e5c6d0ba3fdd14da8320e76bc3cb63fe (diff) | |
| download | emacs-9d5cf9b6b62d2a3e4e063e180b4b2a659b6ab4f0.tar.gz emacs-9d5cf9b6b62d2a3e4e063e180b4b2a659b6ab4f0.zip | |
Handle auto-depend with configure.
* make-dist (src): Include *.mk.
* config.bat: Concatenate deps.mk onto the end of src/Makefile.
* configure.in (DEPFLAGS, MKDEPDIR): New output variables.
(deps_frag): New output file.
(AUTO_DEPEND): Remove this definition.
* src/Makefile.in (DEPDIR): New constant.
(DEPFLAGS): Set with configure, not cpp.
(MKDEPDIR): New, set by configure.
(.c.o, .m.o, ecrt0.o): Use $MKDEPDIR.
(clean): Use $DEPDIR.
(deps_frag): Include from configure.
Move static/dynamic dependency stuff to deps.mk/autodeps.mk.
* src/deps.mk, src/autodeps.mk: New files, extracted from Makefile.in.
* msdos/sed1v2.inp (DEPFLAGS, deps_frag): Edit to empty.
(MKDEPDIR): Edit to ':'.
Diffstat (limited to 'msdos')
| -rw-r--r-- | msdos/ChangeLog | 5 | ||||
| -rw-r--r-- | msdos/sed1v2.inp | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index ba1495bbd08..46730bff694 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-05-20 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * sed1v2.inp (DEPFLAGS, deps_frag): Edit to empty. | ||
| 4 | (MKDEPDIR): Edit to ':'. | ||
| 5 | |||
| 1 | 2010-05-19 Glenn Morris <rgm@gnu.org> | 6 | 2010-05-19 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * sed2v2.inp (ORDINARY_LINK): Set here rather than in s/msdos.h. | 8 | * sed2v2.inp (ORDINARY_LINK): Set here rather than in s/msdos.h. |
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 7b9b77309df..37002a5dbd6 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp | |||
| @@ -123,6 +123,8 @@ s/\.h\.in/.h-in/ | |||
| 123 | /^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/ | 123 | /^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/ |
| 124 | /^POST_ALLOC_OBJ *=/s/@POST_ALLOC_OBJ@/$(vmlimitobj)/ | 124 | /^POST_ALLOC_OBJ *=/s/@POST_ALLOC_OBJ@/$(vmlimitobj)/ |
| 125 | /^UNEXEC_OBJ *=/s/@unexec@/unexec.o/ | 125 | /^UNEXEC_OBJ *=/s/@unexec@/unexec.o/ |
| 126 | /^DEPFLAGS *=/s/@DEPFLAGS@// | ||
| 127 | /^MKDEPDIR *=/s/@MKDEPDIR@/:/ | ||
| 126 | /^version *=/s/@[^@\n]*@// | 128 | /^version *=/s/@[^@\n]*@// |
| 127 | /^M_FILE *=/s!@[^@\n]*@!m/intel386.h! | 129 | /^M_FILE *=/s!@[^@\n]*@!m/intel386.h! |
| 128 | /^S_FILE *=/s!@[^@\n]*@!s/msdos.h! | 130 | /^S_FILE *=/s!@[^@\n]*@!s/msdos.h! |
| @@ -145,6 +147,7 @@ s/\.h\.in/.h-in/ | |||
| 145 | /^ -\{0,1\}ln -/s/ln -f/cp -pf/ | 147 | /^ -\{0,1\}ln -/s/ln -f/cp -pf/ |
| 146 | /^[ ]touch /s/touch/djecho $@ >/ | 148 | /^[ ]touch /s/touch/djecho $@ >/ |
| 147 | s/@YMF_PASS_LDFLAGS@/flags/ | 149 | s/@YMF_PASS_LDFLAGS@/flags/ |
| 150 | s/@deps_frag@// | ||
| 148 | s/bootstrap-emacs/b-emacs/ | 151 | s/bootstrap-emacs/b-emacs/ |
| 149 | s/bootstrap-temacs/b-temacs/ | 152 | s/bootstrap-temacs/b-temacs/ |
| 150 | s/bootstrap-doc/b-doc/ | 153 | s/bootstrap-doc/b-doc/ |