*** empty log message ***

This commit is contained in:
Andrey Kiselev 2004-06-06 17:56:21 +00:00
parent 0b802ceb8c
commit 3846ae64db
6 changed files with 89 additions and 21 deletions

View File

@ -1,4 +1,4 @@
# $Id: Makefile.vc,v 1.3 2004-05-03 18:12:57 dron Exp $
# $Id: Makefile.vc,v 1.4 2004-06-06 17:56:21 dron Exp $
#
# Copyright (C) 2004, Andrey Kiselev <dron@remotesensing.org>
#
@ -21,7 +21,7 @@
# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
# OF THIS SOFTWARE.
#
# Simple MS VC++ Makefile
# Makefile for MS Visual C and Watcom C compilers.
# Edit nmake.opt file if you want to ajust building options.
#
# To build:
@ -29,19 +29,27 @@
!INCLUDE nmake.opt
all: lib tools
all: port lib tools
lib:
port::
cd port
$(MAKE) /f Makefile.vc
cd..
lib: port
cd libtiff
$(MAKE) /f Makefile.vc
cd..
tools:
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..

View File

@ -1,4 +1,4 @@
# $Id: Makefile.vc,v 1.5 2004-06-04 11:27:08 dron Exp $
# $Id: Makefile.vc,v 1.6 2004-06-06 17:58:04 dron Exp $
#
# Copyright (C) 2004, Andrey Kiselev <dron@remotesensing.org>
#
@ -21,7 +21,7 @@
# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
# OF THIS SOFTWARE.
#
# Simple MS VC++ Makefile
# Makefile for MS Visual C and Watcom C compilers.
#
# To build:
# C:\libtiff\libtiff> nmake /f makefile.vc all
@ -30,6 +30,7 @@
!INCLUDE ..\nmake.opt
INCL = -I. $(JPEG_INCLUDE) $(ZLIB_INCLUDE)
LIBS = $(LIBS) ..\port\libport.lib
OBJ = \
tif_aux.obj \
@ -75,7 +76,7 @@ config.h:
copy config.h.vc config.h
libtiff.lib: config.h $(OBJ)
lib /nologo /out:libtiff.lib $(OBJ)
lib /nologo /out:libtiff.lib $(OBJ) $(LIBS)
libtiff.dll: config.h $(OBJ)
link /nologo /dll /def:libtiff.def /out:libtiff.dll \

View File

@ -23,6 +23,8 @@
# Process this file with automake to produce Makefile.in.
EXTRA_DIST = Makefile.vc
noinst_LTLIBRARIES = libport.la
libport_la_SOURCES =
libport_la_LIBADD = @LTLIBOBJS@

View File

@ -205,6 +205,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
EXTRA_DIST = Makefile.vc
noinst_LTLIBRARIES = libport.la
libport_la_SOURCES =
libport_la_LIBADD = @LTLIBOBJS@

42
port/Makefile.vc Normal file
View File

@ -0,0 +1,42 @@
# $Id: Makefile.vc,v 1.1 2004-06-06 17:57:08 dron Exp $
#
# Copyright (C) 2004, Andrey Kiselev <dron@remotesensing.org>
#
# 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.
#
# To build:
# C:\libtiff\port> nmake /f makefile.vc
!INCLUDE ..\nmake.opt
OBJ = \
strcasecmp.obj \
getopt.obj
all: libport.lib
libport.lib: $(OBJ)
lib /nologo /out:libport.lib $(OBJ)
clean:
-del *.obj *.lib

View File

@ -1,8 +1,30 @@
# $Id: Makefile.vc,v 1.8 2004-06-06 17:58:29 dron Exp $
#
# Simple MS VC++ Makefile
# Copyright (C) 2004, Andrey Kiselev <dron@remotesensing.org>
#
# To build:
# C:\libtiff\tools> nmake /f makefile.vc
# 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.
#
# To build:
# C:\libtiff\tools> nmake /f makefile.vc
!INCLUDE ..\nmake.opt
@ -12,12 +34,10 @@ TARGETS = tiffcp.exe tiffinfo.exe tiffdump.exe fax2tiff.exe \
tiff2bw.exe tiff2rgba.exe tiff2pdf.exe tiff2ps.exe \
tiffcmp.exe tiffdither.exe tiffmedian.exe tiffsplit.exe
EXTRA_OBJ = strcasecmp.obj getopt.obj
INCL = -I..\libtiff
LIBS = $(LIBS) ..\libtiff\libtiff.lib
LIBS = $(LIBS) ..\port\libport.lib ..\libtiff\libtiff.lib
default: $(EXTRA_OBJ) $(TARGETS)
default: $(TARGETS)
.c.exe:
$(CC) $(CFLAGS) $*.c $(EXTRA_OBJ) $(LIBS)
@ -25,11 +45,5 @@ default: $(EXTRA_OBJ) $(TARGETS)
tiffgt.exe:
$(CC) $(CFLAGS) tiffgt.c $(EXTRA_OBJ) $(LIBS)
getopt.obj: ..\port\getopt.c
$(CC) /c $(CFLAGS) ..\port\getopt.c
strcasecmp.obj: ..\port\strcasecmp.c
$(CC) /c $(CFLAGS) ..\port\strcasecmp.c
clean:
-del *.exe *.obj