don't always rename the files before compiling with Watcom, this is not needed any longer with OpenWatcom (but still keep the possibility to enable this file renaming for older versions)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/tiff/makefile.wat

@@ -14,45 +14,63 @@ EXTRACPPFLAGS=-i=..\zlib
 
 !include $(WXDIR)\src\makewat.env
 
+# set RENAME to 1 to rename the files to the short names -- this is needed
+# with older Watcom versions
+# RENAME=1
+
+!ifeq RENAME 1
+TIFF=
+EXTRACPPFLAGS+=-dwxUSE_SHORTNAMES
+!else
+TIFF=tif_
+!endif
+
 WXLIB = $(WXDIR)\lib
 
-LIBTARGET   = $(WXLIB)\tiff.lib
+LIBTARGET = $(WXLIB)\tiff$(WATCOM_SUFFIX).lib
 
 OBJECTS= &
-		_aux.obj &
+!ifeq RENAME 1
-		close.obj &
+		$(OUTPUTDIR)_aux.obj &
-		codec.obj &
+!else
-		compress.obj &
+		$(OUTPUTDIR)tif_aux.obj &
-		dir.obj &
+!endif
-		dirinfo.obj &
+		$(OUTPUTDIR)$(TIFF)close.obj &
-		dirread.obj &
+		$(OUTPUTDIR)$(TIFF)codec.obj &
-		dirwrite.obj &
+		$(OUTPUTDIR)$(TIFF)compress.obj &
-		dumpmode.obj &
+		$(OUTPUTDIR)$(TIFF)dir.obj &
-		error.obj &
+		$(OUTPUTDIR)$(TIFF)dirinfo.obj &
-		fax3.obj &
+		$(OUTPUTDIR)$(TIFF)dirread.obj &
-		fax3sm.obj &
+		$(OUTPUTDIR)$(TIFF)dirwrite.obj &
-		flush.obj &
+		$(OUTPUTDIR)$(TIFF)dumpmode.obj &
-		getimage.obj &
+		$(OUTPUTDIR)$(TIFF)error.obj &
-		jpeg.obj &
+		$(OUTPUTDIR)$(TIFF)fax3.obj &
-		luv.obj &
+		$(OUTPUTDIR)$(TIFF)fax3sm.obj &
-		lzw.obj &
+		$(OUTPUTDIR)$(TIFF)flush.obj &
-		next.obj &
+		$(OUTPUTDIR)$(TIFF)getimage.obj &
-		open.obj &
+		$(OUTPUTDIR)$(TIFF)jpeg.obj &
-		packbits.obj &
+		$(OUTPUTDIR)$(TIFF)luv.obj &
-		pixarlog.obj &
+		$(OUTPUTDIR)$(TIFF)lzw.obj &
-		predict.obj &
+		$(OUTPUTDIR)$(TIFF)next.obj &
-		print.obj &
+		$(OUTPUTDIR)$(TIFF)open.obj &
-		read.obj &
+		$(OUTPUTDIR)$(TIFF)packbits.obj &
-		strip.obj &
+		$(OUTPUTDIR)$(TIFF)pixarlog.obj &
-		swab.obj &
+		$(OUTPUTDIR)$(TIFF)predict.obj &
-		thunder.obj &
+		$(OUTPUTDIR)$(TIFF)print.obj &
-		tile.obj &
+		$(OUTPUTDIR)$(TIFF)read.obj &
-		version.obj &
+		$(OUTPUTDIR)$(TIFF)strip.obj &
-		warning.obj &
+		$(OUTPUTDIR)$(TIFF)swab.obj &
-		win32.obj &
+		$(OUTPUTDIR)$(TIFF)thunder.obj &
-		write.obj &
+		$(OUTPUTDIR)$(TIFF)tile.obj &
-		zip.obj
+		$(OUTPUTDIR)$(TIFF)version.obj &
+		$(OUTPUTDIR)$(TIFF)warning.obj &
+		$(OUTPUTDIR)$(TIFF)win32.obj &
+		$(OUTPUTDIR)$(TIFF)write.obj &
+		$(OUTPUTDIR)$(TIFF)zip.obj
 
+all: $(OUTPUTDIR) $(RENAME) $(LIBTARGET) .SYMBOLIC
+
+!ifeq RENAME 1
 rename: .SYMBOLIC
 		copy tif_predict.h tif_pred.h
 		copy tif_aux.c _aux.c 
@@ -88,13 +106,16 @@ rename: .SYMBOLIC
 		copy tif_win32.c win32.c 
 		copy tif_write.c write.c 
 		copy tif_zip.c zip.c
+!endif
 
-all:        rename $(OBJECTS) $(LIBTARGET)
+$(OUTPUTDIR):
+	@if not exist $^@ mkdir $^@
 
+LBCFILE=$(OUTPUTDIR)tiff.lbc
 $(LIBTARGET) : $(OBJECTS)
-    %create tmp.lbc
+    %create $(LBCFILE)
-    @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
+    @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i
-    wlib /b /c /n /p=512 $^@ @tmp.lbc
+    wlib /q /b /c /n /p=512 $^@ @$(LBCFILE)
 
 clean:   .SYMBOLIC
     -erase *.obj
@@ -102,6 +123,7 @@ clean:   .SYMBOLIC
     -erase *.pch
     -erase *.err
     -erase *.lbc
+!ifeq RENAME 1
 	-erase tif_pred.h
 	-erase _aux.c 
 	-erase close.c 
@@ -136,6 +158,7 @@ clean:   .SYMBOLIC
 	-erase win32.c 
 	-erase write.c 
 	-erase zip.c
+!endif
 
 cleanall:   clean
 

src/tiff/tif_lzw.c

@@ -37,7 +37,7 @@
  * The original Berkeley copyright notice appears below in its entirety.
  */
 /* Watcom C++ (or its make utility) doesn't like long filenames */
-#ifdef __WATCOMC__
+#ifdef wxUSE_SHORTNAMES
 #include "tif_pred.h"
 #else
 #include "tif_predict.h"

src/tiff/tif_predict.c

@@ -31,7 +31,7 @@
  */
 #include "tiffiop.h"
 /* Watcom C++ (or its make utility) doesn't like long filenames */
-#ifdef __WATCOMC__
+#ifdef wxUSE_SHORTNAMES
 #include "tif_pred.h"
 #else
 #include "tif_predict.h"