[Jboss-svn-commits] JBL Code SVN: r4060 - in labs/jbossweb/trunk/src/share/native: . srclib/apr

[<jbo...@li...>]

Author: mla...@jb...
Date: 2006-05-03 03:20:20 -0400 (Wed, 03 May 2006)
New Revision: 4060

Modified:
   labs/jbossweb/trunk/src/share/native/NMAKEmakefile
   labs/jbossweb/trunk/src/share/native/srclib/apr/NMAKEmakefile
Log:
Properly use mt.exe tool.

Modified: labs/jbossweb/trunk/src/share/native/NMAKEmakefile
===================================================================
--- labs/jbossweb/trunk/src/share/native/NMAKEmakefile	2006-05-03 07:19:37 UTC (rev 4059)
+++ labs/jbossweb/trunk/src/share/native/NMAKEmakefile	2006-05-03 07:20:20 UTC (rev 4060)
@@ -100,6 +100,7 @@
 BUILDLIB = $(BUILDIR)\$(PROJECT).dll
 BUILDPDB = $(BUILDIR)\$(PROJECT).pdb
 BUILDRES = $(BUILDIR)\$(PROJECT).res
+BUILDMAN = $(BUILDLIB).manifest
 
 all : $(BUILDIR) $(BUILDLIB)
 
@@ -119,6 +120,8 @@
 
 $(BUILDLIB): $(BUILDIR) $(OBJECTS) $(BUILDRES)
 	$(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDLIB)
+	IF EXIST $(BUILDMAN) \
+		mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDLIB);2
 
 clean:
 	@$(CLEANTARGET)

Modified: labs/jbossweb/trunk/src/share/native/srclib/apr/NMAKEmakefile
===================================================================
--- labs/jbossweb/trunk/src/share/native/srclib/apr/NMAKEmakefile	2006-05-03 07:19:37 UTC (rev 4059)
+++ labs/jbossweb/trunk/src/share/native/srclib/apr/NMAKEmakefile	2006-05-03 07:20:20 UTC (rev 4060)
@@ -202,7 +202,8 @@
 	$(RC) $(RCFLAGS) /i "$(SRCDIR)/include" /d "APR_VERSION_ONLY" /fo $(BUILDRES) libapr.rc
 $(BUILDLIB): $(BUILDIR) $(SRCDIR)/include/apr.h $(OBJECTS) $(BUILDRES)
 	$(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) /pdb:$(BUILDPDB) /out:$(BUILDLIB)
-	mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDLIB);2
+	IF EXIST $(BUILDMAN) \
+		mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDLIB);2
 !ELSE
 $(BUILDLIB): $(BUILDIR) $(SRCDIR)/include/apr.h $(OBJECTS)
 	$(LINK) $(LFLAGS) $(OBJECTS) /out:$(BUILDLIB)