From fb8fe4b17f803b296671347a6a71fab7cfd0e58a Mon Sep 17 00:00:00 2001 From: Andrey Kiselev Date: Tue, 21 Mar 2006 16:41:07 +0000 Subject: [PATCH] Makefiles improvements as per bug http://bugzilla.remotesensing.org/show_bug.cgi?id=1128 --- contrib/addtiffo/Makefile.vc | 3 ++- libtiff/Makefile.vc | 15 ++++++++------- port/Makefile.vc | 5 +++-- tools/Makefile.vc | 5 +++-- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/contrib/addtiffo/Makefile.vc b/contrib/addtiffo/Makefile.vc index e1aa39cf..2777dc2a 100755 --- a/contrib/addtiffo/Makefile.vc +++ b/contrib/addtiffo/Makefile.vc @@ -24,4 +24,5 @@ tif_ovrcache.obj: tif_ovrcache.c $(CC) -c $(CFLAGS) tif_ovrcache.c clean: - del *.obj addtiffo.exe + -del *.obj + -del addtiffo.exe diff --git a/libtiff/Makefile.vc b/libtiff/Makefile.vc index c0044925..8b2e28c0 100644 --- a/libtiff/Makefile.vc +++ b/libtiff/Makefile.vc @@ -1,4 +1,4 @@ -# $Id: Makefile.vc,v 1.13 2005-08-18 20:21:06 fwarmerdam Exp $ +# $Id: Makefile.vc,v 1.14 2006-03-21 16:41:07 dron Exp $ # # Copyright (C) 2004, Andrey Kiselev # @@ -78,20 +78,21 @@ OBJ = \ all: libtiff.lib $(DLLNAME) -tif_config.h: +tif_config.h: tif_config.h.vc copy tif_config.h.vc tif_config.h -tiffconf.h: +tiffconf.h: tiffconf.h.vc copy tiffconf.h.vc tiffconf.h libtiff.lib: tif_config.h tiffconf.h $(OBJ) $(AR) /out:libtiff.lib $(OBJ) $(LIBS) -$(DLLNAME): tif_config.h $(OBJ) +$(DLLNAME): tif_config.h tiffconf.h libtiff.def $(OBJ) $(LD) /debug /dll /def:libtiff.def /out:$(DLLNAME) \ /implib:libtiff_i.lib $(OBJ) $(LIBS) clean: - -del *.obj *.lib *.dll *.exe - - + -del *.obj + -del *.lib + -del *.dll + -del *.exe diff --git a/port/Makefile.vc b/port/Makefile.vc index bc1d07cb..a39e10e7 100644 --- a/port/Makefile.vc +++ b/port/Makefile.vc @@ -1,4 +1,4 @@ -# $Id: Makefile.vc,v 1.2 2004-07-03 16:04:59 dron Exp $ +# $Id: Makefile.vc,v 1.3 2006-03-21 16:41:07 dron Exp $ # # Copyright (C) 2004, Andrey Kiselev # @@ -38,5 +38,6 @@ libport.lib: $(OBJ) $(AR) /out:libport.lib $(OBJ) clean: - -del *.obj *.lib + -del *.obj + -del *.lib diff --git a/tools/Makefile.vc b/tools/Makefile.vc index 41d067d3..fd9729d9 100644 --- a/tools/Makefile.vc +++ b/tools/Makefile.vc @@ -1,4 +1,4 @@ -# $Id: Makefile.vc,v 1.9 2004-06-08 15:54:12 dron Exp $ +# $Id: Makefile.vc,v 1.10 2006-03-21 16:41:07 dron Exp $ # # Copyright (C) 2004, Andrey Kiselev # @@ -46,4 +46,5 @@ tiffgt.exe: $(CC) $(CFLAGS) tiffgt.c $(EXTRA_OBJ) $(LIBS) clean: - -del *.exe *.obj + -del *.exe + -del *.obj