From dfe15ea33eb20a0ecec748eefffe2c38e3e4b7fa Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 1 Sep 2002 13:38:50 +0000 Subject: [PATCH] (TEMACS_LDFLAGS): Renamed from ALL_LDFLAGS. Don't include LDFLAGS. (temacs): Pass LDFLAGS separately, and not via YMF_PASS_LDFLAGS. --- src/ChangeLog | 15 +++++++++++++++ src/Makefile.in | 7 ++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 40286abc86b..2ddaa3d9af9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,18 @@ +2002-09-01 Richard M. Stallman + + * alloc.c (display_malloc_warning): Use display-warning. + (malloc_warning_1): Function deleted. + + * alloc.c [ALLOC_DEBUG]: #undef INLINE. + + * lread.c (read1): Handle #! by skipping the line. + +2002-08-31 Richard M. Stallman + + * Makefile.in (TEMACS_LDFLAGS): Renamed from ALL_LDFLAGS. + Don't include LDFLAGS. + (temacs): Pass LDFLAGS separately, and not via YMF_PASS_LDFLAGS. + 2002-08-31 Eli Zaretskii * xdisp.c (get_window_cursor_type): Don't use x_highlight_frame 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 #endif /* not COFF_ENCAPSULATE */ #endif /* not ORDINARY_LINK */ -ALL_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE \ - LD_SWITCH_MACHINE_TEMACS LD_SWITCH_SITE $(LDFLAGS) +/* Flags to pass to LD only for temacs. */ +TEMACS_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE \ + LD_SWITCH_MACHINE_TEMACS LD_SWITCH_SITE /* A macro which other sections of Makefile can redefine to munge the flags before they're passed to LD. This is helpful if you have @@ -894,7 +895,7 @@ ${libsrc}make-docfile: #endif temacs: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args - $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${ALL_LDFLAGS}) \ + $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \ -o temacs ${STARTFILES} ${obj} ${otherobj} \ OBJECTS_MACHINE ${LIBES} -- 2.39.5