Put API version in yazpp lib+dll

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

diff --git a/win/makefile b/win/makefile
index 641da64..0a14dae 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
-# Copyright (C) 1995-2005, Index Data ApS
+# Copyright (C) 1995-2006, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.11 2006-04-30 05:52:06 adam Exp $
+# $Id: makefile,v 1.15 2006-04-30 13:04:03 adam Exp $
 
 ###########################################################
 ############### Parameters 
@@ -45,8 +45,16 @@ TMP=$(TMPDIR)
 ############### Targets - what to make
 ###########################################################
 
-YAZPP_DLL=$(BINDIR)\yazpp.dll
-YAZPP_IMPLIB=$(LIBDIR)\yazpp.lib
+!if $(DEBUG)
+YAZPP_DLL=$(BINDIR)\yazpp_1_d.dll
+YAZPP_IMPLIB=$(LIBDIR)\yazpp_1_d.lib
+YAZD=yazd
+!else
+YAZPP_DLL=$(BINDIR)\yazpp_1.dll
+YAZPP_IMPLIB=$(LIBDIR)\yazpp_1.lib
+YAZD=yaz
+!endif
+
 ZCLIENT=$(BINDIR)\zclient.exe
 MY_CLIENT=$(BINDIR)\yaz-my-client.exe
 
@@ -60,15 +68,15 @@ myclient: $(MY_CLIENT)
 ###########################################################
 
 # YAZ includes & libs
-YAZ_LIB="$(YAZ_DIR)\lib\yaz.lib"
+YAZ_LIB="$(YAZ_DIR)\lib\$(YAZD).lib"
 YAZ_DEF=/I"$(YAZ_DIR)\include"
-yaz: $(BINDIR)\yaz.dll $(BINDIR)\yaz.dll
+yaz: $(BINDIR)\$(YAZD).dll $(BINDIR)\$(YAZD).dll
 
-$(BINDIR)\yaz.dll: $(YAZ_DIR)\bin\yaz.dll
-  copy "$(YAZ_DIR)\bin\yaz.dll" $(BINDIR)
+$(BINDIR)\$(YAZD).dll: $(YAZ_DIR)\bin\$(YAZD).dll
+  copy "$(YAZ_DIR)\bin\$(YAZD).dll" $(BINDIR)
 
 COMMON_C_OPTIONS=          \
-  /nologo /W3 /EHsc /FD /c   \
+  /nologo /W3 /EHsc /FD /c \
   /D "_CRT_SECURE_NO_DEPRECATE" \
   $(YAZ_DEF)               \
   /D "_WINDOWS"            \
@@ -83,7 +91,7 @@ COMMON_C_INCLUDES= \
 
 DEBUG_C_OPTIONS=  \
   /D "_DEBUG"      \
-  /MDd  /Od /YX /Zi /Gm
+  /MDd  /Od /Zi /Gm
 
 RELEASE_C_OPTIONS=  \
   /D "NDEBUG"        \
@@ -100,7 +108,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
@@ -109,15 +116,11 @@ RELEASE_C_OPTIONS=  \
 ### Linker options
 LINK=link.exe
 
-LINK_LIBS= kernel32.lib user32.lib   gdi32.lib   \
-           advapi32.lib uuid.lib \
+LINK_LIBS= kernel32.lib user32.lib gdi32.lib advapi32.lib uuid.lib \
            wsock32.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 
 
@@ -222,7 +225,6 @@ $(YAZPP_DLL) $(YAZPP_IMPLIB): "$(BINDIR)" $(YAZPP_DLL_OBJS)
                $(YAZPP_DLL_OBJS)
                /out:"$(YAZPP_DLL)"
                /implib:"$(YAZPP_IMPLIB)"
-               /map:"$(LIBDIR)\yazpp.map"  
 <<
 
 $(MY_CLIENT) : "$(BINDIR)" $(MY_CLIENT_OBJS) $(YAZPP_IMPLIB)