Mercurial > hg > xemacs-beta

comparison nt/xemacs.mak @ 5118:e0db3c197671 ben-lisp-object

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge up to latest default branch, doesn't compile yet
author Ben Wing <ben@xemacs.org>
date Sat, 26 Dec 2009 21:18:49 -0600
parents c858892e4f2b
children 5274591ce707
comparison
equal deleted inserted replaced
5117:3742ea8250b5 5118:e0db3c197671
72 SRCROOT=$(MAKEROOT) 72 SRCROOT=$(MAKEROOT)
73 BLDROOT=$(MAKEROOT) 73 BLDROOT=$(MAKEROOT)
74 !endif 74 !endif
75 !endif 75 !endif
76 76
77 !if [copy $(SRCROOT)\version.sh.in $(SRCROOT)\version.sh]
78 !endif
79 !if exist($(SRCROOT)\.hg)
80 !if [hg identify >> $(SRCROOT)\version.sh]
81 !endif
82 !endif
83
77 # Program name and version 84 # Program name and version
78 !include "$(SRCROOT)\version.sh" 85 !include "$(SRCROOT)\version.sh"
79 86
80 ########################### Basic vars referring to directories, both in 87 ########################### Basic vars referring to directories, both in
81 ########################### the source and build trees. 88 ########################### the source and build trees.
133 !endif 140 !endif
134 !if !defined(HAVE_XFACE) 141 !if !defined(HAVE_XFACE)
135 HAVE_XFACE=0 142 HAVE_XFACE=0
136 !endif 143 !endif
137 !if !defined(HAVE_GIF) 144 !if !defined(HAVE_GIF)
138 HAVE_GIF=1 145 HAVE_GIF=0
139 !endif 146 !endif
140 !if !defined(HAVE_GTK) 147 !if !defined(HAVE_GTK)
141 HAVE_GTK=0 148 HAVE_GTK=0
142 !endif 149 !endif
143 !if !defined(HAVE_MENUBARS) 150 !if !defined(HAVE_MENUBARS)
193 DEBUG_XEMACS=0 200 DEBUG_XEMACS=0
194 !endif 201 !endif
195 !if !defined(SUPPORT_EDIT_AND_CONTINUE) 202 !if !defined(SUPPORT_EDIT_AND_CONTINUE)
196 SUPPORT_EDIT_AND_CONTINUE=0 203 SUPPORT_EDIT_AND_CONTINUE=0
197 !endif 204 !endif
205 !if !defined(BUILD_FOR_SETUP_KIT)
206 BUILD_FOR_SETUP_KIT=0
207 !endif
208
209 !if !$(BUILD_FOR_SETUP_KIT)
210 OK_TO_USE_MSVCRTD=1
211 !else
212 OK_TO_USE_MSVCRTD=0
213 !endif
198 214
199 !if !defined(ERROR_CHECK_ALL) 215 !if !defined(ERROR_CHECK_ALL)
200 !if "$(emacs_is_beta)" != "" 216 !if "$(emacs_is_beta)" != ""
201 ERROR_CHECK_ALL=1 217 ERROR_CHECK_ALL=1
202 !else 218 !else
213 !endif 229 !endif
214 230
215 !if !defined(USE_KKCC) 231 !if !defined(USE_KKCC)
216 USE_KKCC=0 232 USE_KKCC=0
217 !endif 233 !endif
218 !if !defined(MC_ALLOC) 234 !if !defined(NEW_GC)
219 MC_ALLOC=0 235 NEW_GC=0
220 !endif 236 !endif
221 !if !defined(USE_UNION_TYPE) 237 !if !defined(USE_UNION_TYPE)
222 USE_UNION_TYPE=0 238 USE_UNION_TYPE=0
223 !endif 239 !endif
224 !if !defined(QUICK_BUILD) 240 !if !defined(QUICK_BUILD)
409 INFODOCK_VERSION_STRING=$(infodock_major_version).$(infodock_minor_version).$(infodock_build_version) 425 INFODOCK_VERSION_STRING=$(infodock_major_version).$(infodock_minor_version).$(infodock_build_version)
410 PROGRAM_DEFINES=-DINFODOCK \ 426 PROGRAM_DEFINES=-DINFODOCK \
411 -DPATH_VERSION=\"$(INFODOCK_VERSION_STRING)\" \ 427 -DPATH_VERSION=\"$(INFODOCK_VERSION_STRING)\" \
412 -DPATH_PROGNAME=\"infodock\" \ 428 -DPATH_PROGNAME=\"infodock\" \
413 -DEMACS_PROGNAME=\"infodock\" \ 429 -DEMACS_PROGNAME=\"infodock\" \
430 -DSHEBANG_PROGNAME=\"infodock-script\" \
414 -DEMACS_VERSION=\"$(INFODOCK_VERSION_STRING)\" \ 431 -DEMACS_VERSION=\"$(INFODOCK_VERSION_STRING)\" \
415 -DINFODOCK_MAJOR_VERSION=$(infodock_major_version) \ 432 -DINFODOCK_MAJOR_VERSION=$(infodock_major_version) \
416 -DINFODOCK_MINOR_VERSION=$(infodock_minor_version) \ 433 -DINFODOCK_MINOR_VERSION=$(infodock_minor_version) \
417 -DINFODOCK_BUILD_VERSION=$(infodock_build_version) 434 -DINFODOCK_BUILD_VERSION=$(infodock_build_version)
418 !else 435 !else
426 !endif 443 !endif
427 PROGRAM_DEFINES= \ 444 PROGRAM_DEFINES= \
428 -DPATH_VERSION=\"$(XEMACS_VERSION_STRING)\" \ 445 -DPATH_VERSION=\"$(XEMACS_VERSION_STRING)\" \
429 -DPATH_PROGNAME=\"xemacs\" \ 446 -DPATH_PROGNAME=\"xemacs\" \
430 -DEMACS_VERSION=\"$(XEMACS_VERSION_STRING)\" \ 447 -DEMACS_VERSION=\"$(XEMACS_VERSION_STRING)\" \
431 -DEMACS_PROGNAME=\"xemacs\" 448 -DEMACS_PROGNAME=\"xemacs\" -DSHEBANG_PROGNAME=\"xemacs-script\"
432 !endif 449 !endif
433 450
434 ########################### Set up installation and package directories. 451 ########################### Set up installation and package directories.
435 452
436 !if !defined(INSTALL_DIR) 453 !if !defined(INSTALL_DIR)
438 INSTALL_DIR=c:\Program Files\Infodock\Infodock-$(INFODOCK_VERSION_STRING) 455 INSTALL_DIR=c:\Program Files\Infodock\Infodock-$(INFODOCK_VERSION_STRING)
439 ! else 456 ! else
440 INSTALL_DIR=c:\Program Files\XEmacs\XEmacs-$(XEMACS_VERSION_STRING) 457 INSTALL_DIR=c:\Program Files\XEmacs\XEmacs-$(XEMACS_VERSION_STRING)
441 ! endif 458 ! endif
442 !endif 459 !endif
443 !if !defined(PACKAGE_PATH) 460
444 ! if !defined(PACKAGE_PREFIX) 461 # If PACKAGE_PREFIX was defined, use it to generate a package path.
445 PACKAGE_PREFIX=c:\Program Files\XEmacs 462 !if defined(PACKAGE_PREFIX)
446 ! endif 463 PATH_LATE_PACKAGE_DIRECTORIES="$(PACKAGE_PREFIX:\=\\)"
447 ! if $(MULE) 464 !endif
448 PACKAGE_PATH=~\.xemacs;;$(PACKAGE_PREFIX)\site-packages;$(PACKAGE_PREFIX)\mule-packages;$(PACKAGE_PREFIX)\xemacs-packages
449 ! else
450 PACKAGE_PATH=~\.xemacs;;$(PACKAGE_PREFIX)\site-packages;$(PACKAGE_PREFIX)\xemacs-packages
451 ! endif
452 !endif
453 PATH_PACKAGEPATH="$(PACKAGE_PATH:\=\\)"
454 465
455 !if $(INFODOCK) 466 !if $(INFODOCK)
456 PATH_PREFIX=../.. 467 PATH_PREFIX=../..
457 !else 468 !else
458 PATH_PREFIX=.. 469 PATH_PREFIX="$(INSTALL_DIR)"
459 !endif 470 !endif
460 471
461 PATH_DEFINES=-DPATH_PREFIX=\"$(PATH_PREFIX)\" 472 PATH_DEFINES=-DPATH_PREFIX=\"$(PATH_PREFIX:\=\\)\"
462 473
463 !if $(SEPARATE_BUILD) 474 !if $(SEPARATE_BUILD)
464 PATH_DEFINES=$(PATH_DEFINES) -DPATH_LOADSEARCH=\"$(LISP:\=\\)\" -DPATH_DATA=\"$(ETC:\=\\)\" -DPATH_INFO=\"$(INFO:\=\\)\" 475 PATH_DEFINES=$(PATH_DEFINES) -DPATH_LOADSEARCH=\"$(LISP:\=\\)\" -DPATH_DATA=\"$(ETC:\=\\)\" -DPATH_INFO=\"$(INFO:\=\\)\"
465 !endif 476 !endif
466 477
535 OPT_INCLUDES=$(OPT_INCLUDES) -I"$(XPM_DIR)" -I"$(XPM_DIR)\lib" 546 OPT_INCLUDES=$(OPT_INCLUDES) -I"$(XPM_DIR)" -I"$(XPM_DIR)\lib"
536 OPT_LIBS=$(OPT_LIBS) "$(XPM_DIR)\lib\Xpm.lib" 547 OPT_LIBS=$(OPT_LIBS) "$(XPM_DIR)\lib\Xpm.lib"
537 !endif 548 !endif
538 !if $(HAVE_GIF) 549 !if $(HAVE_GIF)
539 OPT_DEFINES=$(OPT_DEFINES) -DHAVE_GIF 550 OPT_DEFINES=$(OPT_DEFINES) -DHAVE_GIF
540 OPT_OBJS=$(OPT_OBJS) $(OUTDIR)\dgif_lib.obj $(OUTDIR)\gif_io.obj 551 OPT_INCLUDES=$(OPT_INCLUDES) -I"$(GIF_DIR)\include"
552 OPT_LIBS=$(OPT_LIBS) "$(GIF_DIR)\lib\giflib.lib"
541 !endif 553 !endif
542 !if $(HAVE_PNG) 554 !if $(HAVE_PNG)
543 OPT_DEFINES=$(OPT_DEFINES) -DHAVE_PNG 555 OPT_DEFINES=$(OPT_DEFINES) -DHAVE_PNG
544 OPT_INCLUDES=$(OPT_INCLUDES) -I"$(PNG_DIR)" -I"$(ZLIB_DIR)" 556 OPT_INCLUDES=$(OPT_INCLUDES) -I"$(PNG_DIR)" -I"$(ZLIB_DIR)"
545 OPT_LIBS=$(OPT_LIBS) "$(PNG_DIR)\libpng.lib" "$(ZLIB_DIR)\zlib.lib" 557 OPT_LIBS=$(OPT_LIBS) "$(PNG_DIR)\libpng.lib" "$(ZLIB_DIR)\zlib.lib"
637 OPT_OBJS=$(OPT_OBJS) $(OUTDIR)\dumper.obj 649 OPT_OBJS=$(OPT_OBJS) $(OUTDIR)\dumper.obj
638 !else 650 !else
639 OPT_OBJS=$(OPT_OBJS) $(OUTDIR)\unexnt.obj 651 OPT_OBJS=$(OPT_OBJS) $(OUTDIR)\unexnt.obj
640 !endif 652 !endif
641 653
654 !if $(NEW_GC)
655 OPT_DEFINES=$(OPT_DEFINES) -DNEW_GC
656 OPT_OBJS=$(OPT_OBJS) $(OUTDIR)\vdb.obj $(OUTDIR)\vdb-win32.obj \
657 $(OUTDIR)\mc-alloc.obj
658 USE_KKCC=1
659 !endif
660
642 !if $(USE_KKCC) 661 !if $(USE_KKCC)
643 OPT_DEFINES=$(OPT_DEFINES) -DUSE_KKCC 662 OPT_DEFINES=$(OPT_DEFINES) -DUSE_KKCC
644 !endif 663 !endif
645 !if $(MC_ALLOC)
646 OPT_DEFINES=$(OPT_DEFINES) -DMC_ALLOC
647 OPT_OBJS=$(OPT_OBJS) $(OUTDIR)\mc-alloc.obj
648 !endif
649 664
650 !if $(USE_SYSTEM_MALLOC) 665 !if $(USE_SYSTEM_MALLOC)
651 OPT_DEFINES=$(OPT_DEFINES) -DSYSTEM_MALLOC 666 OPT_DEFINES=$(OPT_DEFINES) -DSYSTEM_MALLOC
652 !else 667 !else
653 OPT_DEFINES=$(OPT_DEFINES) -DGNU_MALLOC
654 OPT_OBJS=$(OPT_OBJS) $(OUTDIR)\free-hook.obj $(OUTDIR)\gmalloc.obj \ 668 OPT_OBJS=$(OPT_OBJS) $(OUTDIR)\free-hook.obj $(OUTDIR)\gmalloc.obj \
655 $(OUTDIR)\ntheap.obj $(OUTDIR)\vm-limit.obj 669 $(OUTDIR)\ntheap.obj $(OUTDIR)\vm-limit.obj
670 !endif
671
672 !if $(USE_INTEL_COMPILER)
673 CC=icl
674 # Use static library if possible
675 INTEL_LIBS=libircmt.lib libmmt.lib
676 # Debugging requires DLL version of libm
677 !if $(DEBUG_XEMACS)
678 INTEL_LIBS=libircmt.lib libmmd.lib
679 !endif
656 !endif 680 !endif
657 681
658 ########################### Process options related to compilation. 682 ########################### Process options related to compilation.
659 683
660 # 684 #
673 # VC 7 sets opt:noref automatically with -debug. VC 8 apparently doesn't 697 # VC 7 sets opt:noref automatically with -debug. VC 8 apparently doesn't
674 # do this, and then complains if you try to use edit-and-continue without 698 # do this, and then complains if you try to use edit-and-continue without
675 # giving it. 699 # giving it.
676 DEBUG_FLAG_LINK_DEBUG=-debug -opt:noref 700 DEBUG_FLAG_LINK_DEBUG=-debug -opt:noref
677 # This turns on additional run-time checking 701 # This turns on additional run-time checking
678 # For some reason it causes spawning of make-docfile to crash in VC 7 702 # For some reason it causes spawning of make-docfile to crash in VC 7 and VC 8
679 DEBUG_FLAG_COMPILE_DEBUG=-RTC1 703 # DEBUG_FLAG_COMPILE_DEBUG=-RTC1
680 ! else 704 ! else
681 DEBUG_FLAG_LINK_DEBUG=-debug:full 705 DEBUG_FLAG_LINK_DEBUG=-debug:full
682 DEBUG_FLAG_COMPILE_DEBUG= 706 DEBUG_FLAG_COMPILE_DEBUG=
683 ! endif 707 ! endif
684 708
712 BROWSERFLAGS= 736 BROWSERFLAGS=
713 737
714 !endif 738 !endif
715 739
716 !if $(USE_CRTDLL) 740 !if $(USE_CRTDLL)
717 ! if $(DEBUG_XEMACS) 741 ! if $(DEBUG_XEMACS) && "$(OK_TO_USE_MSVCRTD)" == "1"
718 C_LIBFLAG=-MDd 742 C_LIBFLAG=-MDd
719 LIBC_LIB=msvcrtd.lib 743 LIBC_LIB=msvcrtd.lib
720 ! else 744 ! else
721 C_LIBFLAG=-MD 745 C_LIBFLAG=-MD
722 LIBC_LIB=msvcrt.lib 746 LIBC_LIB=msvcrt.lib
723 ! endif 747 ! endif
724 !else 748 !else
725 C_LIBFLAG=-ML 749 C_LIBFLAG=-ML
726 LIBC_LIB=libc.lib 750 LIBC_LIB=libc.lib
727 !endif 751 !endif
728 752
798 -DEMACS_MAJOR_VERSION=$(emacs_major_version) \ 822 -DEMACS_MAJOR_VERSION=$(emacs_major_version) \
799 -DEMACS_MINOR_VERSION=$(emacs_minor_version) \ 823 -DEMACS_MINOR_VERSION=$(emacs_minor_version) \
800 $(EMACS_BETA_VERSION) $(EMACS_PATCH_LEVEL) \ 824 $(EMACS_BETA_VERSION) $(EMACS_PATCH_LEVEL) \
801 -DXEMACS_CODENAME=\"$(xemacs_codename:&=and)\" \ 825 -DXEMACS_CODENAME=\"$(xemacs_codename:&=and)\" \
802 !if defined(xemacs_extra_name) 826 !if defined(xemacs_extra_name)
803 -DXEMACS_EXTRA_NAME=\"$(xemacs_extra_name:"=)\" \ 827 -DXEMACS_EXTRA_NAME=\""$(xemacs_extra_name:"=)"\" \
804 !endif 828 !endif
805 -DEMACS_CONFIGURATION=\"$(EMACS_CONFIGURATION)\" \ 829 !if defined(PATH_LATE_PACKAGE_DIRECTORIES)
806 -DPATH_PACKAGEPATH=\"$(PATH_PACKAGEPATH)\" 830 -DPATH_LATE_PACKAGE_DIRECTORIES=\"$(PATH_LATE_PACKAGE_DIRECTORIES)\" \
831 !endif
832 -DEMACS_CONFIGURATION=\"$(EMACS_CONFIGURATION)\"
807 TEMACS_CPP_FLAGS=$(CFLAGS) $(TEMACS_CPP_FLAGS_NO_CFLAGS) 833 TEMACS_CPP_FLAGS=$(CFLAGS) $(TEMACS_CPP_FLAGS_NO_CFLAGS)
808 TEMACS_CPP_CDECL_FLAGS=$(CFLAGS_CDECL) $(TEMACS_CPP_FLAGS_NO_CFLAGS) 834 TEMACS_CPP_CDECL_FLAGS=$(CFLAGS_CDECL) $(TEMACS_CPP_FLAGS_NO_CFLAGS)
809 835
810 ########################### Determine XEmacs object files. 836 ########################### Determine XEmacs object files.
811 837
846 $(OUTDIR)\filemode.obj \ 872 $(OUTDIR)\filemode.obj \
847 $(OUTDIR)\floatfns.obj \ 873 $(OUTDIR)\floatfns.obj \
848 $(OUTDIR)\fns.obj \ 874 $(OUTDIR)\fns.obj \
849 $(OUTDIR)\font-lock.obj \ 875 $(OUTDIR)\font-lock.obj \
850 $(OUTDIR)\frame.obj \ 876 $(OUTDIR)\frame.obj \
877 $(OUTDIR)\gc.obj \
851 $(OUTDIR)\general.obj \ 878 $(OUTDIR)\general.obj \
852 $(OUTDIR)\getloadavg.obj \ 879 $(OUTDIR)\getloadavg.obj \
853 $(OUTDIR)\glyphs.obj \ 880 $(OUTDIR)\glyphs.obj \
854 $(OUTDIR)\glyphs-eimage.obj \ 881 $(OUTDIR)\glyphs-eimage.obj \
855 $(OUTDIR)\glyphs-shared.obj \ 882 $(OUTDIR)\glyphs-shared.obj \
1061 !endif 1088 !endif
1062 !if [echo CPPFLAGS>>$(CONFIG_VALUES) && echo "$(CPPFLAGS:\=\\)">>$(CONFIG_VALUES)] 1089 !if [echo CPPFLAGS>>$(CONFIG_VALUES) && echo "$(CPPFLAGS:\=\\)">>$(CONFIG_VALUES)]
1063 !endif 1090 !endif
1064 !if [echo LISPDIR>>$(CONFIG_VALUES) && echo "\\$(LISP:\=\\)">>$(CONFIG_VALUES)] 1091 !if [echo LISPDIR>>$(CONFIG_VALUES) && echo "\\$(LISP:\=\\)">>$(CONFIG_VALUES)]
1065 !endif 1092 !endif
1066 # PATH_PACKAGEPATH is already a quoted string. 1093 !if defined(PATH_LATE_PACKAGE_DIRECTORIES)
1067 !if [echo PACKAGE_PATH>>$(CONFIG_VALUES) && echo $(PATH_PACKAGEPATH)>>$(CONFIG_VALUES)] 1094 # PATH_LATE_PACKAGE_DIRECTORIES is already a quoted string.
1095 ! if [echo PATH_LATE_PACKAGE_DIRECTORIES>>$(CONFIG_VALUES) && echo $(PATH_LATE_PACKAGE_DIRECTORIES)>>$(CONFIG_VALUES)]
1096 ! endif
1068 !endif 1097 !endif
1069 1098
1070 LINK_DEPENDENCY_ARGS = -Fe$@ -Fd$* $** -link $(DEBUG_FLAGS_LINK) 1099 LINK_DEPENDENCY_ARGS = -Fe$@ -Fd$* $** -link $(DEBUG_FLAGS_LINK)
1071 LINK_STANDARD_LIBRARY_ARGS = setargv.obj user32.lib wsock32.lib 1100 LINK_STANDARD_LIBRARY_ARGS = setargv.obj user32.lib wsock32.lib
1072 1101
1073 LIB_SRC_CFLAGS = $(CFLAGS) -I$(LIB_SRC) -I$(SRC) $(LIB_SRC_DEFINES) 1102 LIB_SRC_CFLAGS = $(CFLAGS) -I$(LIB_SRC) -I$(SRC) $(LIB_SRC_DEFINES)
1074 1103
1075 # Inferred rule 1104 # Inferred rule
1076 {$(LIB_SRC)}.c{$(BLDLIB_SRC)}.exe : 1105 {$(LIB_SRC)}.c{$(BLDLIB_SRC)}.exe :
1077 $(CCV) $(LIB_SRC_CFLAGS) $(LINK_DEPENDENCY_ARGS) $(LINK_STANDARD_LIBRARY_ARGS) 1106 $(CCV) $(LIB_SRC_CFLAGS) $(LINK_DEPENDENCY_ARGS) $(LINK_STANDARD_LIBRARY_ARGS)
1107 # If we're using Visual Studio 2005 or greater,
1108 # embed the manifest into the executable.
1109 !if $(MSC_VER) >= 1400
1110 mt -manifest $@.manifest -outputresource:$@;1
1111 !endif
1078 1112
1079 # Individual dependencies 1113 # Individual dependencies
1080 ETAGS_DEPS = $(LIB_SRC)/getopt.c $(LIB_SRC)/getopt1.c $(SRC)/regex.c 1114 ETAGS_DEPS = $(LIB_SRC)/getopt.c $(LIB_SRC)/getopt1.c $(SRC)/regex.c
1081 $(BLDLIB_SRC)/etags.exe : $(LIB_SRC)/etags.c $(ETAGS_DEPS) 1115 $(BLDLIB_SRC)/etags.exe : $(LIB_SRC)/etags.c $(ETAGS_DEPS)
1082 $(CCV) $(LIB_SRC_CFLAGS) $(LINK_DEPENDENCY_ARGS) -stack:0x800000 $(LINK_STANDARD_LIBRARY_ARGS) 1116 $(CCV) $(LIB_SRC_CFLAGS) $(LINK_DEPENDENCY_ARGS) -stack:0x800000 $(LINK_STANDARD_LIBRARY_ARGS)
1117 # If we're using Visual Studio 2005 or greater,
1118 # embed the manifest into the executable.
1119 !if $(MSC_VER) >= 1400
1120 mt -manifest $@.manifest -outputresource:$@;1
1121 !endif
1083 1122
1084 $(BLDLIB_SRC)/movemail.exe : $(LIB_SRC)/movemail.c $(LIB_SRC)/pop.c $(ETAGS_DEPS) 1123 $(BLDLIB_SRC)/movemail.exe : $(LIB_SRC)/movemail.c $(LIB_SRC)/pop.c $(ETAGS_DEPS)
1085 1124
1086 # Minitar uses zlib so just use cdecl to simplify things 1125 # Minitar uses zlib so just use cdecl to simplify things
1087 $(BLDLIB_SRC)/minitar.exe : $(NT)/minitar.c 1126 $(BLDLIB_SRC)/minitar.exe : $(NT)/minitar.c
1088 $(CCV) -I$(SRC) -I"$(ZLIB_DIR)" $(LIB_SRC_DEFINES) $(CFLAGS_CDECL_NO_LIB) -MD $(LINK_DEPENDENCY_ARGS) "$(ZLIB_DIR)\zlib.lib" 1127 $(CCV) -I$(SRC) -I"$(ZLIB_DIR)" $(LIB_SRC_DEFINES) $(CFLAGS_CDECL_NO_LIB) -MD $(LINK_DEPENDENCY_ARGS) "$(ZLIB_DIR)\zlib.lib"
1128 # If we're using Visual Studio 2005 or greater,
1129 # embed the manifest into the executable.
1130 !if $(MSC_VER) >= 1400
1131 mt -manifest $@.manifest -outputresource:$@;1
1132 !endif
1089 1133
1090 LIB_SRC_TOOLS = \ 1134 LIB_SRC_TOOLS = \
1091 $(BLDLIB_SRC)/etags.exe \ 1135 $(BLDLIB_SRC)/etags.exe \
1092 $(BLDLIB_SRC)/hexl.exe \ 1136 $(BLDLIB_SRC)/hexl.exe \
1093 $(BLDLIB_SRC)/i.exe \ 1137 $(BLDLIB_SRC)/i.exe \
1094 $(BLDLIB_SRC)/winclient.exe \ 1138 $(BLDLIB_SRC)/winclient.exe \
1095 $(BLDLIB_SRC)/make-docfile.exe \ 1139 $(BLDLIB_SRC)/make-docfile.exe \
1096 $(BLDLIB_SRC)/mmencode.exe \ 1140 $(BLDLIB_SRC)/mmencode.exe \
1097 $(BLDLIB_SRC)/movemail.exe \ 1141 $(BLDLIB_SRC)/movemail.exe \
1098 $(BLDLIB_SRC)/sorted-doc.exe \ 1142 $(BLDLIB_SRC)/sorted-doc.exe
1099 $(BLDLIB_SRC)/wakeup.exe
1100 !if $(USE_MINITAR) 1143 !if $(USE_MINITAR)
1101 LIB_SRC_TOOLS = \ 1144 LIB_SRC_TOOLS = \
1102 $(LIB_SRC_TOOLS) \ 1145 $(LIB_SRC_TOOLS) \
1103 $(BLDLIB_SRC)/minitar.exe 1146 $(BLDLIB_SRC)/minitar.exe
1104 !endif 1147 !endif
1135 !endif 1178 !endif
1136 !if $(CPLUSPLUS_COMPILE) 1179 !if $(CPLUSPLUS_COMPILE)
1137 Compiling as C++. 1180 Compiling as C++.
1138 !endif 1181 !endif
1139 Installing XEmacs in "$(INSTALL_DIR:\=\\)". 1182 Installing XEmacs in "$(INSTALL_DIR:\=\\)".
1140 Package path is $(PATH_PACKAGEPATH). 1183 !if defined(PATH_LATE_PACKAGE_DIRECTORIES)
1184 Package path is $(PATH_LATE_PACKAGE_DIRECTORIES).
1185 !endif
1141 !if $(INFODOCK) 1186 !if $(INFODOCK)
1142 Building InfoDock. 1187 Building InfoDock.
1143 !endif 1188 !endif
1144 !if $(HAVE_MS_WINDOWS) 1189 !if $(HAVE_MS_WINDOWS)
1145 Compiling in support for Microsoft Windows native GUI. 1190 Compiling in support for Microsoft Windows native GUI.
1252 !endif 1297 !endif
1253 !if $(QUICK_BUILD) 1298 !if $(QUICK_BUILD)
1254 Disabling non-essential build actions. Use with care! 1299 Disabling non-essential build actions. Use with care!
1255 !endif 1300 !endif
1256 !if $(USE_KKCC) 1301 !if $(USE_KKCC)
1257 Using new experimental GC algorithms. 1302 Using new experimental GC mark algorithms.
1258 !endif 1303 !endif
1259 !if $(MC_ALLOC) 1304 !if $(NEW_GC)
1260 Using new experimental allocator. 1305 Using new experimental incremental garbage collector and new allocator.
1261 !endif 1306 !endif
1262 <<NOKEEP 1307 <<NOKEEP
1263 @echo -------------------------------------------------------------------- 1308 @echo --------------------------------------------------------------------
1264 @type $(BLDROOT)\Installation 1309 @type $(BLDROOT)\Installation
1265 @echo -------------------------------------------------------------------- 1310 @echo --------------------------------------------------------------------
1278 1323
1279 TEMACS_BROWSE=$(BLDSRC)\temacs.bsc 1324 TEMACS_BROWSE=$(BLDSRC)\temacs.bsc
1280 TEMACS_LIBS=$(LASTFILE) $(OPT_LIBS) \ 1325 TEMACS_LIBS=$(LASTFILE) $(OPT_LIBS) \
1281 oldnames.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib \ 1326 oldnames.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib \
1282 shell32.lib wsock32.lib netapi32.lib winmm.lib winspool.lib ole32.lib \ 1327 shell32.lib wsock32.lib netapi32.lib winmm.lib winspool.lib ole32.lib \
1283 mpr.lib uuid.lib imm32.lib $(LIBC_LIB) 1328 mpr.lib uuid.lib imm32.lib $(INTEL_LIBS) $(LIBC_LIB)
1284 TEMACS_COMMON_LFLAGS=-nologo $(LIBRARIES) $(DEBUG_FLAGS_LINK) \ 1329 TEMACS_COMMON_LFLAGS=-nologo $(LIBRARIES) $(DEBUG_FLAGS_LINK) \
1285 -base:0x1000000 -stack:0x800000 $(TEMACS_ENTRYPOINT) -subsystem:windows \ 1330 -base:0x1000000 -stack:0x800000 $(TEMACS_ENTRYPOINT) -subsystem:windows \
1286 -heap:0x00100000 -nodefaultlib $(PROFILE_FLAGS) setargv.obj 1331 -heap:0x00100000 -nodefaultlib $(PROFILE_FLAGS) setargv.obj
1287 TEMACS_LFLAGS=$(TEMACS_COMMON_LFLAGS) \ 1332 TEMACS_LFLAGS=$(TEMACS_COMMON_LFLAGS) \
1288 -pdb:$(BLDSRC)\temacs.pdb -map:$(BLDSRC)\temacs.map 1333 -pdb:$(BLDSRC)\temacs.pdb -map:$(BLDSRC)\temacs.map
1341 !else 1386 !else
1342 TEMACS_DUMP_DEP = $(OUTDIR)\temacs.res 1387 TEMACS_DUMP_DEP = $(OUTDIR)\temacs.res
1343 !endif 1388 !endif
1344 1389
1345 $(RAW_EXE): $(TEMACS_OBJS) $(LASTFILE) $(TEMACS_DUMP_DEP) 1390 $(RAW_EXE): $(TEMACS_OBJS) $(LASTFILE) $(TEMACS_DUMP_DEP)
1346 @echo link $(TEMACS_LFLAGS) -out:$@ $(TEMACS_OBJS) $(TEMACS_DUMP_DEP) $(TEMACS_LIBS) 1391 # Command line too long for some Windows installation:
1392 # @echo link $(TEMACS_LFLAGS) -out:$@ $(TEMACS_OBJS) $(TEMACS_DUMP_DEP) $(TEMACS_LIBS)
1347 link.exe @<< 1393 link.exe @<<
1348 $(TEMACS_LFLAGS) -out:$@ $(TEMACS_OBJS) $(TEMACS_DUMP_DEP) $(TEMACS_LIBS) 1394 $(TEMACS_LFLAGS) -out:$@ $(TEMACS_OBJS) $(TEMACS_DUMP_DEP) $(TEMACS_LIBS)
1349 << 1395 <<
1350 1396
1351 !if $(DEBUG_XEMACS) 1397 !if $(DEBUG_XEMACS)
1403 # data which needs to be writable. This avoids having to copy it. 1449 # data which needs to be writable. This avoids having to copy it.
1404 link.exe @<< 1450 link.exe @<<
1405 $(XEMACS_LFLAGS) -section:.rsrc,rw -out:$(BLDSRC)\xemacs.exe $(TEMACS_OBJS) $(OUTDIR)\xemacs.res $(TEMACS_LIBS) $(OUTDIR)\dump-id.obj 1451 $(XEMACS_LFLAGS) -section:.rsrc,rw -out:$(BLDSRC)\xemacs.exe $(TEMACS_OBJS) $(OUTDIR)\xemacs.res $(TEMACS_LIBS) $(OUTDIR)\dump-id.obj
1406 << 1452 <<
1407 -$(DEL) $(BLDSRC)\xemacs.dmp 1453 -$(DEL) $(BLDSRC)\xemacs.dmp
1454 # If we're using Visual Studio 2005 or greater,
1455 # embed the manifest into the executable.
1456 !if $(MSC_VER) >= 1400
1457 mt -manifest $@.manifest -outputresource:$@;1
1458 !endif
1459
1408 !endif 1460 !endif
1409 1461
1410 ## (6) Update the remaining .elc's, post-dumping 1462 ## (6) Update the remaining .elc's, post-dumping
1411 1463
1412 update-elc-2: $(DUMP_TARGET) 1464 update-elc-2: $(DUMP_TARGET)
1435 !endif 1487 !endif
1436 1488
1437 MANDIR = $(SRCROOT)\man 1489 MANDIR = $(SRCROOT)\man
1438 INFODIR = $(SRCROOT)\info 1490 INFODIR = $(SRCROOT)\info
1439 INFO_FILES= \ 1491 INFO_FILES= \
1492 $(INFODIR)\beta.info \
1440 $(INFODIR)\cl.info \ 1493 $(INFODIR)\cl.info \
1441 $(INFODIR)\custom.info \ 1494 $(INFODIR)\custom.info \
1442 $(INFODIR)\emodules.info \ 1495 $(INFODIR)\emodules.info \
1443 $(INFODIR)\external-widget.info \ 1496 $(INFODIR)\external-widget.info \
1444 $(INFODIR)\info.info \ 1497 $(INFODIR)\info.info \
1498 $(INFODIR)\internals.info \
1499 $(INFODIR)\lispref.info \
1500 $(INFODIR)\new-users-guide.info \
1445 $(INFODIR)\standards.info \ 1501 $(INFODIR)\standards.info \
1446 $(INFODIR)\term.info \ 1502 $(INFODIR)\term.info \
1447 $(INFODIR)\termcap.info \ 1503 $(INFODIR)\termcap.info \
1448 $(INFODIR)\texinfo.info \ 1504 $(INFODIR)\texinfo.info \
1449 $(INFODIR)\widget.info \ 1505 $(INFODIR)\widget.info \
1450 $(INFODIR)\xemacs-faq.info \ 1506 $(INFODIR)\xemacs-faq.info \
1451 $(INFODIR)\xemacs.info \ 1507 $(INFODIR)\xemacs.info
1452 $(INFODIR)\lispref.info \
1453 $(INFODIR)\new-users-guide.info \
1454 $(INFODIR)\internals.info
1455 1508
1456 {$(MANDIR)}.texi{$(INFODIR)}.info: 1509 {$(MANDIR)}.texi{$(INFODIR)}.info:
1457 cd $(MANDIR) 1510 cd $(MANDIR)
1458 $(MAKEINFO) $(**F) 1511 $(MAKEINFO) $(**F)
1459 1512
1547 $(MANDIR)\lispref\mouse.texi \ 1600 $(MANDIR)\lispref\mouse.texi \
1548 $(MANDIR)\lispref\mule.texi \ 1601 $(MANDIR)\lispref\mule.texi \
1549 $(MANDIR)\lispref\numbers.texi \ 1602 $(MANDIR)\lispref\numbers.texi \
1550 $(MANDIR)\lispref\objects.texi \ 1603 $(MANDIR)\lispref\objects.texi \
1551 $(MANDIR)\lispref\os.texi \ 1604 $(MANDIR)\lispref\os.texi \
1605 $(MANDIR)\lispref\packaging.texi \
1552 $(MANDIR)\lispref\positions.texi \ 1606 $(MANDIR)\lispref\positions.texi \
1553 $(MANDIR)\lispref\processes.texi \ 1607 $(MANDIR)\lispref\processes.texi \
1554 $(MANDIR)\lispref\range-tables.texi \ 1608 $(MANDIR)\lispref\range-tables.texi \
1555 $(MANDIR)\lispref\scrollbars.texi \ 1609 $(MANDIR)\lispref\scrollbars.texi \
1556 $(MANDIR)\lispref\searching.texi \ 1610 $(MANDIR)\lispref\searching.texi \
1666 # APA: This is not good enough! It copies all .#* CVS files 1720 # APA: This is not good enough! It copies all .#* CVS files
1667 # and the CVS directory too! 1721 # and the CVS directory too!
1668 @$(COPYDIR) $(SRCROOT)\etc "$(INSTALL_DIR)\etc\" 1722 @$(COPYDIR) $(SRCROOT)\etc "$(INSTALL_DIR)\etc\"
1669 @$(COPYDIR) $(SRCROOT)\info "$(INSTALL_DIR)\info\" 1723 @$(COPYDIR) $(SRCROOT)\info "$(INSTALL_DIR)\info\"
1670 @$(COPYDIR) $(SRCROOT)\lisp "$(INSTALL_DIR)\lisp\" 1724 @$(COPYDIR) $(SRCROOT)\lisp "$(INSTALL_DIR)\lisp\"
1725 !if defined(PACKAGE_PREFIX)
1671 @echo Making skeleton package tree in $(PACKAGE_PREFIX) ... 1726 @echo Making skeleton package tree in $(PACKAGE_PREFIX) ...
1672 @$(COPY) PlaceHolder "$(PACKAGE_PREFIX)\site-packages\" 1727 @$(COPY) PlaceHolder "$(PACKAGE_PREFIX)\site-packages\"
1673 -$(DEL) "$(PACKAGE_PREFIX)\site-packages\PlaceHolder" 1728 -$(DEL) "$(PACKAGE_PREFIX)\site-packages\PlaceHolder"
1674 @$(COPY) PlaceHolder "$(PACKAGE_PREFIX)\mule-packages\" 1729 @$(COPY) PlaceHolder "$(PACKAGE_PREFIX)\mule-packages\"
1675 -$(DEL) "$(PACKAGE_PREFIX)\mule-packages\PlaceHolder" 1730 -$(DEL) "$(PACKAGE_PREFIX)\mule-packages\PlaceHolder"
1676 @$(COPY) PlaceHolder "$(PACKAGE_PREFIX)\xemacs-packages\" 1731 @$(COPY) PlaceHolder "$(PACKAGE_PREFIX)\xemacs-packages\"
1677 -$(DEL) "$(PACKAGE_PREFIX)\xemacs-packages\PlaceHolder" 1732 -$(DEL) "$(PACKAGE_PREFIX)\xemacs-packages\PlaceHolder"
1733 !endif
1678 -$(DEL) PlaceHolder 1734 -$(DEL) PlaceHolder
1679 1735
1680 ########################### clean 1736 ########################### clean
1681 1737
1682 mostlyclean: 1738 mostlyclean: