missing commit

[wxWidgets.git] / src / tiff / Makefile.vc

diff --git a/src/tiff/Makefile.vc b/src/tiff/Makefile.vc
index 7ffefc2c32c2f7baba17f299055fcdbc2d642656..afbca22db2f12fce92a85bb81bc97f894bebb9a3 100644 (file)
--- a/src/tiff/Makefile.vc
+++ b/src/tiff/Makefile.vc
@@ -1,59 +1,58 @@
-# $Id: Makefile.vc,v 1.5 2006/03/23 14:54:00 dron Exp $
-#
-# Copyright (C) 2004, Andrey Kiselev <dron@ak4719.spb.edu>
-#
-# Permission to use, copy, modify, distribute, and sell this software and 
-# its documentation for any purpose is hereby granted without fee, provided
-# that (i) the above copyright notices and this permission notice appear in
-# all copies of the software and related documentation, and (ii) the names of
-# Sam Leffler and Silicon Graphics may not be used in any advertising or
-# publicity relating to the software without the specific, prior written
-# permission of Sam Leffler and Silicon Graphics.
-# 
-# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
-# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
-# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
-# 
-# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
-# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
-# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
-# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
-# OF THIS SOFTWARE.
-#
-# Makefile for MS Visual C and Watcom C compilers.
-# Edit nmake.opt file if you want to ajust building options.
-#
-# To build:
-# C:\libtiff> nmake /f makefile.vc 
-
-!INCLUDE nmake.opt
-
-all:   port lib tools
-
-port::
-       cd port
-       $(MAKE) /f Makefile.vc
-       cd..
-
-lib:   port
-       cd libtiff
-       $(MAKE) /f Makefile.vc
-       cd..
-
-tools: lib
-       cd tools
-       $(MAKE) /f Makefile.vc
-       cd ..
-
-clean:
-       cd port
-       $(MAKE) /f Makefile.vc clean
-       cd..
-       cd libtiff
-       $(MAKE) /f Makefile.vc clean
-       cd..
-       cd tools
-       $(MAKE) /f Makefile.vc clean
-       cd ..
-
+# $Id: Makefile.vc,v 1.7 2008/01/01 15:53:10 fwarmerdam Exp $\r
+#\r
+# Copyright (C) 2004, Andrey Kiselev <dron@ak4719.spb.edu>\r
+#\r
+# Permission to use, copy, modify, distribute, and sell this software and \r
+# its documentation for any purpose is hereby granted without fee, provided\r
+# that (i) the above copyright notices and this permission notice appear in\r
+# all copies of the software and related documentation, and (ii) the names of\r
+# Sam Leffler and Silicon Graphics may not be used in any advertising or\r
+# publicity relating to the software without the specific, prior written\r
+# permission of Sam Leffler and Silicon Graphics.\r
+# \r
+# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, \r
+# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY \r
+# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  \r
+# \r
+# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR\r
+# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,\r
+# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,\r
+# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF \r
+# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE \r
+# OF THIS SOFTWARE.\r
+#\r
+# Makefile for MS Visual C and Watcom C compilers.\r
+# Edit nmake.opt file if you want to ajust building options.\r
+#\r
+# To build:\r
+# C:\libtiff> nmake /f makefile.vc \r
+\r
+!INCLUDE nmake.opt\r
+\r
+all:   port lib tools\r
+\r
+port::\r
+       cd port\r
+       $(MAKE) /f Makefile.vc\r
+       cd..\r
+\r
+lib:   port\r
+       cd libtiff\r
+       $(MAKE) /f Makefile.vc\r
+       cd..\r
+\r
+tools: lib\r
+       cd tools\r
+       $(MAKE) /f Makefile.vc\r
+       cd ..\r
+\r
+clean:\r
+       cd port\r
+       $(MAKE) /f Makefile.vc clean\r
+       cd..\r
+       cd libtiff\r
+       $(MAKE) /f Makefile.vc clean\r
+       cd..\r
+       cd tools\r
+       $(MAKE) /f Makefile.vc clean\r
+       cd ..\r