aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKen Raeburn2000-04-10 19:11:45 +0000
committerKen Raeburn2000-04-10 19:11:45 +0000
commit6ed565689ed8614295e7f5f30fef933d1ab5ee1f (patch)
tree69cfd489000b81d2205be04cc176026d3b7c2611 /src
parentdf3b0cc64ed41e83302903277422017e0a77de66 (diff)
downloademacs-6ed565689ed8614295e7f5f30fef933d1ab5ee1f.tar.gz
emacs-6ed565689ed8614295e7f5f30fef933d1ab5ee1f.zip
* Makefile.in (temacs): Revert 2000-03-12 change.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/Makefile.in3
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2cee945ccf3..98ade2552ad 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12000-04-10 Ken Raeburn <raeburn@gnu.org>
2
3 * Makefile.in (temacs): Revert 2000-03-12 change.
4
12000-04-10 Jason Rumney <jasonr@gnu.org> 52000-04-10 Jason Rumney <jasonr@gnu.org>
2 6
3 * xfaces.c (realize_face): Change FRAME_X_P to FRAME_WINDOW_P. 7 * xfaces.c (realize_face): Change FRAME_X_P to FRAME_WINDOW_P.
diff --git a/src/Makefile.in b/src/Makefile.in
index 8eedd252bac..f591fb1f229 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -874,8 +874,7 @@ ${libsrc}make-docfile:
874#endif 874#endif
875 875
876temacs: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_SYSTEM OBJECTS_MACHINE prefix-args 876temacs: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_SYSTEM OBJECTS_MACHINE prefix-args
877 all_ldflags="${ALL_LDFLAGS}" && \ 877 $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${ALL_LDFLAGS}) \
878 $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} $${all_ldflags}) \
879 -o temacs ${STARTFILES} ${obj} ${otherobj} \ 878 -o temacs ${STARTFILES} ${obj} ${otherobj} \
880 OBJECTS_SYSTEM OBJECTS_MACHINE ${LIBES} 879 OBJECTS_SYSTEM OBJECTS_MACHINE ${LIBES}
881 880