You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2009/05/20 14:44:31 UTC

svn commit: r776680 - /commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in

Author: mturk
Date: Wed May 20 12:44:30 2009
New Revision: 776680

URL: http://svn.apache.org/viewvc?rev=776680&view=rev
Log:
Use tmp list during link to allow larger number of files

Modified:
    commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in

Modified: commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in?rev=776680&r1=776679&r2=776680&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in (original)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in Wed May 20 12:44:30 2009
@@ -42,6 +42,7 @@
 LDFLAGS=@ldflags@
 SHFLAGS=@shflags@
 INCLUDES=@includes@
+SSLFLAGS=@sslflags@
 
 LINK=link.exe
 RC=rc.exe
@@ -95,23 +96,36 @@
 
 all: $(SHAREDLIB) @modules@
 
-.c.$(OBJ):
+{$(SRCDIR)\shared}.c{$(SRCDIR)\shared}.$(OBJ):
 	$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES) -c -Fo$@ -Fd$(LIBNAME)-src $<
 
-.cpp.$(OBJ):
+{$(SRCDIR)\os\win32}.c{$(SRCDIR)\os\win32}.$(OBJ):
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES) -c -Fo$@ -Fd$(LIBNAME)-src $<
+
+{$(SRCDIR)\test}.c{$(SRCDIR)\test}.$(OBJ):
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES) -c -Fo$@ -Fd$(LIBNAME)-src $<
+
+{$(SRCDIR)\modules\network\ssl}.c{$(SRCDIR)\modules\network\ssl}.$(OBJ):
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES) -c -Fo$@ -Fd$(SSLNAME)-src $<
+
+{$(SRCDIR)\os\win32}.cpp{$(SRCDIR)\os\win32}.$(OBJ):
 	$(CXX) $(CFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) -c -Fo$@ -Fd$(LIBNAME)-src $<
 
 .rc.res:
 	$(RC) /l 0x409 /d "NDEBUG" /i "$(SRCDIR)\include" /fo $@ $<
 
 $(SHAREDLIB): $(COMMON_OBJS) $(@platform@_OBJS) @testobjs@
-	$(LINK) $(SHFLAGS) $(LDFLAGS) /DLL /SUBSYSTEM:WINDOWS $(COMMON_OBJS) $(WINDOWS_OBJS) @testobjs@ /pdb:$(LIBNAME).pdb /out:$@
+	$(LINK) $(SHFLAGS) $(LDFLAGS) /DLL /SUBSYSTEM:WINDOWS /pdb:$(LIBNAME).pdb /out:$@ @<<
+	$(COMMON_OBJS) $(WINDOWS_OBJS) @testobjs@
+<<
 	IF EXIST $@.manifest \
 		mt -nologo -manifest $@.manifest -outputresource:$@;2
 	@copy /Y $@ $(LIBSO)
 
 $(SSLMODLIB): $(SHAREDLIB) $(OPENSSL_OBJS)
-	$(LINK) $(SHFLAGS) $(LDFLAGS) /DLL /SUBSYSTEM:WINDOWS $(OPENSSL_OBJS) libpath:"." $(LIBNAME).lib /pdb:$(SSLNAME).pdb /out:$@
+	$(LINK) $(SHFLAGS) $(LDFLAGS) $(SSLFLAGS) /DLL /SUBSYSTEM:WINDOWS libpath:"." $(LIBNAME).lib /pdb:$(SSLNAME).pdb /out:$@ @<<
+	$(OPENSSL_OBJS)
+<<
 	IF EXIST $(SSLMODLIB).manifest \
 		mt -nologo -manifest $@.manifest -outputresource:$@;2
 	@copy /Y $@ $(SSLSO)