aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile.in
diff options
context:
space:
mode:
authorRichard M. Stallman2002-09-01 13:38:50 +0000
committerRichard M. Stallman2002-09-01 13:38:50 +0000
commitdfe15ea33eb20a0ecec748eefffe2c38e3e4b7fa (patch)
tree08d129844ff1e149801c69363b9559d007461956 /src/Makefile.in
parent4455ad75c5aba5dc4bae53fe271fea8b391b4a54 (diff)
downloademacs-dfe15ea33eb20a0ecec748eefffe2c38e3e4b7fa.tar.gz
emacs-dfe15ea33eb20a0ecec748eefffe2c38e3e4b7fa.zip
(TEMACS_LDFLAGS): Renamed from ALL_LDFLAGS. Don't include LDFLAGS.
(temacs): Pass LDFLAGS separately, and not via YMF_PASS_LDFLAGS.
Diffstat (limited to 'src/Makefile.in')
-rw-r--r--src/Makefile.in7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index a71798e2c42..9271bc5c8b9 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -505,8 +505,9 @@ LD=ld
505#endif /* not COFF_ENCAPSULATE */ 505#endif /* not COFF_ENCAPSULATE */
506#endif /* not ORDINARY_LINK */ 506#endif /* not ORDINARY_LINK */
507 507
508ALL_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE \ 508/* Flags to pass to LD only for temacs. */
509 LD_SWITCH_MACHINE_TEMACS LD_SWITCH_SITE $(LDFLAGS) 509TEMACS_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE \
510 LD_SWITCH_MACHINE_TEMACS LD_SWITCH_SITE
510 511
511/* A macro which other sections of Makefile can redefine to munge the 512/* A macro which other sections of Makefile can redefine to munge the
512 flags before they're passed to LD. This is helpful if you have 513 flags before they're passed to LD. This is helpful if you have
@@ -894,7 +895,7 @@ ${libsrc}make-docfile:
894#endif 895#endif
895 896
896temacs: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args 897temacs: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args
897 $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${ALL_LDFLAGS}) \ 898 $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \
898 -o temacs ${STARTFILES} ${obj} ${otherobj} \ 899 -o temacs ${STARTFILES} ${obj} ${otherobj} \
899 OBJECTS_MACHINE ${LIBES} 900 OBJECTS_MACHINE ${LIBES}
900 901