# HG changeset patch
# User ben
# Date 1021373858 0
# Node ID 182d9d1c71a535c0410acf87f382c6049aa416c0
# Parent  bf645ed7cfe3953183f99293354e64ff5a515f14
[xemacs-hg @ 2002-05-14 10:57:37 by ben]
etags compilation changes


xemacs.mak: Increase the stack of etags to 0x800000 (8 MB), same as for XEmacs
	and enough to prevent regex crashes with complex multiline
	regexps. (More specifically, we reach the built-in failure limit before
	crashing the stack.  etags complains, but keeps on processing.)

diff -r bf645ed7cfe3 -r 182d9d1c71a5 nt/ChangeLog
--- a/nt/ChangeLog	Tue May 14 09:28:14 2002 +0000
+++ b/nt/ChangeLog	Tue May 14 10:57:38 2002 +0000
@@ -1,6 +1,14 @@
-2002-05-10  Adrian Aichner  <adrian@xemacs.org>
+2002-05-14  Ben Wing  <ben@xemacs.org>
 
-	* xemacs.mak (OPTIMIZED_BUILD): Default variable.
+	* xemacs.mak (CONFIG_VALUES):
+	* xemacs.mak (LINK_DEPENDENCY_ARGS): New.
+	* xemacs.mak (LINK_STANDARD_LIBRARY_ARGS): New.
+	* xemacs.mak (ETAGS_DEPS):
+	* xemacs.mak (LIB_SRC_TOOLS):
+	Increase the stack of etags to 0x800000 (8 MB), same as for XEmacs
+	and enough to prevent regex crashes with complex multiline
+	regexps. (More specifically, we reach the built-in failure limit before
+	crashing the stack.  etags complains, but keeps on processing.)
 
 2002-05-06  Jonathan Harris  <jonathan@xemacs.org>
 
diff -r bf645ed7cfe3 -r 182d9d1c71a5 nt/xemacs.mak
--- a/nt/xemacs.mak	Tue May 14 09:28:14 2002 +0000
+++ b/nt/xemacs.mak	Tue May 14 10:57:38 2002 +0000
@@ -556,20 +556,28 @@
 !if [echo PACKAGE_PATH>>$(CONFIG_VALUES) && echo $(PATH_PACKAGEPATH)>>$(CONFIG_VALUES)]
 !endif
 
+
+LINK_DEPENDENCY_ARGS = -Fe$@ -Fd$* $** -link -incremental:no
+LINK_STANDARD_LIBRARY_ARGS = setargv.obj user32.lib wsock32.lib
+
 # Inferred rule
 {$(LIB_SRC)}.c{$(LIB_SRC)}.exe :
 	cd $(LIB_SRC)
-	$(CCV) -I$(LIB_SRC) -I$(SRC) $(LIB_SRC_DEFINES) $(CFLAGS) -Fe$@ -Fd$* $** -link -incremental:no setargv.obj user32.lib wsock32.lib
+	$(CCV) -I$(LIB_SRC) -I$(SRC) $(LIB_SRC_DEFINES) $(CFLAGS) $(LINK_DEPENDENCY_ARGS) $(LINK_STANDARD_LIBRARY_ARGS)
 	cd $(NT)
 
 # Individual dependencies
 ETAGS_DEPS = $(LIB_SRC)/getopt.c $(LIB_SRC)/getopt1.c $(SRC)/regex.c
 $(LIB_SRC)/etags.exe : $(LIB_SRC)/etags.c $(ETAGS_DEPS)
+	cd $(LIB_SRC)
+	$(CCV) -I$(LIB_SRC) -I$(SRC) $(LIB_SRC_DEFINES) $(CFLAGS) $(LINK_DEPENDENCY_ARGS) -stack:0x800000 $(LINK_STANDARD_LIBRARY_ARGS)
+	cd $(NT)
+
 $(LIB_SRC)/movemail.exe : $(LIB_SRC)/movemail.c $(LIB_SRC)/pop.c $(ETAGS_DEPS)
 
 $(LIB_SRC)/minitar.exe : $(NT)/minitar.c
 	cd $(LIB_SRC)
-	$(CCV) -I"$(ZLIB_DIR)" $(LIB_SRC_DEFINES) $(CFLAGS_NO_LIB) -Fe$@ -Fd$* $** -link -incremental:no "$(ZLIB_DIR)\zlib.lib"
+	$(CCV) -I"$(ZLIB_DIR)" $(LIB_SRC_DEFINES) $(CFLAGS_NO_LIB) $(LINK_DEPENDENCY_ARGS) "$(ZLIB_DIR)\zlib.lib"
 	cd $(NT)
 
 LIB_SRC_TOOLS = \