From: Glenn Morris Date: Fri, 21 May 2010 01:39:21 +0000 (-0700) Subject: Revert previous change. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~205^2~19 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d8ca3b11dee8e6f1ea09eb25628419571d7e3eea;p=emacs.git Revert previous change. I misunderstood EXEEXT (I don't think it can be working though). --- diff --git a/src/ChangeLog b/src/ChangeLog index 3d17e7a60e3..d74fb712e6d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,8 +1,5 @@ 2010-05-21 Glenn Morris - * Makefile.in (temacs${EXEEXT}, prefix-args, mostlyclean): - prefix-args neither gets nor needs the $EXEEXT extension. - * Makefile.in (${ns_appdir}, ${ns_appbindir}Emacs, ns-app): Move these rules to ns.mk. * 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 #define YMF_PASS_LDFLAGS(flags) @YMF_PASS_LDFLAGS@ -temacs${EXEEXT}: $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args +temacs${EXEEXT}: $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT} $(LD) YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \ ${NS_IMPL_GNUSTEP_TEMACS_LDFLAGS} ) \ ${TEMACS_LDFLAGS2} \ -o temacs ${START_FILES} ${obj} ${otherobj} ${LIBES} -prefix-args: prefix-args.o $(config_h) +prefix-args${EXEEXT}: prefix-args.o $(config_h) $(CC) $(LDFLAGS) prefix-args.o -o prefix-args @@ -705,7 +705,7 @@ doc.o: buildobj.h mostlyclean: - rm -f temacs${EXEEXT} prefix-args core *.core \#* *.o libXMenu11.a liblw.a + rm -f temacs${EXEEXT} prefix-args${EXEEXT} core *.core \#* *.o libXMenu11.a liblw.a rm -f ../etc/DOC rm -f bootstrap-emacs${EXEEXT} emacs-${version}${EXEEXT} rm -f buildobj.h