# HG changeset patch # User ben # Date 1106877287 0 # Node ID c634f2d588e83d478824249bdc36bfb9b0ed6517 # Parent f981d2fdd8807e3a6207d4bd225f58b06f845a35 [xemacs-hg @ 2005-01-28 01:54:47 by ben] Fixes to xemacs.mak xemacs.mak: Use filename only when calling makeinfo, or it chokes on index generation. xemacs.mak: Generate separate .pdb and .map files for temacs/xemacs; may make profiling possible. diff -r f981d2fdd880 -r c634f2d588e8 nt/ChangeLog --- a/nt/ChangeLog Fri Jan 28 00:32:20 2005 +0000 +++ b/nt/ChangeLog Fri Jan 28 01:54:47 2005 +0000 @@ -1,3 +1,14 @@ +2005-01-27 Ben Wing + + * xemacs.mak ({$(MANDIR)}.texi{$(INFODIR)}.info): + Use filename only when calling makeinfo, or it chokes on index + generation. + + * xemacs.mak (TEMACS_COMMON_LFLAGS): + * xemacs.mak ( $(XEMACS_LFLAGS) -section): + Generate separate .pdb and .map files for temacs/xemacs; may + make profiling possible. + 2005-01-24 Ben Wing * config.inc.samp: diff -r f981d2fdd880 -r c634f2d588e8 nt/xemacs.mak --- a/nt/xemacs.mak Fri Jan 28 00:32:20 2005 +0000 +++ b/nt/xemacs.mak Fri Jan 28 01:54:47 2005 +0000 @@ -962,7 +962,7 @@ {$(MANDIR)}.texi{$(INFODIR)}.info: cd $(MANDIR) - $(MAKEINFO) $** + $(MAKEINFO) $(**F) XEMACS_SRCS = \ $(MANDIR)\xemacs\abbrevs.texi \ @@ -1263,10 +1263,13 @@ oldnames.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib \ shell32.lib wsock32.lib netapi32.lib winmm.lib winspool.lib ole32.lib \ mpr.lib uuid.lib imm32.lib $(LIBC_LIB) -TEMACS_LFLAGS=-nologo $(LIBRARIES) $(DEBUG_FLAGS_LINK) \ +TEMACS_COMMON_LFLAGS=-nologo $(LIBRARIES) $(DEBUG_FLAGS_LINK) \ -base:0x1000000 -stack:0x800000 $(TEMACS_ENTRYPOINT) -subsystem:windows \ - -pdb:$(BLDSRC)\temacs.pdb -map:$(BLDSRC)\temacs.map \ -heap:0x00100000 -nodefaultlib $(PROFILE_FLAGS) setargv.obj +TEMACS_LFLAGS=$(TEMACS_COMMON_LFLAGS) \ + -pdb:$(BLDSRC)\temacs.pdb -map:$(BLDSRC)\temacs.map +XEMACS_LFLAGS=$(TEMACS_COMMON_LFLAGS) \ + -pdb:$(BLDSRC)\xemacs.pdb -map:$(BLDSRC)\xemacs.map ########################### Definitions for running temacs.exe/xemacs.exe @@ -1380,7 +1383,7 @@ # Make the resource section read/write since almost all of it is the dump # data which needs to be writable. This avoids having to copy it. link.exe @<< - $(TEMACS_LFLAGS) -section:.rsrc,rw -out:$(BLDSRC)\xemacs.exe $(TEMACS_OBJS) $(OUTDIR)\xemacs.res $(TEMACS_LIBS) $(OUTDIR)\dump-id.obj + $(XEMACS_LFLAGS) -section:.rsrc,rw -out:$(BLDSRC)\xemacs.exe $(TEMACS_OBJS) $(OUTDIR)\xemacs.res $(TEMACS_LIBS) $(OUTDIR)\dump-id.obj << -$(DEL) $(BLDSRC)\xemacs.dmp !endif