nmake: no manifest by default

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

diff --git a/win/makefile b/win/makefile
index b301d80..f3f16f3 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,10 +1,10 @@
-# Copyright (C) 1998-2008 Index Data
-# All rights reserved.
+# 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 = 0 # Can be enabled Visual Studio 2005, 2008
 
 # YAZ
 YAZ_DIR=..\..\yaz
@@ -13,14 +13,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
@@ -45,13 +37,13 @@ TMP=$(TMPDIR)
 # Targets - what to make
 
 !if $(DEBUG)
-DLL=$(BINDIR)\yazpp3d.dll
-YAZPP_IMPLIB=$(LIBDIR)\yazpp3d.lib
-YAZD=yaz3d
+DLL=$(BINDIR)\yazpp6d.dll
+YAZPP_IMPLIB=$(LIBDIR)\yazpp6d.lib
+YAZD=yaz5d
 !else
-DLL=$(BINDIR)\yazpp3.dll
-YAZPP_IMPLIB=$(LIBDIR)\yazpp3.lib
-YAZD=yaz3
+DLL=$(BINDIR)\yazpp6.dll
+YAZPP_IMPLIB=$(LIBDIR)\yazpp6.lib
+YAZD=yaz5
 !endif
 
 ZCLIENT=$(BINDIR)\zclient.exe
@@ -115,7 +107,7 @@ LINK=link.exe
 
 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 
 
@@ -139,8 +131,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" \
@@ -193,8 +187,10 @@ RSOPT=/d_NDEBUG
 
 !if $(USE_MANIFEST)
 MT=mt.exe /nologo
+MTOPT=/manifest
 !else
 MT=echo
+MTOPT=
 !endif
 
 
@@ -217,12 +213,13 @@ $(ZCLIENT) : "$(BINDIR)" $(ZCLIENT_OBJS) $(YAZPP_IMPLIB)
 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
        -del $(BINDIR)\*.dll
        -del $(TMPDIR)\*.
+       -del $(BINDIR)\*.manifest
        -del $(LIBDIR)\*.LIB
        -del $(OBJDIR)\*.OBJ