-# Copyright (C) 1993-2004, Index Data ApS
+# Copyright (C) 1998-2009 Index Data
# All rights reserved.
-# $Id: makefile,v 1.3 2004-03-30 18:58:40 adam Exp $
-###########################################################
-############### Parameters
-###########################################################
+# Parameters
DEBUG=0 # 0 for release, 1 for debug
+USE_MANIFEST = 0 # Can be enabled Visual Studio 2005
# 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 generated dll zclient proxy iconv libxml2 libxslt yaz
+all: dirs generated dll myclient zclient yaz
NSIS="c:\program files\nsis\makensis-bz2.exe"
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
+!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
-###########################################################
+# Targets - what to make
-YAZPP_DLL=$(BINDIR)\yazpp.dll
-YAZPROXY_DLL=$(BINDIR)\yazproxy.dll
-YAZPP_IMPLIB=$(LIBDIR)\yazpp.lib
-YAZPROXY_IMPLIB=$(LIBDIR)\yazproxy.lib
+!if $(DEBUG)
+DLL=$(BINDIR)\yazpp3d.dll
+YAZPP_IMPLIB=$(LIBDIR)\yazpp3d.lib
+YAZD=yaz3d
+!else
+DLL=$(BINDIR)\yazpp3.dll
+YAZPP_IMPLIB=$(LIBDIR)\yazpp3.lib
+YAZD=yaz3
+!endif
-YAZPROXY=$(BINDIR)\yaz-proxy.exe
ZCLIENT=$(BINDIR)\zclient.exe
+MY_CLIENT=$(BINDIR)\yaz-my-client.exe
# shortcut names defined here
-dll: $(YAZPP_DLL) $(YAZPROXY_DLL)
-proxy: $(YAZPROXY)
+dll: $(DLL)
zclient: $(ZCLIENT)
+myclient: $(MY_CLIENT)
-###########################################################
-############### Compiler and linker options
-###########################################################
+# Compiler and linker options
-YAZ_LIB="$(YAZ_DIR)\lib\yaz.lib"
+# YAZ includes & libs
+YAZ_LIB="$(YAZ_DIR)\lib\$(YAZD).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)
-!else
-ICONV_DEF= \
- /D HAVE_ICONV_H=0
-ICONV_LIB=
-iconv:
-
-!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)
-
-$(BINDIR)\zlib.dll:
- copy "$(ZLIB_DIR)\lib\zlib.dll" $(BINDIR)
-
-!else
-LIBXML2_LIB=
-LIBXML2_DEF=/D HAVE_XML2=0
-libxml2:
-
-!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)
-
-!else
-LIBXSLT_LIB=
-LIBXSLT_DEF=/D HAVE_XSLT=0
-libxslt:
-
-!endif
+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" \
DEBUG_C_OPTIONS= \
/D "_DEBUG" \
- /MDd /Od /YX /Zi /Gm
+ /MDd /Od /Zi /Gm
RELEASE_C_OPTIONS= \
/D "NDEBUG" \
# /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
### 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 /machine:i386 /incremental:no
DEBUG_LNK_OPTIONS= /debug
# 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)
!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)
!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" \
"$(OBJDIR)\zrs.obj" \
"$(OBJDIR)\zrec.obj"
-YAZPROXY_DLL_OBJS = \
- "$(OBJDIR)\yaz-proxy.obj" \
- "$(OBJDIR)\yaz-proxy-config.obj" \
- "$(OBJDIR)\yaz-bw.obj"
+MY_CLIENT_OBJS = \
+ "$(OBJDIR)\yaz-my-client.obj"
ZCLIENT_OBJS = \
"$(OBJDIR)\zclient.obj"
-###########################################################
-############### Compiling
-###########################################################
-
# Note: This defines where to look for the necessary
# source files. Funny way of doing it, but it works.
-{$(PROXYDIR)}.cpp{$(OBJDIR)}.obj:
- @$(CPP) $(COPT) $<
-
{$(SRCDIR)}.cpp{$(OBJDIR)}.obj:
$(CPP) $(COPT) $<
{$(ZOOMDIR)}.cpp{$(OBJDIR)}.obj:
$(CPP) $(COPT) $<
-###########################################################
-############### Resources
-###########################################################
-
### 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"
-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
-###########################################################
-
-$(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)
-<<
+!if $(USE_MANIFEST)
+MT=mt.exe /nologo
+!else
+MT=echo
+!endif
+
+
+LINK_DLL = $(LINK) $(LNKOPT) $(LINK_LIBS) $(DLL_LINK_OPTIONS)
+LINK_PROGRAM = $(LINK) $(LNKOPT) $(CLIENT_LINK_OPTIONS) $(LINK_LIBS) $(YAZPP_IMPLIB)
+
+
+$(DLL) $(YAZPP_IMPLIB): "$(BINDIR)" $(DLL_OBJS)
+ $(LINK_DLL) $(DLL_OBJS) /out:$@ /implib:"$(YAZPP_IMPLIB)"
+ $(MT) -manifest $@.manifest -outputresource:$@;2
+
+$(MY_CLIENT) : "$(BINDIR)" $(MY_CLIENT_OBJS) $(YAZPP_IMPLIB)
+ $(LINK_PROGRAM) $(MY_CLIENT_OBJS) /out:$@
+ $(MT) -manifest $@.manifest -outputresource:$@;1
$(ZCLIENT) : "$(BINDIR)" $(ZCLIENT_OBJS) $(YAZPP_IMPLIB)
- @echo Linking $(ZCLIENT)
- $(LINK) @<<
- $(LNKOPT)
- $(CLIENT_LINK_OPTIONS)
- $(LINK_LIBS)
- $(YAZPP_IMPLIB)
- $(IMPLIB)
- $(ZCLIENT_OBJS)
- /map:"$(LIBDIR)\zclient.map"
- /out:$(ZCLIENT)
-<<
-
-
-###########################################################
-############### Generated SOurce files
-###########################################################
+ $(LINK_PROGRAM) $(ZCLIENT_OBJS) /out:$@
+ $(MT) -manifest $@.manifest -outputresource:$@;1
generated: $(ZOOMDIR)\zoom.h
"$(ZOOMDIR)\zoom.h": "$(ZOOMDIR)\master-header"
sed "s/^* / /; s/^*/ /" "$(ZOOMDIR)\master-header" >"$(ZOOMDIR)\zoom.h"
-############## 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)
$(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):