diff options
| author | Glenn Morris | 2010-05-20 18:31:13 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-05-20 18:31:13 -0700 |
| commit | c468346e16fe18f26944b0c88fd32f20be1edcc8 (patch) | |
| tree | dc69a8ae316e2195135d48616656d671388b5847 /src | |
| parent | e75c1e7dc4f08f6ebc8984d2b08edce6906ccf50 (diff) | |
| download | emacs-c468346e16fe18f26944b0c88fd32f20be1edcc8.tar.gz emacs-c468346e16fe18f26944b0c88fd32f20be1edcc8.zip | |
Minor Makefile fix.
* src/Makefile.in (temacs${EXEEXT}, prefix-args, mostlyclean):
prefix-args neither gets nor needs the $EXEEXT extension.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/Makefile.in | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d74fb712e6d..3d17e7a60e3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2010-05-21 Glenn Morris <rgm@gnu.org> | 1 | 2010-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 | |||
| 3 | * Makefile.in (${ns_appdir}, ${ns_appbindir}Emacs, ns-app): | 6 | * Makefile.in (${ns_appdir}, ${ns_appbindir}Emacs, ns-app): |
| 4 | Move these rules to ns.mk. | 7 | Move these rules to ns.mk. |
| 5 | * ns.mk: New file. | 8 | * ns.mk: New file. |
diff --git a/src/Makefile.in b/src/Makefile.in index 091cd9fc2e8..333f05f8d20 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 | ||
| 652 | temacs${EXEEXT}: $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT} | 652 | temacs${EXEEXT}: $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args |
| 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 | ||
| 658 | prefix-args${EXEEXT}: prefix-args.o $(config_h) | 658 | prefix-args: 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 | ||
| 707 | mostlyclean: | 707 | mostlyclean: |
| 708 | rm -f temacs${EXEEXT} prefix-args${EXEEXT} core *.core \#* *.o libXMenu11.a liblw.a | 708 | rm -f temacs${EXEEXT} prefix-args 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 |