From 9d5cf9b6b62d2a3e4e063e180b4b2a659b6ab4f0 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 19 May 2010 23:11:27 -0700 Subject: 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 ':'. --- msdos/sed1v2.inp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'msdos/sed1v2.inp') 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/ /^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/ /^POST_ALLOC_OBJ *=/s/@POST_ALLOC_OBJ@/$(vmlimitobj)/ /^UNEXEC_OBJ *=/s/@unexec@/unexec.o/ +/^DEPFLAGS *=/s/@DEPFLAGS@// +/^MKDEPDIR *=/s/@MKDEPDIR@/:/ /^version *=/s/@[^@\n]*@// /^M_FILE *=/s!@[^@\n]*@!m/intel386.h! /^S_FILE *=/s!@[^@\n]*@!s/msdos.h! @@ -145,6 +147,7 @@ s/\.h\.in/.h-in/ /^ -\{0,1\}ln -/s/ln -f/cp -pf/ /^[ ]touch /s/touch/djecho $@ >/ s/@YMF_PASS_LDFLAGS@/flags/ +s/@deps_frag@// s/bootstrap-emacs/b-emacs/ s/bootstrap-temacs/b-temacs/ s/bootstrap-doc/b-doc/ -- cgit v1.2.3-70-g09d2