projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(=koseki): Fix DOC.
[chise/xemacs-chise.git-]
/
nt
/
xemacs.mak
diff --git
a/nt/xemacs.mak
b/nt/xemacs.mak
index
35ddb91
..
79ad838
100644
(file)
--- a/
nt/xemacs.mak
+++ b/
nt/xemacs.mak
@@
-1,6
+1,6
@@
# Makefile for Microsoft NMAKE
# Copyright (C) 1995 Board of Trustees, University of Illinois.
# Makefile for Microsoft NMAKE
# Copyright (C) 1995 Board of Trustees, University of Illinois.
-# Copyright (C) 1995, 1996, 2000 Ben Wing.
+# Copyright (C) 1995, 1996, 2000, 2005 Ben Wing.
# Copyright (C) 1995 Sun Microsystems, Inc.
# Copyright (C) 1998 Free Software Foundation, Inc.
#
# Copyright (C) 1995 Sun Microsystems, Inc.
# Copyright (C) 1998 Free Software Foundation, Inc.
#
@@
-108,17
+108,24
@@
INSTALL_DIR=c:\Program Files\XEmacs\XEmacs-$(XEMACS_VERSION_STRING)
!if !defined(HAVE_MULE)
HAVE_MULE=0
!endif
!if !defined(HAVE_MULE)
HAVE_MULE=0
!endif
+
+# If PACKAGE_PATH was defined, use it. If PACKAGE_PATH was not defined,
+# but PACKAGE_PREFIX was, use PACKAGE_PREFIX to generate a package path.
+# If neither PACKAGE_PATH nor PACKAGE_PREFIX was defined,
+# do not define a package path.
!if !defined(PACKAGE_PATH)
!if !defined(PACKAGE_PATH)
-! if !defined(PACKAGE_PREFIX)
-PACKAGE_PREFIX=c:\Program Files\XEmacs
-! endif
-! if $(HAVE_MULE)
+! if defined(PACKAGE_PREFIX)
+! if $(HAVE_MULE)
PACKAGE_PATH=~\.xemacs;;$(PACKAGE_PREFIX)\site-packages;$(PACKAGE_PREFIX)\mule-packages;$(PACKAGE_PREFIX)\xemacs-packages
PACKAGE_PATH=~\.xemacs;;$(PACKAGE_PREFIX)\site-packages;$(PACKAGE_PREFIX)\mule-packages;$(PACKAGE_PREFIX)\xemacs-packages
-! else
+! else
PACKAGE_PATH=~\.xemacs;;$(PACKAGE_PREFIX)\site-packages;$(PACKAGE_PREFIX)\xemacs-packages
PACKAGE_PATH=~\.xemacs;;$(PACKAGE_PREFIX)\site-packages;$(PACKAGE_PREFIX)\xemacs-packages
+! endif
! endif
!endif
! endif
!endif
+!if defined(PACKAGE_PATH)
PATH_PACKAGEPATH="$(PACKAGE_PATH:\=\\)"
PATH_PACKAGEPATH="$(PACKAGE_PATH:\=\\)"
+!endif
+
!if !defined(HAVE_MS_WINDOWS)
HAVE_MS_WINDOWS=1
!endif
!if !defined(HAVE_MS_WINDOWS)
HAVE_MS_WINDOWS=1
!endif
@@
-177,12
+184,17
@@
USE_UNION_TYPE=0
USE_MINITAR=$(HAVE_ZLIB)
!endif
!if !defined(USE_PORTABLE_DUMPER)
USE_MINITAR=$(HAVE_ZLIB)
!endif
!if !defined(USE_PORTABLE_DUMPER)
-USE_PORTABLE_DUMPER=0
+USE_PORTABLE_DUMPER=1
!endif
# A little bit of adhockery. Default to use system malloc and
# DLL version of the C runtime library when using portable
# dumping. These are the optimal settings.
!endif
# A little bit of adhockery. Default to use system malloc and
# DLL version of the C runtime library when using portable
# dumping. These are the optimal settings.
+#
+# NOTE: The various graphics libraries are generally compiled to use
+# MSVCRT.DLL (the same that we use in USE_CRTDLL, more or less), so using
+# this is a good thing.
+
!if !defined(USE_SYSTEM_MALLOC)
USE_SYSTEM_MALLOC=$(USE_PORTABLE_DUMPER)
!endif
!if !defined(USE_SYSTEM_MALLOC)
USE_SYSTEM_MALLOC=$(USE_PORTABLE_DUMPER)
!endif
@@
-341,6
+353,16
@@
DEPEND=0
! endif
!endif
! endif
!endif
+!if $(USE_INTEL_COMPILER)
+CC=icl
+# Use static library if possible
+INTEL_LIBS=libircmt.lib libmmt.lib
+# Debugging requires DLL version of libm
+!if $(DEBUG_XEMACS)
+INTEL_LIBS=libircmt.lib libmmd.lib
+!endif
+!endif
+
#
# Compiler command echo control. Define VERBOSECC=1 to get verbose compilation.
#
#
# Compiler command echo control. Define VERBOSECC=1 to get verbose compilation.
#
@@
-480,7
+502,7
@@
PATH_DEFINES=-DPATH_PREFIX=\"$(PATH_PREFIX)\"
# Generic variables
# Generic variables
-INCLUDES=$(X_INCLUDES) $(MSW_INCLUDES) -I$(NT)\inc -I$(SRC) -I$(LWLIB_SRCDIR)
+INCLUDES=$(X_INCLUDES) -I$(NT)\inc -I$(SRC) $(MSW_INCLUDES) -I$(LWLIB_SRCDIR)
DEFINES=$(X_DEFINES) $(MSW_DEFINES) $(MULE_DEFINES) $(UNION_DEFINES) \
$(DUMPER_DEFINES) $(MALLOC_DEFINES) $(QUICK_DEFINES) \
DEFINES=$(X_DEFINES) $(MSW_DEFINES) $(MULE_DEFINES) $(UNION_DEFINES) \
$(DUMPER_DEFINES) $(MALLOC_DEFINES) $(QUICK_DEFINES) \
@@
-536,8
+558,10
@@
CONFIG_VALUES = $(LIB_SRC)\config.values
!endif
!if [echo LISPDIR>>$(CONFIG_VALUES) && echo "$(MAKEDIR:\=\\)\\$(LISP:\=\\)">>$(CONFIG_VALUES)]
!endif
!endif
!if [echo LISPDIR>>$(CONFIG_VALUES) && echo "$(MAKEDIR:\=\\)\\$(LISP:\=\\)">>$(CONFIG_VALUES)]
!endif
+!if defined(PATH_PACKAGEPATH)
# PATH_PACKAGEPATH is already a quoted string.
# PATH_PACKAGEPATH is already a quoted string.
-!if [echo PACKAGE_PATH>>$(CONFIG_VALUES) && echo $(PATH_PACKAGEPATH)>>$(CONFIG_VALUES)]
+! if [echo PACKAGE_PATH>>$(CONFIG_VALUES) && echo $(PATH_PACKAGEPATH)>>$(CONFIG_VALUES)]
+! endif
!endif
# Inferred rule
!endif
# Inferred rule
@@
-560,7
+584,7
@@
$(LIB_SRC)/winclient.exe: $(LIB_SRC)/winclient.c
cd $(NT)
$(LIB_SRC)/minitar.exe : $(NT)/minitar.c
cd $(NT)
$(LIB_SRC)/minitar.exe : $(NT)/minitar.c
- $(CCV) $(CFLAGS_NO_LIB) -I"$(ZLIB_DIR)" $(LIB_SRC_DEFINES) -Fe$@ $** $(ZLIB_DIR)\zlib.lib -link -incremental:no
+ $(CCV) $(CFLAGS_NO_LIB) -I"$(ZLIB_DIR)" $(LIB_SRC_DEFINES) -MD -Fe$@ $** $(ZLIB_DIR)\zlib.lib -link -incremental:no
LIB_SRC_TOOLS = \
$(LIB_SRC)/etags.exe \
LIB_SRC_TOOLS = \
$(LIB_SRC)/etags.exe \
@@
-858,7
+882,8
@@
TEMACS_BROWSE=$(TEMACS_DIR)\temacs.bsc
TEMACS_SRC=$(SRC)
TEMACS_LIBS=$(LASTFILE) $(LWLIB) $(X_LIBS) $(MSW_LIBS) \
oldnames.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib \
TEMACS_SRC=$(SRC)
TEMACS_LIBS=$(LASTFILE) $(LWLIB) $(X_LIBS) $(MSW_LIBS) \
oldnames.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib \
- shell32.lib wsock32.lib winmm.lib winspool.lib ole32.lib uuid.lib $(LIBC_LIB)
+ shell32.lib wsock32.lib winmm.lib winspool.lib ole32.lib uuid.lib \
+ $(INTEL_LIBS) $(LIBC_LIB)
TEMACS_LFLAGS=-nologo $(LIBRARIES) $(DEBUG_FLAGS) -base:0x1000000\
-stack:0x800000 $(TEMACS_ENTRYPOINT) -subsystem:windows\
-pdb:$(TEMACS_DIR)\temacs.pdb -map:$(TEMACS_DIR)\temacs.map \
TEMACS_LFLAGS=-nologo $(LIBRARIES) $(DEBUG_FLAGS) -base:0x1000000\
-stack:0x800000 $(TEMACS_ENTRYPOINT) -subsystem:windows\
-pdb:$(TEMACS_DIR)\temacs.pdb -map:$(TEMACS_DIR)\temacs.map \
@@
-870,8
+895,10
@@
TEMACS_CPP_FLAGS=-c \
$(EMACS_BETA_VERSION) \
$(EMACS_PATCH_LEVEL) \
-DXEMACS_CODENAME=\"$(xemacs_codename:&=and)\" \
$(EMACS_BETA_VERSION) \
$(EMACS_PATCH_LEVEL) \
-DXEMACS_CODENAME=\"$(xemacs_codename:&=and)\" \
- -DEMACS_CONFIGURATION=\"$(EMACS_CONFIGURATION)\" \
- -DPATH_PACKAGEPATH=\"$(PATH_PACKAGEPATH)\"
+!if defined(PATH_PACKAGEPATH)
+ -DPATH_PACKAGEPATH=\"$(PATH_PACKAGEPATH)\" \
+!endif
+ -DEMACS_CONFIGURATION=\"$(EMACS_CONFIGURATION)\"
!if $(HAVE_X_WINDOWS)
TEMACS_X_OBJS=\
!if $(HAVE_X_WINDOWS)
TEMACS_X_OBJS=\
@@
-1175,7
+1202,7
@@
INFO_FILES= \
{$(MANDIR)}.texi{$(INFODIR)}.info:
cd $(MANDIR)
{$(MANDIR)}.texi{$(INFODIR)}.info:
cd $(MANDIR)
- $(MAKEINFO) $**
+ $(MAKEINFO) $(**F)
XEMACS_SRCS = \
$(MANDIR)\xemacs\abbrevs.texi \
XEMACS_SRCS = \
$(MANDIR)\xemacs\abbrevs.texi \
@@
-1358,7
+1385,11
@@
docfile :: $(DOC)
$(DOC): $(LIB_SRC)\make-docfile.exe $(DOC_SRC1) $(DOC_SRC2) $(DOC_SRC3) $(DOC_SRC4) $(DOC_SRC5) $(DOC_SRC6) $(DOC_SRC7) $(DOC_SRC8) $(DOC_SRC9) $(DOC_SRC10) $(DOC_SRC11)
if exist $(DOC) del $(DOC)
$(DOC): $(LIB_SRC)\make-docfile.exe $(DOC_SRC1) $(DOC_SRC2) $(DOC_SRC3) $(DOC_SRC4) $(DOC_SRC5) $(DOC_SRC6) $(DOC_SRC7) $(DOC_SRC8) $(DOC_SRC9) $(DOC_SRC10) $(DOC_SRC11)
if exist $(DOC) del $(DOC)
+!if defined(PACKAGE_PATH)
set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH)
set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH)
+!else
+ set EMACSBOOTSTRAPLOADPATH=$(LISP)
+!endif
set EMACSBOOTSTRAPMODULEPATH=$(MODULES)
$(TEMACS_BATCH) -l $(TEMACS_DIR)\..\lisp\make-docfile.el -- -o $(DOC) -i $(XEMACS)\site-packages
$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC1)
set EMACSBOOTSTRAPMODULEPATH=$(MODULES)
$(TEMACS_BATCH) -l $(TEMACS_DIR)\..\lisp\make-docfile.el -- -o $(DOC) -i $(XEMACS)\site-packages
$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC1)
@@
-1374,7
+1405,11
@@
$(DOC): $(LIB_SRC)\make-docfile.exe $(DOC_SRC1) $(DOC_SRC2) $(DOC_SRC3) $(DOC_SR
$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC11)
update-elc:
$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC11)
update-elc:
+!if defined(PACKAGE_PATH)
set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH)
set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH)
+!else
+ set EMACSBOOTSTRAPLOADPATH=$(LISP)
+!endif
set EMACSBOOTSTRAPMODULEPATH=$(MODULES)
$(TEMACS_BATCH) -l $(TEMACS_DIR)\..\lisp\update-elc.el
set EMACSBOOTSTRAPMODULEPATH=$(MODULES)
$(TEMACS_BATCH) -l $(TEMACS_DIR)\..\lisp\update-elc.el
@@
-1388,7
+1423,11
@@
$(TEMACS_DIR)\NEEDTODUMP :
$(PROGNAME) : $(TEMACS) $(TEMACS_DIR)\NEEDTODUMP
@echo >$(TEMACS_DIR)\SATISFIED
cd $(TEMACS_DIR)
$(PROGNAME) : $(TEMACS) $(TEMACS_DIR)\NEEDTODUMP
@echo >$(TEMACS_DIR)\SATISFIED
cd $(TEMACS_DIR)
+!if defined(PACKAGE_PATH)
set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH)
set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH)
+!else
+ set EMACSBOOTSTRAPLOADPATH=$(LISP)
+!endif
set EMACSBOOTSTRAPMODULEPATH=$(MODULES)
$(TEMACS_BATCH) -l $(TEMACS_DIR)\..\lisp\loadup.el dump
!if $(USE_PORTABLE_DUMPER)
set EMACSBOOTSTRAPMODULEPATH=$(MODULES)
$(TEMACS_BATCH) -l $(TEMACS_DIR)\..\lisp\loadup.el dump
!if $(USE_PORTABLE_DUMPER)
@@
-1430,6
+1469,7
@@
install: all
@xcopy /e /q $(XEMACS)\etc "$(INSTALL_DIR)\etc\"
@xcopy /e /q $(XEMACS)\info "$(INSTALL_DIR)\info\"
@xcopy /e /q $(XEMACS)\lisp "$(INSTALL_DIR)\lisp\"
@xcopy /e /q $(XEMACS)\etc "$(INSTALL_DIR)\etc\"
@xcopy /e /q $(XEMACS)\info "$(INSTALL_DIR)\info\"
@xcopy /e /q $(XEMACS)\lisp "$(INSTALL_DIR)\lisp\"
+!if defined(PACKAGE_PREFIX)
@echo Making skeleton package tree in $(PACKAGE_PREFIX) ...
@xcopy /q PlaceHolder "$(PACKAGE_PREFIX)\site-packages\"
$(DEL) "$(PACKAGE_PREFIX)\site-packages\PlaceHolder"
@echo Making skeleton package tree in $(PACKAGE_PREFIX) ...
@xcopy /q PlaceHolder "$(PACKAGE_PREFIX)\site-packages\"
$(DEL) "$(PACKAGE_PREFIX)\site-packages\PlaceHolder"
@@
-1437,6
+1477,7
@@
install: all
$(DEL) "$(PACKAGE_PREFIX)\mule-packages\PlaceHolder"
@xcopy /q PlaceHolder "$(PACKAGE_PREFIX)\xemacs-packages\"
$(DEL) "$(PACKAGE_PREFIX)\xemacs-packages\PlaceHolder"
$(DEL) "$(PACKAGE_PREFIX)\mule-packages\PlaceHolder"
@xcopy /q PlaceHolder "$(PACKAGE_PREFIX)\xemacs-packages\"
$(DEL) "$(PACKAGE_PREFIX)\xemacs-packages\PlaceHolder"
+!endif
$(DEL) PlaceHolder
mostlyclean:
$(DEL) PlaceHolder
mostlyclean:
@@
-1520,7
+1561,9
@@
XEmacs $(XEMACS_VERSION_STRING) $(xemacs_codename) configured for `$(EMACS_CONFI
Using compiler "$(CC) $(CFLAGS)".
!endif
Installing XEmacs in "$(INSTALL_DIR:\=\\)".
Using compiler "$(CC) $(CFLAGS)".
!endif
Installing XEmacs in "$(INSTALL_DIR:\=\\)".
+!if defined(PATH_PACKAGEPATH)
Package path is $(PATH_PACKAGEPATH).
Package path is $(PATH_PACKAGEPATH).
+!endif
!if $(INFODOCK)
Building InfoDock.
!endif
!if $(INFODOCK)
Building InfoDock.
!endif