Happy new year

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

diff --git a/win/makefile b/win/makefile
index 3be6c60..25b78cc 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,11 +1,10 @@
-# Copyright (C) 1999-2006, Index Data ApS
-# All rights reserved.
-# $Id: makefile,v 1.20 2007-06-14 08:27:20 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
-USE_MANIFEST = 0 # Can be enabled Visual Studio 2005
+USE_MANIFEST = 1 # Can be enabled Visual Studio 2005
 
 # YAZ
 YAZ_DIR=..\..\yaz
@@ -46,13 +45,13 @@ TMP=$(TMPDIR)
 # Targets - what to make
 
 !if $(DEBUG)
-DLL=$(BINDIR)\yazpp2d.dll
-YAZPP_IMPLIB=$(LIBDIR)\yazpp2d.lib
-YAZD=yaz3d
+DLL=$(BINDIR)\yazpp6d.dll
+YAZPP_IMPLIB=$(LIBDIR)\yazpp6d.lib
+YAZD=yaz5d
 !else
-DLL=$(BINDIR)\yazpp2.dll
-YAZPP_IMPLIB=$(LIBDIR)\yazpp2.lib
-YAZD=yaz3
+DLL=$(BINDIR)\yazpp6.dll
+YAZPP_IMPLIB=$(LIBDIR)\yazpp6.lib
+YAZD=yaz5
 !endif
 
 ZCLIENT=$(BINDIR)\zclient.exe
@@ -114,11 +113,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
 
 DEBUG_LNK_OPTIONS= /debug 
 
@@ -142,8 +139,10 @@ LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) $(LNK_LIBS)
 # 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" \