[mapserver-commits] r12982 - trunk/mapserver/mapcache

[svn at osgeo.org]

Author: jmckenna
Date: 2012-01-13 09:23:18 -0800 (Fri, 13 Jan 2012)
New Revision: 12982

Modified:
   trunk/mapserver/mapcache/Makefile.vc
Log:
fix manifest embedding for mapcache.exe, mapcache_seed.exe, and mod_mapcache.dll

Modified: trunk/mapserver/mapcache/Makefile.vc
===================================================================
--- trunk/mapserver/mapcache/Makefile.vc	2012-01-12 03:59:14 UTC (rev 12981)
+++ trunk/mapserver/mapcache/Makefile.vc	2012-01-13 17:23:18 UTC (rev 12982)
@@ -34,9 +34,9 @@
 		$(REGEX_OBJ)
 
 
-MAPCACHE_FCGI = 	mapcache.exe 
+MAPCACHE_FCGI = 	mapcache.exe
 MAPCACHE_APACHE =       mod_mapcache.dll
-MAPCACHE_SEED = 	mapcache_seed.exe 
+MAPCACHE_SEED = 	mapcache_seed.exe
 
 #
 #
@@ -52,15 +52,15 @@
 
 $(MAPCACHE_FCGI): $(MAPCACHE_LIB)
           $(CC) $(CFLAGS) cgi\mapcache.c /Fecgi\mapcache.exe $(LIBS)
-	         if exist $@.manifest mt -manifest $@.manifest -outputresource:$@;1
+	         if exist cgi\$(MAPCACHE_FCGI).manifest mt -manifest cgi\$(MAPCACHE_FCGI).manifest -outputresource:cgi\$(MAPCACHE_FCGI);1
 
 $(MAPCACHE_APACHE): $(MAPCACHE_LIB)
           $(CC) $(CFLAGS) apache\mod_mapcache.c /link /DLL /out:apache\mod_mapcache.dll $(LIBS)
-	         if exist $@.manifest mt -manifest $@.manifest -outputresource:$@;1
+	         if exist apache\$(MAPCACHE_APACHE).manifest mt -manifest apache\$(MAPCACHE_APACHE).manifest -outputresource:apache\$(MAPCACHE_APACHE);2
 
 $(MAPCACHE_SEED): $(MAPCACHE_LIB)
           $(CC) $(CFLAGS) util\mapcache_seed.c /Feutil\mapcache_seed.exe $(LIBS)
-	         if exist $@.manifest mt -manifest $@.manifest -outputresource:$@;1
+	         if exist util\$(MAPCACHE_SEED).manifest mt -manifest util\$(MAPCACHE_SEED).manifest -outputresource:util\$(MAPCACHE_SEED);1
 
 .c.obj:
 	$(CC) $(CFLAGS) /c $*.c /Fo$*.obj
@@ -68,18 +68,27 @@
 .cpp.obj:
 	$(CC) $(CFLAGS) /c $*.cpp /Fo$*.obj
 
- 
+
 clean:
     del lib\*.obj
     del *.obj
     del *.exp
     del apache\$(MAPCACHE_APACHE)
+    del apache\*.manifest
+    del apache\*.exp
+    del apache\*.lib
     del cgi\$(MAPCACHE_FCGI)
+    del cgi\*.manifest
+    del cgi\*.exp
+    del cgi\*.lib
     del util\$(MAPCACHE_SEED)
+    del util\*.manifest
+    del util\*.exp
+    del util\*.lib
     del *.lib
     del *.manifest
-        
 
+
 install: $(MAPCACHE_EXE)
 	-mkdir $(BINDIR)
 	copy *.exe $(BINDIR)