[mapserver-commits] r7911 - trunk/mapserver

[svn at osgeo.org]

Author: jmckenna
Date: 2008-09-16 13:31:04 -0400 (Tue, 16 Sep 2008)
New Revision: 7911

Modified:
   trunk/mapserver/Makefile.vc
Log:
Fix logic for plugins-mssql2008 target

Modified: trunk/mapserver/Makefile.vc
===================================================================
--- trunk/mapserver/Makefile.vc	2008-09-16 15:20:45 UTC (rev 7910)
+++ trunk/mapserver/Makefile.vc	2008-09-16 17:31:04 UTC (rev 7911)
@@ -66,8 +66,8 @@
 	link /dll $(LDEBUG) \
 	   $(MS_OBJS) $(EXTERNAL_LIBS) \
 	   /out:$(MS_DLL) /implib:$(MS_LIB_DLL)
-	if exist $(MS_DLL).manifest mt -manifest $(MS_DLL).manifest -outputresource:$(MS_DLL);2   
-	
+	if exist $(MS_DLL).manifest mt -manifest $(MS_DLL).manifest -outputresource:$(MS_DLL);2
+
 $(MS_LIB):	$(MS_OBJS)
 	if exist $(GDAL_DIR)\gdal.pdb copy $(GDAL_DIR)\gdal.pdb .
 	lib /out:$(MS_LIB) $(MS_OBJS)
@@ -83,10 +83,10 @@
 	nmake /f makefile.nt OPTFLAGS="$(OPTFLAGS)"
 	cd ..
 
-.c.obj:	
+.c.obj:
 	$(CC) $(CFLAGS) /c $*.c /Fo$*.obj
 
-.cpp.obj:	
+.cpp.obj:
 	$(CC) $(CFLAGS) /c $*.cpp /Fo$*.obj
 
 .c.exe:
@@ -163,9 +163,9 @@
 !IFDEF PHP_HOME
     -mkdir $(BINDIR)\mapscript\php
 	xcopy /y /r /d /f .\mapscript\php3\*.dll $(BINDIR)\mapscript\php
-!ENDIF	
+!ENDIF
 
-!IFDEF PYTHON_HOME	
+!IFDEF PYTHON_HOME
 python: mapscriptvars $(MS_DLL) $(MS_LIB_DLL)
     cd mapscript\python
     $(SWIG) -python -shadow -o mapscript_wrap.c ../mapscript.i
@@ -212,15 +212,16 @@
 !IF $(SDE_VERSION) >= 92
 SDE_LIB = $(SDE_DIR)\lib\pe.lib \
           $(SDE_DIR)\lib\sde.lib \
-          $(SDE_DIR)\lib\sg.lib    
+          $(SDE_DIR)\lib\sg.lib
 !ELSE
 SDE_LIB = $(SDE_DIR)\lib\pe$(SDE_VERSION).lib \
           $(SDE_DIR)\lib\sde$(SDE_VERSION).lib \
-          $(SDE_DIR)\lib\sg$(SDE_VERSION).lib    
+          $(SDE_DIR)\lib\sg$(SDE_VERSION).lib
 !ENDIF
 !ENDIF
+!ENDIF
 
-plugins:  
+plugins:
 		-del mapsde.obj
 		-del maporaclespatial.obj
 		-del mapmssql2008.obj
@@ -243,8 +244,3 @@
     if exist msplugin_mssql2008.dll.manifest mt -manifest msplugin_mssql2008.dll.manifest -outputresource:msplugin_mssql2008.dll;2
     -del mapmssql2008.obj
 !ENDIF
-
-
-!ELSE
-plugins:
-!ENDIF