[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100434: Relocate NS_IMPL_GNUSTEP_TEM
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100434: Relocate NS_IMPL_GNUSTEP_TEMACS_LDFLAGS. |
Date: |
Mon, 24 May 2010 21:25:15 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100434
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2010-05-24 21:25:15 -0700
message:
Relocate NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.
* src/Makefile.in (@NS_IMPL_GNUSTEP_INC@, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):
Move before TEMACS_LDFLAGS.
(TEMACS_LDFLAGS): Use $NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.
(temacs${EXEEXT}): Do not use $NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.
modified:
src/ChangeLog
src/Makefile.in
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-05-25 04:17:52 +0000
+++ b/src/ChangeLog 2010-05-25 04:25:15 +0000
@@ -1,5 +1,10 @@
2010-05-25 Glenn Morris <address@hidden>
+ * Makefile.in (@NS_IMPL_GNUSTEP_INC@, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):
+ Move before TEMACS_LDFLAGS.
+ (TEMACS_LDFLAGS): Use $NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.
+ (temacs${EXEEXT}): Do not use $NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.
+
* Makefile.in (NOT_C_CODE): No longer define.
(config.h): No longer include.
=== modified file 'src/Makefile.in'
--- a/src/Makefile.in 2010-05-25 04:17:52 +0000
+++ b/src/Makefile.in 2010-05-25 04:25:15 +0000
@@ -111,8 +111,14 @@
## which are only good with temacs.
address@hidden@
+## If NS_IMPL_GNUSTEP, some definitions and includes are expanded here.
address@hidden@
+
+## This uses ${CONFIG_SYSTEM_LIBS} from @address@hidden
address@hidden@
+
## Flags to pass to ld only for temacs.
-TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS)
+TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS)
$(NS_IMPL_GNUSTEP_TEMACS_LDFLAGS)
## $LDFLAGS, or empty if NS_IMPL_GNUSTEP (for some reason).
TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@
@@ -301,13 +307,6 @@
# ========================== start of cpp stuff =======================
/* From here on, comments must be done in C syntax. */
-/* If NS_IMPL_GNUSTEP, some definitions and includes are expanded here. */
address@hidden@
-
-/* FIXME move to LD_SWITCH_SYSTEM_TEMACS?
- This uses ${CONFIG_SYSTEM_LIBS}, presumably set by the above include. */
address@hidden@
-
/* DO NOT use -R. There is a special hack described in lastfile.c
which is used instead. Some initialized data areas are modified
at initial startup, then labeled as part of the text area when
@@ -644,8 +643,7 @@
#define YMF_PASS_LDFLAGS(flags) @YMF_PASS_LDFLAGS@
temacs${EXEEXT}: $(START_FILES) stamp-oldxmenu ${obj} ${otherobj}
prefix-args${EXEEXT}
- $(LD) YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \
- ${NS_IMPL_GNUSTEP_TEMACS_LDFLAGS} ) \
+ $(LD) YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} ) \
${TEMACS_LDFLAGS2} \
-o temacs ${START_FILES} ${obj} ${otherobj} ${LIBES}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r100434: Relocate NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.,
Glenn Morris <=