Release 1.6.4

[yazpp-moved-to-github.git] / win / makefile

diff --git a/win/makefile b/win/makefile
index 09fec77..8c0ddee 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,9 +1,8 @@
-# Copyright (C) 1999-2006, Index Data ApS
-# All rights reserved.
-# $Id: makefile,v 1.18 2007-01-11 12:18:55 adam Exp $
+# 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
@@ -13,14 +12,6 @@ default: all
 
 all: dirs generated dll myclient zclient yaz
 
-NSIS="c:\program files\nsis\makensis-bz2.exe"
-
-nsis: all
-       $(NSIS) yazpp.nsi
-
-nsishelp:
-       $(NSIS)
-
 # Directories
 # The current directory is supposed to be something like
 # ..../yaz/win, everything is relative to that
@@ -34,9 +25,9 @@ SRCDIR=$(ROOTDIR)\src       # for the case we move them under src
 ZOOMDIR=$(ROOTDIR)\zoom
 
 !if $(DEBUG)
-OBJDIR=$(WINDIR)\dobj       # where we store intermediate files
+OBJDIR=$(WINDIR)\dobj
 !else
-OBJDIR=$(WINDIR)\obj        # where we store intermediate files
+OBJDIR=$(WINDIR)\obj
 !endif
 
 TMPDIR=$(ROOTDIR)\win\tmp
@@ -45,20 +36,20 @@ TMP=$(TMPDIR)
 # Targets - what to make
 
 !if $(DEBUG)
-YAZPP_DLL=$(BINDIR)\yazpp_1_d.dll
-YAZPP_IMPLIB=$(LIBDIR)\yazpp_1_d.lib
-YAZD=yazd
+DLL=$(BINDIR)\yazpp6d.dll
+YAZPP_IMPLIB=$(LIBDIR)\yazpp6d.lib
+YAZD=yaz5d
 !else
-YAZPP_DLL=$(BINDIR)\yazpp_1.dll
-YAZPP_IMPLIB=$(LIBDIR)\yazpp_1.lib
-YAZD=yaz
+DLL=$(BINDIR)\yazpp6.dll
+YAZPP_IMPLIB=$(LIBDIR)\yazpp6.lib
+YAZD=yaz5
 !endif
 
 ZCLIENT=$(BINDIR)\zclient.exe
 MY_CLIENT=$(BINDIR)\yaz-my-client.exe
 
 # shortcut names defined here
-dll: $(YAZPP_DLL)
+dll: $(DLL)
 zclient: $(ZCLIENT)
 myclient: $(MY_CLIENT)
 
@@ -113,11 +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)
+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 
 
@@ -129,20 +118,20 @@ CLIENT_LINK_OPTIONS = /subsystem:console
 # Final opt variables
 !if $(DEBUG)
 COPT=   $(COMMON_C_OPTIONS)   $(DEBUG_C_OPTIONS)     $(COMMON_C_INCLUDES)
-RCOPT=  $(COMMON_RC_OPTIONS)  $(DEBUG_RC_OPTIONS)
-LNKOPT= $(COMMON_LNK_OPTIONS) $(DEBUG_LNK_OPTIONS)   $(LNK_LIBS)
+LNKOPT= $(COMMON_LNK_OPTIONS) $(DEBUG_LNK_OPTIONS)
 
 !else
 COPT=   $(COMMON_C_OPTIONS)   $(RELEASE_C_OPTIONS)   $(COMMON_C_INCLUDES) 
-RCOPT=  $(COMMON_RC_OPTIONS)  $(RELEASE_RC_OPTIONS)
-LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) $(LNK_LIBS)
+LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS)
 !endif
 
 # Source and object modules
 
-YAZPP_DLL_OBJS = \
+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" \
@@ -172,58 +161,28 @@ MY_CLIENT_OBJS = \
 ZCLIENT_OBJS = \
    "$(OBJDIR)\zclient.obj"
 
-# Note: This defines where to look for the necessary
-# source files. Funny way of doing it, but it works.
-
 {$(SRCDIR)}.cpp{$(OBJDIR)}.obj:
        $(CPP) $(COPT) $< 
 
 {$(ZOOMDIR)}.cpp{$(OBJDIR)}.obj:
        $(CPP) $(COPT) $< 
 
-### 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"
-
-!if $(DEBUG)
-RSOPT=/d_DEBUG
-!else
-RSOPT=/d_NDEBUG
-!endif
+LINK_DLL = $(LINK) $(LNKOPT) $(LINK_LIBS) $(DLL_LINK_OPTIONS)
+LINK_PROGRAM = $(LINK) $(LNKOPT) $(CLIENT_LINK_OPTIONS) $(LINK_LIBS) $(YAZPP_IMPLIB)
 
-$(YAZPP_DLL) $(YAZPP_IMPLIB): "$(BINDIR)" $(YAZPP_DLL_OBJS)
-       $(LINK) \
-               $(LNKOPT) \
-               $(LINK_LIBS) \
-               $(DLL_LINK_OPTIONS) \
-               $(YAZPP_DLL_OBJS) \
-               /out:"$(YAZPP_DLL)" \
-               /implib:"$(YAZPP_IMPLIB)" 
+$(DLL) $(YAZPP_IMPLIB): "$(BINDIR)" $(DLL_OBJS)
+       $(LINK_DLL) $(DLL_OBJS) /out:$@ /implib:"$(YAZPP_IMPLIB)" 
 
 $(MY_CLIENT) : "$(BINDIR)" $(MY_CLIENT_OBJS) $(YAZPP_IMPLIB)
-       $(LINK) \
-               $(LNKOPT) \
-               $(CLIENT_LINK_OPTIONS) \
-               $(LINK_LIBS)  \
-               $(YAZPP_IMPLIB) \
-               $(MY_CLIENT_OBJS) \
-               /out:$(MY_CLIENT)
+       $(LINK_PROGRAM) $(MY_CLIENT_OBJS) /out:$@
 
 $(ZCLIENT) : "$(BINDIR)" $(ZCLIENT_OBJS) $(YAZPP_IMPLIB)
-       $(LINK) \
-               $(LNKOPT) \
-               $(CLIENT_LINK_OPTIONS) \
-               $(LINK_LIBS) \
-               $(YAZPP_IMPLIB) \
-               $(ZCLIENT_OBJS) \
-               /out:$(ZCLIENT)
+       $(LINK_PROGRAM) $(ZCLIENT_OBJS) /out:$@
 
 generated: $(ZOOMDIR)\zoom.h
 
 "$(ZOOMDIR)\zoom.h": "$(ZOOMDIR)\master-header"
-       sed "s/^*       /       /; s/^*/ /" "$(ZOOMDIR)\master-header" >"$(ZOOMDIR)\zoom.h"
+       sed "s/^*       /       /; s/^*/ /" < "$(ZOOMDIR)\master-header" >"$(ZOOMDIR)\zoom.h"
 
 clean:
        -del $(BINDIR)\*.exe