Make @genericAppearance Doxygen macro consistent with @appearance.

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

diff --git a/src/tiff/libtiff/Makefile.vc b/src/tiff/libtiff/Makefile.vc
index de9af6737349ce03a64fe9231c22fbdcb5619ac6..244ae3444a4e607703f47d888c644f0946db9da7 100644 (file)
--- a/src/tiff/libtiff/Makefile.vc
+++ b/src/tiff/libtiff/Makefile.vc
@@ -1,4 +1,3 @@
-# $Id: Makefile.vc,v 1.15 2006/03/23 14:54:02 dron Exp $\r
 #\r
 # Copyright (C) 2004, Andrey Kiselev <dron@ak4719.spb.edu>\r
 #\r
@@ -29,7 +28,7 @@
 \r
 !INCLUDE ..\nmake.opt\r
 \r
-INCL   = -I. $(JPEG_INCLUDE) $(ZLIB_INCLUDE)\r
+INCL   = -I. $(JPEG_INCLUDE) $(ZLIB_INCLUDE) $(JBIG_INCLUDE)\r
 \r
 !IFDEF USE_WIN_CRT_LIB\r
 OBJ_SYSDEP_MODULE = tif_unix.obj\r
@@ -53,7 +52,9 @@ OBJ   = \
        tif_fax3.obj \\r
        tif_fax3sm.obj \\r
        tif_getimage.obj \\r
+       tif_jbig.obj \\r
        tif_jpeg.obj \\r
+       tif_jpeg_12.obj \\r
        tif_ojpeg.obj \\r
        tif_flush.obj \\r
        tif_luv.obj \\r
@@ -78,11 +79,11 @@ OBJ = \
 \r
 all:   libtiff.lib $(DLLNAME)\r
 \r
-tif_config.h:  tif_config.h.vc\r
-       copy tif_config.h.vc tif_config.h\r
+tif_config.h:  tif_config.vc.h\r
+       copy tif_config.vc.h tif_config.h\r
 \r
-tiffconf.h:    tiffconf.h.vc\r
-       copy tiffconf.h.vc tiffconf.h\r
+tiffconf.h:    tiffconf.vc.h\r
+       copy tiffconf.vc.h tiffconf.h\r
 \r
 libtiff.lib:   tif_config.h tiffconf.h $(OBJ)\r
        $(AR) /out:libtiff.lib $(OBJ) $(LIBS)\r
@@ -92,7 +93,9 @@ $(DLLNAME):   tif_config.h tiffconf.h libtiff.def $(OBJ)
        /implib:libtiff_i.lib $(OBJ) $(LIBS)\r
        \r
 clean:\r
+       -del tif_config.h tiffconf.h\r
        -del *.obj\r
        -del *.lib\r
        -del *.dll\r
-       -del *.exe\r
+       -del *.dll.manifest\r
+       -del *.pdb\r