X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=0664be3e08e141b00b3563f82959df4ea3dfb294;hp=be510c930c08d966ea6b46858dde9c3e6d527ee1;hb=57a93b024ec8ceef959a59cd6a9b5137aef2dc09;hpb=e23f2f203cec77df8e2b26e36ba21c57c871aaf2 diff --git a/win/makefile b/win/makefile index be510c9..0664be3 100644 --- a/win/makefile +++ b/win/makefile @@ -1,6 +1,6 @@ -# Copyright (C) 1993-2004, Index Data ApS +# Copyright (C) 1999-2006, Index Data ApS # All rights reserved. -# $Id: makefile,v 1.1 2004-04-11 17:49:53 adam Exp $ +# $Id: makefile,v 1.14 2008-02-21 10:16:51 adam Exp $ ########################################################### ############### Parameters @@ -9,23 +9,23 @@ DEBUG=0 # 0 for release, 1 for debug # YAZ and YAZ++ -YAZ_DIR=c:\yaz -YAZPP_DIR=c:\yaz++ +YAZ_DIR=..\..\yaz +YAZPP_DIR=..\..\yazpp # iconv charcter conversion utility HAVE_ICONV=1 -ICONV_DIR = c:\iconv-1.9.1.win32 +ICONV_DIR=\iconv-1.9.2.win32 # libxslt HAVE_LIBXSLT=1 -LIBXSLT_DIR=c:\libxslt-1.1.4.win32 +LIBXSLT_DIR=\libxslt-1.1.19.win32 # libxml2 (used by libxslt) HAVE_LIBXML2=1 -LIBXML2_DIR=c:\libxml2-2.6.7.win32 +LIBXML2_DIR=\libxml2-2.6.28.win32 # zlib compression (used by libxml2) -ZLIB_DIR = c:\zlib-1.1.4.win32 +ZLIB_DIR=\zlib-1.2.3.win32 # get WIN32 binaries for libxslt, libxml, iconv, zlib from here: # http://www.zlatkovic.com/libxml.en.html @@ -42,9 +42,6 @@ nsis: all nsishelp: $(NSIS) -########################################################### -############### Directories -########################################################### # The current directory is supposed to be something like # ..../yaz/win, everything is relative to that ROOTDIR=.. # The home of yaz++ @@ -53,45 +50,53 @@ INCLDIR=$(ROOTDIR)\include # our includes LIBDIR=$(ROOTDIR)\lib # We produce .lib, .exp etc there BINDIR=$(ROOTDIR)\bin # We produce exes and dlls there WINDIR=$(ROOTDIR)\win # all these Win make things -OBJDIR=$(WINDIR)\obj # where we store intermediate files SRCDIR=$(ROOTDIR)\src # for the case we move them under src PROXYDIR=$(ROOTDIR)\proxy ZOOMDIR=$(ROOTDIR)\zoom +!if $(DEBUG) +OBJDIR=$(WINDIR)\dobj # where we store intermediate files +!else +OBJDIR=$(WINDIR)\obj # where we store intermediate files +!endif + TMPDIR=$(ROOTDIR)\win\tmp TMP=$(TMPDIR) -########################################################### -############### Targets - what to make -########################################################### - -YAZPROXY_DLL=$(BINDIR)\yazproxy.dll -YAZPROXY_IMPLIB=$(LIBDIR)\yazproxy.lib +YAZPROXY_DLL=$(BINDIR)\yazproxy2.dll +YAZPROXY_IMPLIB=$(LIBDIR)\yazproxy2.lib YAZPROXY=$(BINDIR)\yazproxy.exe # shortcut names defined here dll: $(YAZPROXY_DLL) proxy: $(YAZPROXY) -########################################################### -############### Compiler and linker options -########################################################### -# YAZ include&libs -YAZ_LIB="$(YAZ_DIR)\lib\yaz.lib" -YAZ_DEF=/I"$(YAZ_DIR)\include" -yaz: $(BINDIR)\yaz.dll $(BINDIR)\yaz.dll +!if $(DEBUG) +YAZD=yaz3d +YAZPPD=yazpp3d +!else +YAZD=yaz3 +YAZPPD=yazpp3 +!endif -$(BINDIR)\yaz.dll: $(YAZ_DIR)\bin\yaz.dll - copy "$(YAZ_DIR)\bin\yaz.dll" $(BINDIR) +# YAZ includes & libs +YAZ_LIB="$(YAZ_DIR)\lib\$(YAZD).lib" +YAZ_DEF=/DYAZ_HAVE_XML2=1 /DYAZ_USE_NEW_LOG=1 /I"$(YAZ_DIR)\include" -# YAZ++ include&libs -YAZPP_LIB="$(YAZPP_DIR)\lib\yazpp.lib" +# Copy yaz.dll to our bin +yaz: $(BINDIR)\$(YAZD).dll +$(BINDIR)\$(YAZD).dll: "$(YAZ_DIR)\bin\$(YAZD).dll" + copy "$(YAZ_DIR)\bin\$(YAZD).dll" $(BINDIR) + +# YAZ++ includes & libs +YAZPP_LIB="$(YAZPP_DIR)\lib\$(YAZPPD).lib" YAZPP_DEF=/I"$(YAZPP_DIR)\include" -yazpp: $(BINDIR)\yazpp.dll $(BINDIR)\yazpp.dll -$(BINDIR)\yazpp.dll: $(YAZPP_DIR)\bin\yazpp.dll - copy "$(YAZPP_DIR)\bin\yazpp.dll" $(BINDIR) +# Copy yazpp.dll to our bin +yazpp: $(BINDIR)\$(YAZPPD).dll +$(BINDIR)\$(YAZPPD).dll: "$(YAZPP_DIR)\bin\$(YAZPPD).dll" + copy "$(YAZPP_DIR)\bin\$(YAZPPD).dll" $(BINDIR) !if $(HAVE_ICONV) ICONV_DEF= \ @@ -102,7 +107,7 @@ ICONV_LIB= \ iconv: $(BINDIR)\iconv.dll $(BINDIR)\iconv.dll: - copy "$(ICONV_DIR)\lib\iconv.dll" $(BINDIR) + copy "$(ICONV_DIR)\bin\iconv.dll" $(BINDIR) !else ICONV_DEF= \ /D HAVE_ICONV_H=0 @@ -114,13 +119,13 @@ iconv: !if $(HAVE_LIBXML2) LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib" LIBXML2_DEF=/D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include" -libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib.dll +libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib1.dll $(BINDIR)\libxml2.dll: - copy "$(LIBXML2_DIR)\lib\libxml2.dll" $(BINDIR) + copy "$(LIBXML2_DIR)\bin\libxml2.dll" $(BINDIR) -$(BINDIR)\zlib.dll: - copy "$(ZLIB_DIR)\lib\zlib.dll" $(BINDIR) +$(BINDIR)\zlib1.dll: + copy "$(ZLIB_DIR)\bin\zlib1.dll" $(BINDIR) !else LIBXML2_LIB= @@ -131,15 +136,15 @@ libxml2: !if $(HAVE_LIBXSLT) LIBXSLT_LIB="$(LIBXSLT_DIR)\lib\libxslt.lib" -LIBXSLT_DEF=/D HAVE_XSLT=1 /I"$(LIBXSLT_DIR)\include" -libxslt: $(BINDIR)\libxslt.dll $(BINDIR)\zlib.dll +LIBXSLT_DEF=/D YAZ_HAVE_XSLT=1 /I"$(LIBXSLT_DIR)\include" +libxslt: $(BINDIR)\libxslt.dll $(BINDIR)\zlib1.dll $(BINDIR)\libxslt.dll: - copy "$(LIBXSLT_DIR)\lib\libxslt.dll" $(BINDIR) + copy "$(LIBXSLT_DIR)\bin\libxslt.dll" $(BINDIR) !else LIBXSLT_LIB= -LIBXSLT_DEF=/D HAVE_XSLT=0 +LIBXSLT_DEF=/D YAZ_HAVE_XSLT=0 libxslt: !endif @@ -150,7 +155,8 @@ libxslt: # (if you set things up right!) COMMON_C_OPTIONS= \ - /nologo /W3 /GX /FD /c \ + /nologo /W3 /EHsc /FD /c \ + /D "_CRT_SECURE_NO_DEPRECATE" \ $(ICONV_DEF) \ $(YAZ_DEF) \ $(YAZPP_DEF) \ @@ -168,14 +174,14 @@ COMMON_C_INCLUDES= \ DEBUG_C_OPTIONS= \ /D "_DEBUG" \ - /MDd /Od /YX /Zi /Gm + /MDd /Od /Zi /Gm RELEASE_C_OPTIONS= \ /D "NDEBUG" \ /MD /O2 # /W3 = warning level -# /GX = Enable exception handling +# /EHsc= Enable exception handling # /FD = Generate file dependencies (what ever they are) # /c = compile without linking # /FR = Generate browse info (.sbr file that gets combined into .bsc) @@ -185,7 +191,6 @@ RELEASE_C_OPTIONS= \ # /MDd = Runtime library: Multithread DLL (debug) # /Od = Disable optimising (debug) # /O2 = Optimize for speed -# /YX = Automatic use of precomipled headers # /Gm = Minimal rebuild (some cpp class stuff) # /Zi = Program database for debuggers # /ZI = Pgm database with special "edit&continue" stuff - not available in C5 @@ -194,15 +199,15 @@ RELEASE_C_OPTIONS= \ ### Linker options LINK=link.exe -LINK_LIBS= kernel32.lib user32.lib gdi32.lib \ - advapi32.lib uuid.lib \ - wsock32.lib advapi32.lib \ +LINK_LIBS=kernel32.lib user32.lib gdi32.lib advapi32.lib uuid.lib \ + wsock32.lib advapi32.lib \ $(YAZ_LIB) $(YAZPP_LIB) $(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB) -COMMON_LNK_OPTIONS= /nologo \ - /subsystem:windows \ - /machine:i386 \ - /incremental:no +COMMON_LNK_OPTIONS=\ + /nologo \ + /subsystem:windows \ + /machine:i386 \ + /incremental:no DEBUG_LNK_OPTIONS= /debug @@ -227,9 +232,7 @@ LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) $(LNK_LIBS) TCLOPT= $(COMMON_TCL_OPTIONS) !endif -########################################################### -############### Source and object modules -########################################################### +# Source and object modules YAZPROXY_OBJS= \ "$(OBJDIR)\yaz-proxy-main.obj" @@ -237,6 +240,11 @@ YAZPROXY_OBJS= \ YAZPROXY_DLL_OBJS = \ "$(OBJDIR)\yaz-proxy.obj" \ "$(OBJDIR)\yaz-proxy-config.obj" \ + "$(OBJDIR)\yaz-usemarcon.obj" \ + "$(OBJDIR)\msg-thread.obj" \ + "$(OBJDIR)\charset-converter.obj" \ + "$(OBJDIR)\limit-connect.obj" \ + "$(OBJDIR)\modules.obj" \ "$(OBJDIR)\yaz-bw.obj" ########################################################### @@ -259,67 +267,44 @@ COMMON_RC_OPTIONS= /l 0x406 /i"$(ROOTDIR)" DEBUG_RC_OPTIONS=/d "_DEBUG" RELEASE_RC_OPTIONS=/d "NDEBUG" -YAZ_RES=$(OBJDIR)\yaz.res -YAZ_RC=$(WINDIR)\yaz.rc - !if $(DEBUG) RSOPT=/d_DEBUG !else RSOPT=/d_NDEBUG !endif -$(YAZ_RES): $(YAZ_RC) - $(RSC) $(RSOPT) /fo"$(YAZ_RES)" $(YAZ_RC) - ########################################################### ############### Linking ########################################################### $(YAZPROXY_DLL) $(YAZPROXY_IMPLIB): "$(BINDIR)" $(YAZPROXY_DLL_OBJS) - @echo Linking $(YAZPROXY_DLL) - $(LINK) @<< - $(LNKOPT) - $(LINK_LIBS) - $(DLL_LINK_OPTIONS) - $(YAZPP_IMPLIB) - $(YAZPROXY_DLL_OBJS) - /out:$(YAZPROXY_DLL) - /implib:"$(YAZPROXY_IMPLIB)" - /map:"$(LIBDIR)\yazproxy.map" -<< + $(LINK) \ + $(LNKOPT) \ + $(LINK_LIBS) \ + $(DLL_LINK_OPTIONS) \ + $(YAZPP_IMPLIB) \ + $(YAZPROXY_DLL_OBJS) \ + /out:$(YAZPROXY_DLL) \ + /implib:"$(YAZPROXY_IMPLIB)" \ $(YAZPROXY) : "$(BINDIR)" $(YAZPROXY_OBJS) $(YAZPROXY_IMPLIB) - @echo Linking $(YAZPROXY) - $(LINK) @<< - $(LNKOPT) - $(CLIENT_LINK_OPTIONS) - $(LINK_LIBS) - $(YAZPP_IMPLIB) - $(YAZPROXY_IMPLIB) - $(YAZPROXY_OBJS) - /map:"$(LIBDIR)\yazproxy.map" + $(LINK) \ + $(LNKOPT) \ + $(CLIENT_LINK_OPTIONS) \ + $(LINK_LIBS) \ + $(YAZPP_IMPLIB) \ + $(YAZPROXY_IMPLIB) \ + $(YAZPROXY_OBJS) \ /out:$(YAZPROXY) -<< - -########################################################### -############### Generated Source files -########################################################### -############## clean clean: -del $(BINDIR)\*.exe -del $(BINDIR)\*.dll -del $(TMPDIR)\*. - -del $(LIBDIR)\*.MAP -del $(LIBDIR)\*.LIB -del $(OBJDIR)\*.OBJ realclean: clean - -del $(ZOOMDIR)\zoom.h - -# Because DOS del will only accept one file name to delete, -# the _H_ files work only on sets that have just one file. -# Z3950_H_FILES had to be spelled out. One more point for MS! ########### check directories and create if needed dirs: $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR)