X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=8c0ddee1ec79d9452ec7f1a32dfc6f5ad10220c4;hp=4964865d41ba64aa8eb96b0c8e24715e4821d7d4;hb=HEAD;hpb=2193539b01eb9b085af2c2c3e4aa18fe4ae4c5f7 diff --git a/win/makefile b/win/makefile index 4964865..8c0ddee 100644 --- a/win/makefile +++ b/win/makefile @@ -1,153 +1,72 @@ -# Copyright (C) 1993-2004, Index Data ApS -# All rights reserved. -# $Id: makefile,v 1.2 2004-03-30 18:14:14 adam Exp $ - -########################################################### -############### Parameters -########################################################### +# This file is part of the yazpp toolkit +# Copyright (C) Index Data +# See the file LICENSE for details. +# Parameters DEBUG=0 # 0 for release, 1 for debug # YAZ -YAZ_DIR=c:\yaz - -# iconv charcter conversion utility -HAVE_ICONV=1 -ICONV_DIR = c:\iconv-1.9.1.win32 - -# libxslt -HAVE_LIBXSLT=1 -LIBXSLT_DIR=c:\libxslt-1.1.4.win32 - -# libxml2 (used by libxslt) -HAVE_LIBXML2=1 -LIBXML2_DIR=c:\libxml2-2.6.7.win32 - -# zlib compression (used by libxml2) -ZLIB_DIR = c:\zlib-1.1.4.win32 - -# get WIN32 binaries for libxslt, libxml, iconv, zlib from here: -# http://www.zlatkovic.com/libxml.en.html +YAZ_DIR=..\..\yaz default: all -all: dirs dll proxy iconv libxml2 libxslt yaz +all: dirs generated dll myclient zclient yaz -NSIS="c:\program files\nsis\makensis-bz2.exe" - -nsis: all - $(NSIS) yazpp.nsi - -nsishelp: - $(NSIS) - -########################################################### -############### Directories -########################################################### +# Directories # The current directory is supposed to be something like # ..../yaz/win, everything is relative to that -ROOTDIR=.. # The home of yaz++ +ROOTDIR=.. # The home of yazpp 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 -TMPDIR=$(ROOTDIR)\win\tmp -TMP=$(TMPDIR) - -########################################################### -############### Targets - what to make -########################################################### - -YAZPP_DLL=$(BINDIR)\yazpp.dll -YAZPROXY_DLL=$(BINDIR)\yazproxy.dll -YAZPP_IMPLIB=$(LIBDIR)\yazpp.lib -YAZPROXY_IMPLIB=$(LIBDIR)\yazproxy.lib - -YAZPROXY=$(BINDIR)\yaz-proxy.exe - -# shortcut names defined here -dll: $(YAZPP_DLL) $(YAZPROXY_DLL) -proxy: $(YAZPROXY) - -########################################################### -############### Compiler and linker options -########################################################### - -YAZ_LIB="$(YAZ_DIR)\lib\yaz.lib" -YAZ_DEF=/I"$(YAZ_DIR)\include" -yaz: $(BINDIR)\yaz.dll $(BINDIR)\yaz.dll - -$(BINDIR)\yaz.dll: $(YAZ_DIR)\bin\yaz.dll - copy "$(YAZ_DIR)\bin\yaz.dll" $(BINDIR) - -!if $(HAVE_ICONV) -ICONV_DEF= \ - /D HAVE_ICONV_H=1 \ - /I"$(ICONV_DIR)\include" -ICONV_LIB= \ - "$(ICONV_DIR)\lib\iconv.lib" -iconv: $(BINDIR)\iconv.dll - -$(BINDIR)\iconv.dll: - copy "$(ICONV_DIR)\lib\iconv.dll" $(BINDIR) +!if $(DEBUG) +OBJDIR=$(WINDIR)\dobj !else -ICONV_DEF= \ - /D HAVE_ICONV_H=0 -ICONV_LIB= -iconv: - +OBJDIR=$(WINDIR)\obj !endif -!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 - -$(BINDIR)\libxml2.dll: - copy "$(LIBXML2_DIR)\lib\libxml2.dll" $(BINDIR) +TMPDIR=$(ROOTDIR)\win\tmp +TMP=$(TMPDIR) -$(BINDIR)\zlib.dll: - copy "$(ZLIB_DIR)\lib\zlib.dll" $(BINDIR) +# Targets - what to make +!if $(DEBUG) +DLL=$(BINDIR)\yazpp6d.dll +YAZPP_IMPLIB=$(LIBDIR)\yazpp6d.lib +YAZD=yaz5d !else -LIBXML2_LIB= -LIBXML2_DEF=/D HAVE_XML2=0 -libxml2: - +DLL=$(BINDIR)\yazpp6.dll +YAZPP_IMPLIB=$(LIBDIR)\yazpp6.lib +YAZD=yaz5 !endif -!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 - -$(BINDIR)\libxslt.dll: - copy "$(LIBXSLT_DIR)\lib\libxslt.dll" $(BINDIR) +ZCLIENT=$(BINDIR)\zclient.exe +MY_CLIENT=$(BINDIR)\yaz-my-client.exe -!else -LIBXSLT_LIB= -LIBXSLT_DEF=/D HAVE_XSLT=0 -libxslt: +# shortcut names defined here +dll: $(DLL) +zclient: $(ZCLIENT) +myclient: $(MY_CLIENT) -!endif +# Compiler and linker options +# YAZ includes & libs +YAZ_LIB="$(YAZ_DIR)\lib\$(YAZD).lib" +YAZ_DEF=/I"$(YAZ_DIR)\include" +yaz: $(BINDIR)\$(YAZD).dll -### C and CPP compiler (the same thing) -# Note: $(CPP) has already been defined in the environment -# (if you set things up right!) +$(BINDIR)\$(YAZD).dll: "$(YAZ_DIR)\bin\$(YAZD).dll" + copy "$(YAZ_DIR)\bin\$(YAZD).dll" $(BINDIR) COMMON_C_OPTIONS= \ - /nologo /W3 /GX /FD /c \ - $(ICONV_DEF) \ + /nologo /W3 /EHsc /FD /c \ + /D "_CRT_SECURE_NO_DEPRECATE" \ $(YAZ_DEF) \ - $(LIBXML2_DEF) \ - $(LIBXSLT_DEF) \ /D "_WINDOWS" \ /D "WIN32" \ /D "HAVE_WCHAR_H=1" \ @@ -160,7 +79,7 @@ COMMON_C_INCLUDES= \ DEBUG_C_OPTIONS= \ /D "_DEBUG" \ - /MDd /Od /YX /Zi /Gm + /MDd /Od /Zi /Gm RELEASE_C_OPTIONS= \ /D "NDEBUG" \ @@ -177,7 +96,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 @@ -186,15 +104,9 @@ RELEASE_C_OPTIONS= \ ### Linker options LINK=link.exe -LINK_LIBS= kernel32.lib user32.lib gdi32.lib \ - advapi32.lib uuid.lib \ - wsock32.lib advapi32.lib \ - $(YAZ_LIB) $(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB) +LINK_LIBS= kernel32.lib advapi32.lib $(YAZ_LIB) -COMMON_LNK_OPTIONS= /nologo \ - /subsystem:windows \ - /machine:i386 \ - /incremental:no +COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no $(MTOPT) DEBUG_LNK_OPTIONS= /debug @@ -206,27 +118,24 @@ CLIENT_LINK_OPTIONS = /subsystem:console # Final opt variables !if $(DEBUG) COPT= $(COMMON_C_OPTIONS) $(DEBUG_C_OPTIONS) $(COMMON_C_INCLUDES) -MTLOPT= $(COMMON_MTL_OPTIONS) $(DEBUG_MTL_OPTIONS) -RCOPT= $(COMMON_RC_OPTIONS) $(DEBUG_RC_OPTIONS) -LNKOPT= $(COMMON_LNK_OPTIONS) $(DEBUG_LNK_OPTIONS) $(LNK_LIBS) -TCLOPT= $(COMMON_TCL_OPTIONS) +LNKOPT= $(COMMON_LNK_OPTIONS) $(DEBUG_LNK_OPTIONS) !else COPT= $(COMMON_C_OPTIONS) $(RELEASE_C_OPTIONS) $(COMMON_C_INCLUDES) -MTLOPT= $(COMMON_MTL_OPTIONS) $(RELEASE_MTL_OPTIONS) -RCOPT= $(COMMON_RC_OPTIONS) $(RELEASE_RC_OPTIONS) -LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) $(LNK_LIBS) -TCLOPT= $(COMMON_TCL_OPTIONS) +LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) !endif -########################################################### -############### Source and object modules -########################################################### - -YAZPROXY_OBJS= \ - "$(OBJDIR)\yaz-proxy-main.obj" - -YAZPP_DLL_OBJS = \ +# Source and object modules + +DLL_OBJS = \ + "$(OBJDIR)\timestat.obj" \ + "$(OBJDIR)\gdu.obj" \ + "$(OBJDIR)\gduqueue.obj" \ + "$(OBJDIR)\limit-connect.obj" \ + "$(OBJDIR)\pdu-observer.obj" \ + "$(OBJDIR)\query.obj" \ + "$(OBJDIR)\socket-observer.obj" \ + "$(OBJDIR)\z-server.obj" \ "$(OBJDIR)\yaz-socket-manager.obj" \ "$(OBJDIR)\yaz-pdu-assoc.obj" \ "$(OBJDIR)\yaz-z-assoc.obj" \ @@ -239,118 +148,52 @@ YAZPP_DLL_OBJS = \ "$(OBJDIR)\yaz-z-server-update.obj" \ "$(OBJDIR)\yaz-z-databases.obj" \ "$(OBJDIR)\yaz-z-cache.obj" \ - "$(OBJDIR)\yaz-cql2rpn.obj" - -YAZPROXY_DLL_OBJS = \ - "$(OBJDIR)\yaz-proxy.obj" \ - "$(OBJDIR)\yaz-proxy-config.obj" \ - "$(OBJDIR)\yaz-bw.obj" - -########################################################### -############### Compiling -########################################################### + "$(OBJDIR)\yaz-cql2rpn.obj" \ + "$(OBJDIR)\zexcept.obj" \ + "$(OBJDIR)\zconn.obj" \ + "$(OBJDIR)\zquery.obj" \ + "$(OBJDIR)\zrs.obj" \ + "$(OBJDIR)\zrec.obj" -# Note: This defines where to look for the necessary -# source files. Funny way of doing it, but it works. +MY_CLIENT_OBJS = \ + "$(OBJDIR)\yaz-my-client.obj" -# yaz proxy -{$(PROXYDIR)}.cpp{$(OBJDIR)}.obj: - @$(CPP) $(COPT) $< +ZCLIENT_OBJS = \ + "$(OBJDIR)\zclient.obj" -# Various YAZ source directories {$(SRCDIR)}.cpp{$(OBJDIR)}.obj: $(CPP) $(COPT) $< {$(ZOOMDIR)}.cpp{$(OBJDIR)}.obj: $(CPP) $(COPT) $< -########################################################### -############### Resources -########################################################### +LINK_DLL = $(LINK) $(LNKOPT) $(LINK_LIBS) $(DLL_LINK_OPTIONS) +LINK_PROGRAM = $(LINK) $(LNKOPT) $(CLIENT_LINK_OPTIONS) $(LINK_LIBS) $(YAZPP_IMPLIB) -### The RC compiler (resource files) -RSC=rc.exe -COMMON_RC_OPTIONS= /l 0x406 /i"$(ROOTDIR)" -DEBUG_RC_OPTIONS=/d "_DEBUG" -RELEASE_RC_OPTIONS=/d "NDEBUG" +$(DLL) $(YAZPP_IMPLIB): "$(BINDIR)" $(DLL_OBJS) + $(LINK_DLL) $(DLL_OBJS) /out:$@ /implib:"$(YAZPP_IMPLIB)" -YAZ_RES=$(OBJDIR)\yaz.res -YAZ_RC=$(WINDIR)\yaz.rc +$(MY_CLIENT) : "$(BINDIR)" $(MY_CLIENT_OBJS) $(YAZPP_IMPLIB) + $(LINK_PROGRAM) $(MY_CLIENT_OBJS) /out:$@ -!if $(DEBUG) -RSOPT=/d_DEBUG -!else -RSOPT=/d_NDEBUG -!endif +$(ZCLIENT) : "$(BINDIR)" $(ZCLIENT_OBJS) $(YAZPP_IMPLIB) + $(LINK_PROGRAM) $(ZCLIENT_OBJS) /out:$@ + +generated: $(ZOOMDIR)\zoom.h + +"$(ZOOMDIR)\zoom.h": "$(ZOOMDIR)\master-header" + sed "s/^* / /; s/^*/ /" < "$(ZOOMDIR)\master-header" >"$(ZOOMDIR)\zoom.h" -$(YAZ_RES): $(YAZ_RC) - $(RSC) $(RSOPT) /fo"$(YAZ_RES)" $(YAZ_RC) - -########################################################### -############### Linking -########################################################### - -$(YAZPP_DLL) $(YAZPP_IMPLIB): "$(BINDIR)" $(YAZPP_DLL_OBJS) - @echo Linking $(YAZPP_DLL) - $(LINK) @<< - $(LNKOPT) - $(LINK_LIBS) - $(DLL_LINK_OPTIONS) - $(YAZPP_DLL_OBJS) - /out:"$(YAZPP_DLL)" - /implib:"$(YAZPP_IMPLIB)" - /map:"$(LIBDIR)\yazpp.map" -<< - -$(YAZPROXY_DLL) $(YAZPROXY_IMPLIB): "$(BINDIR)" $(YAZPROXY_DLL_OBJS) $(YAZPP_IMPLIB) - @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" -<< - - -$(YAZPROXY) : "$(BINDIR)" $(YAZPROXY_OBJS) $(YAZPP_IMPLIB) $(YAZPROXY_IMPLIB) - @echo Linking $(YAZPROXY) - $(LINK) @<< - $(LNKOPT) - $(CLIENT_LINK_OPTIONS) - $(LINK_LIBS) - $(YAZPP_IMPLIB) - $(YAZPROXY_IMPLIB) - $(IMPLIB) - $(YAZPROXY_OBJS) - /map:"$(LIBDIR)\yaz-proxy.map" - /out:$(YAZPROXY) -<< -# note that this links a lib, so it uses completely different options. - -########################################################### -############### Special operations -########################################################### - - -############## clean clean: -del $(BINDIR)\*.exe -del $(BINDIR)\*.dll -del $(TMPDIR)\*. - -del $(LIBDIR)\*.MAP -del $(LIBDIR)\*.LIB -del $(OBJDIR)\*.OBJ realclean: clean -# 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! + -del $(ZOOMDIR)\zoom.h -########### check directories and create if needed dirs: $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR) $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):