Mercurial > emacs
comparison src/Makefile.in @ 108792:939ecb6ccd4d
Replace YMF_PASS_LDFLAGS with autoconf.
* configure.in (YMF_PASS_LDFLAGS): Remove.
(PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS): New output variables.
* configure: Regenerate.
* src/Makefile.in (YMF_PASS_LDFLAGS): Remove.
(temacs${EXEEXT}): Use PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS.
* msdos/sed1v2.inp (@PRE_EDIT_LDFLAGS@, @POST_EDIT_LDFLAGS@): Edit to nothing.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Tue, 25 May 2010 23:41:58 -0700 |
parents | b06e3f33ea78 |
children | dedcf813aa69 |
comparison
equal
deleted
inserted
replaced
108791:737446e13a3f | 108792:939ecb6ccd4d |
---|---|
632 cd ${libsrc}; ${MAKE} ${MFLAGS} make-docfile${EXEEXT} | 632 cd ${libsrc}; ${MAKE} ${MFLAGS} make-docfile${EXEEXT} |
633 | 633 |
634 buildobj.h: Makefile | 634 buildobj.h: Makefile |
635 echo "#define BUILDOBJ \"${obj} ${otherobj} " "\"" > buildobj.h | 635 echo "#define BUILDOBJ \"${obj} ${otherobj} " "\"" > buildobj.h |
636 | 636 |
637 #define YMF_PASS_LDFLAGS(flags) @YMF_PASS_LDFLAGS@ | 637 |
638 | 638 /* We cannot define variables for PRE_EDIT and POST_EDIT. |
639 If !ORDINARY_LINK && !LINKER && GCC, they add a | |
640 \`./prefix-args -Xlinker ... \` wrapper, otherwise they are empty. | |
641 One alternative to this approach would be to always call prefix-args, | |
642 and have it DTRT in all cases, by testing the above defines. */ | |
639 temacs${EXEEXT}: $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT} | 643 temacs${EXEEXT}: $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT} |
640 $(LD) YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} ) \ | 644 $(LD) @PRE_EDIT_LDFLAGS@ ${TEMACS_LDFLAGS} @POST_EDIT_LDFLAGS@ \ |
641 ${TEMACS_LDFLAGS2} \ | 645 ${TEMACS_LDFLAGS2} \ |
642 -o temacs ${START_FILES} ${obj} ${otherobj} ${LIBES} | 646 -o temacs ${START_FILES} ${obj} ${otherobj} ${LIBES} |
643 | 647 |
644 prefix-args${EXEEXT}: prefix-args.o $(config_h) | 648 prefix-args${EXEEXT}: prefix-args.o $(config_h) |
645 $(CC) $(LDFLAGS) prefix-args.o -o prefix-args | 649 $(CC) $(LDFLAGS) prefix-args.o -o prefix-args |