tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r562242 - in /tomcat/connectors/trunk/jk/native/netscape: Makefile.linux Makefile.solaris
Date Thu, 02 Aug 2007 20:27:04 GMT
Author: rjung
Date: Thu Aug  2 13:27:03 2007
New Revision: 562242

URL: http://svn.apache.org/viewvc?view=rev&rev=562242
Log:
Another round of Makefile changes for nsapi (Linux/Solaris).

Modified:
    tomcat/connectors/trunk/jk/native/netscape/Makefile.linux
    tomcat/connectors/trunk/jk/native/netscape/Makefile.solaris

Modified: tomcat/connectors/trunk/jk/native/netscape/Makefile.linux
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/netscape/Makefile.linux?view=diff&rev=562242&r1=562241&r2=562242
==============================================================================
--- tomcat/connectors/trunk/jk/native/netscape/Makefile.linux (original)
+++ tomcat/connectors/trunk/jk/native/netscape/Makefile.linux Thu Aug  2 13:27:03 2007
@@ -6,12 +6,14 @@
 #   2. statically linking with libgcc
 #   3. Adjusting LD_LIBRARY_PATH to grab libgcc_s
 CC=gcc
-# For 64 Bit builds, add "-m64" to CFLAGS and LD_SHAREDCMD
-CFLAGS=-fPIC
-LD_SHAREDCMD=$(CC) -shared -lthread
+# For 64 Bit builds, add "-m64" to EXTRA_CFLAGS
+EXTRA_CFLAGS=-fPIC -pthread
+LDFLAGS=-shared
 
-CC_CMD=$(CC) $(CFLAGS) -DNET_SSL -DSOLARIS -D_REENTRANT -DXP_UNIX \
-	-DMCC_HTTPD -DSPAPI20
+CC_CMD=$(CC) $(CFLAGS) $(EXTRA_CFLAGS) \
+	-DNET_SSL -DSOLARIS -D_REENTRANT -DXP_UNIX -DMCC_HTTPD -DSPAPI20
+
+LD_SHAREDCMD=$(CC) $(LDFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
 
 OS_TYPE=linux
 INCLUDEDIR=$(SUITSPOT_HOME)/include

Modified: tomcat/connectors/trunk/jk/native/netscape/Makefile.solaris
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/netscape/Makefile.solaris?view=diff&rev=562242&r1=562241&r2=562242
==============================================================================
--- tomcat/connectors/trunk/jk/native/netscape/Makefile.solaris (original)
+++ tomcat/connectors/trunk/jk/native/netscape/Makefile.solaris Thu Aug  2 13:27:03 2007
@@ -8,18 +8,20 @@
 #   2. statically linking with libgcc
 #   3. Adjusting LD_LIBRARY_PATH to grab libgcc_s
 CC=gcc
-# For 64 Bit builds, add "-m64" to CFLAGS and LD_SHAREDCMD
-CFLAGS=-fPIC
-LD_SHAREDCMD=$(CC) -shared -lthread
+# For 64 Bit builds, add "-m64" to EXTRA_CFLAGS
+EXTRA_CFLAGS=-fPIC -pthread
+LDFLAGS=-shared
 
 # Sun Studio cc compiler
 #CC=cc
-# For 64 Bit builds, add "-xtarget=generic64" to CFLAGS and LD_SHAREDCMD
-#CFLAGS=-xcode=pic32
-#LD_SHAREDCMD=$(CC) -G -lthread
+# For 64 Bit builds, add "-xtarget=generic64" to EXTRA_CFLAGS
+#EXTRA_CFLAGS=-xcode=pic32 -mt
+#LDFLAGS=-G
 
-CC_CMD=$(CC) $(CFLAGS) -DNET_SSL -DSOLARIS -D_REENTRANT -DXP_UNIX \
-	-DMCC_HTTPD -DSPAPI20
+CC_CMD=$(CC) $(CFLAGS) $(EXTRA_CFLAGS) \
+	-DNET_SSL -DSOLARIS -D_REENTRANT -DXP_UNIX -DMCC_HTTPD -DSPAPI20
+
+LD_SHAREDCMD=$(CC) $(LDFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
 
 all:
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message