fuankg 2004/04/09 13:00:18
Modified: jk/native2/server/apache2 NWGNUmakefile
jk/native/apache-2.0 NWGNUmakefile
Log:
fix problem with differences between Apache2 build systems of 2.0.x and 2.1.x
Revision Changes Path
1.4 +1 -7
jakarta-tomcat-connectors/jk/native2/server/apache2/NWGNUmakefile
Index: NWGNUmakefile
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/NWGNUmakefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NWGNUmakefile 6 Apr 2004 16:07:58 -0000 1.3
+++ NWGNUmakefile 9 Apr 2004 20:00:18 -0000 1.4
@@ -329,13 +329,7 @@
# Any specialized rules here
#
-$(OBJDIR)/%.o: $(JKCOMMON)/%.c $(OBJDIR)\cc.opt
- @echo Compiling $<
- $(CC) $(JKCOMMON)/$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
-
-$(OBJDIR)/%.o: $(JKJNI)/%.c $(OBJDIR)\cc.opt
- @echo Compiling $<
- $(CC) $(JKJNI)/$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+vpath %.c $(JKCOMMON);$(JKJNI)
$(OBJDIR)/version.inc: $(JKINCLUDE)/jk_global.h $(OBJDIR)
@echo Creating $@
1.2 +3 -5 jakarta-tomcat-connectors/jk/native/apache-2.0/NWGNUmakefile
Index: NWGNUmakefile
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/NWGNUmakefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NWGNUmakefile 22 Jan 2004 16:42:31 -0000 1.1
+++ NWGNUmakefile 9 Apr 2004 20:00:18 -0000 1.2
@@ -145,7 +145,7 @@
#
# If this is specified, it will override the default of 64K
#
-NLM_STACK_SIZE = 32768
+NLM_STACK_SIZE = 49152
#
@@ -269,7 +269,7 @@
# Paths must all use the '/' character
#
FILES_lib_objs = \
- $(EOLIST)
+ $(EOLIST)
#
# implement targets and dependancies (leave this section alone)
@@ -290,9 +290,7 @@
# Any specialized rules here
#
-$(OBJDIR)/%.o: $(JKCOMMON)/%.c $(OBJDIR)\cc.opt
- @echo Compiling $<
- $(CC) $(JKCOMMON)/$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+vpath %.c $(JKCOMMON)
$(OBJDIR)/version.inc: $(JKCOMMON)/jk_version.h $(OBJDIR)
@echo Creating $@
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
