aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2010-05-20 18:39:21 -0700
committerGlenn Morris2010-05-20 18:39:21 -0700
commitd8ca3b11dee8e6f1ea09eb25628419571d7e3eea (patch)
tree5753f5810ce5e6e3948cf2bd47a787605e555add /src
parentc468346e16fe18f26944b0c88fd32f20be1edcc8 (diff)
downloademacs-d8ca3b11dee8e6f1ea09eb25628419571d7e3eea.tar.gz
emacs-d8ca3b11dee8e6f1ea09eb25628419571d7e3eea.zip
Revert previous change.
I misunderstood EXEEXT (I don't think it can be working though).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/Makefile.in6
2 files changed, 3 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 3d17e7a60e3..d74fb712e6d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,5 @@
12010-05-21 Glenn Morris <rgm@gnu.org> 12010-05-21 Glenn Morris <rgm@gnu.org>
2 2
3 * Makefile.in (temacs${EXEEXT}, prefix-args, mostlyclean):
4 prefix-args neither gets nor needs the $EXEEXT extension.
5
6 * Makefile.in (${ns_appdir}, ${ns_appbindir}Emacs, ns-app): 3 * Makefile.in (${ns_appdir}, ${ns_appbindir}Emacs, ns-app):
7 Move these rules to ns.mk. 4 Move these rules to ns.mk.
8 * ns.mk: New file. 5 * ns.mk: New file.
diff --git a/src/Makefile.in b/src/Makefile.in
index 333f05f8d20..091cd9fc2e8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -649,13 +649,13 @@ buildobj.h: Makefile
649 649
650#define YMF_PASS_LDFLAGS(flags) @YMF_PASS_LDFLAGS@ 650#define YMF_PASS_LDFLAGS(flags) @YMF_PASS_LDFLAGS@
651 651
652temacs${EXEEXT}: $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args 652temacs${EXEEXT}: $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT}
653 $(LD) YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \ 653 $(LD) YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \
654 ${NS_IMPL_GNUSTEP_TEMACS_LDFLAGS} ) \ 654 ${NS_IMPL_GNUSTEP_TEMACS_LDFLAGS} ) \
655 ${TEMACS_LDFLAGS2} \ 655 ${TEMACS_LDFLAGS2} \
656 -o temacs ${START_FILES} ${obj} ${otherobj} ${LIBES} 656 -o temacs ${START_FILES} ${obj} ${otherobj} ${LIBES}
657 657
658prefix-args: prefix-args.o $(config_h) 658prefix-args${EXEEXT}: prefix-args.o $(config_h)
659 $(CC) $(LDFLAGS) prefix-args.o -o prefix-args 659 $(CC) $(LDFLAGS) prefix-args.o -o prefix-args
660 660
661 661
@@ -705,7 +705,7 @@ doc.o: buildobj.h
705 705
706 706
707mostlyclean: 707mostlyclean:
708 rm -f temacs${EXEEXT} prefix-args core *.core \#* *.o libXMenu11.a liblw.a 708 rm -f temacs${EXEEXT} prefix-args${EXEEXT} core *.core \#* *.o libXMenu11.a liblw.a
709 rm -f ../etc/DOC 709 rm -f ../etc/DOC
710 rm -f bootstrap-emacs${EXEEXT} emacs-${version}${EXEEXT} 710 rm -f bootstrap-emacs${EXEEXT} emacs-${version}${EXEEXT}
711 rm -f buildobj.h 711 rm -f buildobj.h