aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/Makefile.in7
2 files changed, 5 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2bd068d6742..3775c318bd7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12000-06-21 Dave Love <fx@gnu.org>
2
3 * Makefile.in (GETLOADAVG_OBJ): Removed -- LIBOBJS does it.
4
12000-06-21 Stefan Monnier <monnier@cs.yale.edu> 52000-06-21 Stefan Monnier <monnier@cs.yale.edu>
2 6
3 * syntax.c (back_comment): Simplify string-parity counting (with 7 * syntax.c (back_comment): Simplify string-parity counting (with
diff --git a/src/Makefile.in b/src/Makefile.in
index 1fd267dba09..1320f480dde 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -513,11 +513,6 @@ ALL_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE \
513 513
514INTERVAL_SRC = intervals.h composite.h 514INTERVAL_SRC = intervals.h composite.h
515 515
516#ifdef HAVE_GETLOADAVG
517#define GETLOADAVG_OBJ
518#else
519#define GETLOADAVG_OBJ getloadavg.o
520#endif
521GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ 516GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
522 517
523#ifdef MSDOS 518#ifdef MSDOS
@@ -604,7 +599,7 @@ widgetobj=
604 599
605/* define otherobj as list of object files that make-docfile 600/* define otherobj as list of object files that make-docfile
606 should not be told about. */ 601 should not be told about. */
607otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj) $(LIBOBJS) GETLOADAVG_OBJ 602otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj) $(LIBOBJS)
608 603
609#ifdef HAVE_MOUSE 604#ifdef HAVE_MOUSE
610#define MOUSE_SUPPORT ${lispsource}mouse.elc \ 605#define MOUSE_SUPPORT ${lispsource}mouse.elc \