Commit e6ec4e99 authored by Glenn Morris's avatar Glenn Morris
Browse files

Move NS_OBJ, NS_SUPPORT from cpp to configure.

* configure.in (NS_OBJ, NS_SUPPORT): New output variables.
* src/Makefile.in (NS_OBJ, NS_SUPPORT): Set with configure, not cpp.
parent f1e3642a
2010-04-28 Glenn Morris <rgm@gnu.org> 2010-04-28 Glenn Morris <rgm@gnu.org>
* configure.in (NS_OBJ, NS_SUPPORT): New output variables.
* configure.in (machine, canonical): On amdx86-64, check for a 32-bit * configure.in (machine, canonical): On amdx86-64, check for a 32-bit
userland and maybe change values to i386 (move test from s/amdx86-64.h). userland and maybe change values to i386 (move test from s/amdx86-64.h).
......
...@@ -1404,6 +1404,9 @@ if test "${with_ns}" != no; then ...@@ -1404,6 +1404,9 @@ if test "${with_ns}" != no; then
NS_HAVE_NSINTEGER=no NS_HAVE_NSINTEGER=no
fi fi
fi fi
NS_OBJ=
NS_SUPPORT=
if test "${HAVE_NS}" = yes; then if test "${HAVE_NS}" = yes; then
window_system=nextstep window_system=nextstep
with_xft=no with_xft=no
...@@ -1413,9 +1416,13 @@ if test "${HAVE_NS}" = yes; then ...@@ -1413,9 +1416,13 @@ if test "${HAVE_NS}" = yes; then
if test "${EN_NS_SELF_CONTAINED}" = yes; then if test "${EN_NS_SELF_CONTAINED}" = yes; then
prefix=${ns_appresdir} prefix=${ns_appresdir}
fi fi
NS_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o fontset.o fringe.o image.o"
NS_SUPPORT="\${lispsource}emacs-lisp/easymenu.elc \${lispsource}term/ns-win.elc"
fi fi
CFLAGS="$tmp_CFLAGS" CFLAGS="$tmp_CFLAGS"
CPPFLAGS="$tmp_CPPFLAGS" CPPFLAGS="$tmp_CPPFLAGS"
AC_SUBST(NS_OBJ)
AC_SUBST(NS_SUPPORT)
case "${window_system}" in case "${window_system}" in
x11 ) x11 )
......
2010-04-28 Glenn Morris <rgm@gnu.org> 2010-04-28 Glenn Morris <rgm@gnu.org>
* Makefile.in (NS_OBJ, NS_SUPPORT): Set with configure, not cpp.
* m/amdx86-64.h [i386]: Move this test to configure.in. * m/amdx86-64.h [i386]: Move this test to configure.in.
2010-04-27 Glenn Morris <rgm@gnu.org> 2010-04-27 Glenn Morris <rgm@gnu.org>
......
...@@ -104,6 +104,9 @@ RSVG_CFLAGS= @RSVG_CFLAGS@ ...@@ -104,6 +104,9 @@ RSVG_CFLAGS= @RSVG_CFLAGS@
## widget.o if USE_X_TOOLKIT, otherwise empty. ## widget.o if USE_X_TOOLKIT, otherwise empty.
WIDGET_OBJ=@WIDGET_OBJ@ WIDGET_OBJ=@WIDGET_OBJ@
NS_OBJ=@NS_OBJ@
NS_SUPPORT=@NS_SUPPORT@
LIBSELINUX_LIBS = @LIBSELINUX_LIBS@ LIBSELINUX_LIBS = @LIBSELINUX_LIBS@
INTERVALS_H = dispextern.h intervals.h composite.h INTERVALS_H = dispextern.h intervals.h composite.h
...@@ -369,9 +372,6 @@ ns_appdir=@ns_appdir@/ ...@@ -369,9 +372,6 @@ ns_appdir=@ns_appdir@/
ns_appbindir=@ns_appbindir@/ ns_appbindir=@ns_appbindir@/
ns_appresdir=@ns_appresdir@/ ns_appresdir=@ns_appresdir@/
ns_appsrc=@ns_appsrc@ ns_appsrc=@ns_appsrc@
/* Object files for NeXTstep */
NS_OBJ= nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \
fontset.o fringe.o image.o
#endif /* HAVE_NS */ #endif /* HAVE_NS */
#ifdef HAVE_WINDOW_SYSTEM #ifdef HAVE_WINDOW_SYSTEM
...@@ -504,13 +504,6 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(WIDGET_OBJ) $(LIBOBJS) ...@@ -504,13 +504,6 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(WIDGET_OBJ) $(LIBOBJS)
#define TOOLTIP_SUPPORT #define TOOLTIP_SUPPORT
#endif #endif
#ifdef HAVE_NS
#define NS_SUPPORT ${lispsource}emacs-lisp/easymenu.elc \
${lispsource}term/ns-win.elc
#else
#define NS_SUPPORT
#endif
/* This is the platform-specific list of Lisp files loaded into the /* This is the platform-specific list of Lisp files loaded into the
dumped Emacs. It is arranged like this because it is easier to generate dumped Emacs. It is arranged like this because it is easier to generate
it semi-mechanically from loadup.el this way. it semi-mechanically from loadup.el this way.
...@@ -611,7 +604,7 @@ lisp= \ ...@@ -611,7 +604,7 @@ lisp= \
MSDOS_SUPPORT \ MSDOS_SUPPORT \
WINNT_SUPPORT \ WINNT_SUPPORT \
WINDOW_SUPPORT \ WINDOW_SUPPORT \
NS_SUPPORT \ ${NS_SUPPORT} \
${lispsource}widget.elc \ ${lispsource}widget.elc \
${lispsource}window.elc \ ${lispsource}window.elc \
${lispsource}version.el ${lispsource}version.el
......
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