Commit c345fe90 authored by Glenn Morris's avatar Glenn Morris

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.
parent 2e0689ab
2010-05-25 Glenn Morris <rgm@gnu.org>
* 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.
......
......@@ -111,8 +111,14 @@ LD_SWITCH_SYSTEM=@LD_SWITCH_SYSTEM@
## which are only good with temacs.
LD_SWITCH_SYSTEM_TEMACS=@LD_SWITCH_SYSTEM_TEMACS@
## If NS_IMPL_GNUSTEP, some definitions and includes are expanded here.
@NS_IMPL_GNUSTEP_INC@
## This uses ${CONFIG_SYSTEM_LIBS} from @NS_IMPL_GNUSTEP_INC@.
NS_IMPL_GNUSTEP_TEMACS_LDFLAGS=@NS_IMPL_GNUSTEP_TEMACS_LDFLAGS@
## 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 @@ MKDEPDIR=@MKDEPDIR@
# ========================== 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. */
@NS_IMPL_GNUSTEP_INC@
/* FIXME move to LD_SWITCH_SYSTEM_TEMACS?
This uses ${CONFIG_SYSTEM_LIBS}, presumably set by the above include. */
NS_IMPL_GNUSTEP_TEMACS_LDFLAGS=@NS_IMPL_GNUSTEP_TEMACS_LDFLAGS@
/* 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 @@ buildobj.h: Makefile
#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}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment