X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=aff8420d29fac026af95c663725aec2755613b4f;hp=408b0deb74967df00b4446614cc1702bab267c8c;hb=59ff238376a0cb923b3e988d1601bb60bc9d4be2;hpb=10af4479ca947184854af2b9dbd02961d614030f

diff --git a/win/makefile b/win/makefile
index 408b0de..aff8420 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,5 @@
-# Copyright (C) 1993-2006, Index Data ApS
+# Copyright (C) 1998-2008 Index Data
 # All rights reserved.
-# $Id: makefile,v 1.6 2006-04-30 13:15:07 adam Exp $
 
 ###########################################################
 ############### Parameters 
@@ -14,18 +13,18 @@ YAZPP_DIR=..\..\yazpp
 
 # iconv charcter conversion utility
 HAVE_ICONV=1
-ICONV_DIR = c:\iconv-1.9.1.win32
+ICONV_DIR=\iconv-1.9.2.win32
 
 # libxslt
 HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.14.win32
+LIBXSLT_DIR=\libxslt-1.1.23+.win32
 
 # libxml2 (used by libxslt)
 HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.6.20.win32
+LIBXML2_DIR=\libxml2-2.6.32+.win32
 
 # zlib compression (used by libxml2)
-ZLIB_DIR = c:\zlib-1.2.3.win32
+ZLIB_DIR=\zlib-1.2.3.win32
 
 # get WIN32 binaries for libxslt, libxml, iconv, zlib from here:
 # http://www.zlatkovic.com/libxml.en.html
@@ -42,9 +41,6 @@ nsis: all
 nsishelp:
 	$(NSIS)
 
-###########################################################
-############### Directories
-###########################################################
 # The current directory is supposed to be something like
 # ..../yaz/win, everything is relative to that
 ROOTDIR=..   # The home of yaz++
@@ -53,45 +49,43 @@ 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
-###########################################################
-
-YAZPROXY_DLL=$(BINDIR)\yazproxy.dll
-YAZPROXY_IMPLIB=$(LIBDIR)\yazproxy.lib
+YAZPROXY_DLL=$(BINDIR)\yazproxy2.dll
+YAZPROXY_IMPLIB=$(LIBDIR)\yazproxy2.lib
 
 YAZPROXY=$(BINDIR)\yazproxy.exe
 
 # shortcut names defined here
 dll: $(YAZPROXY_DLL)
 proxy: $(YAZPROXY)
-###########################################################
-############### Compiler and linker options 
-###########################################################
 
 !if $(DEBUG)
-YAZD=yazd
-YAZPPD=yazpp_1_d
+YAZD=yaz3d
+YAZPPD=yazpp3d
 !else
-YAZD=yaz
-YAZPPD=yazpp_1
+YAZD=yaz3
+YAZPPD=yazpp3
 !endif
 
 # YAZ includes & libs
 YAZ_LIB="$(YAZ_DIR)\lib\$(YAZD).lib"
-YAZ_DEF=/DYAZ_USE_NEW_LOG=1 /I"$(YAZ_DIR)\include"
+YAZ_DEF=/DYAZ_HAVE_XML2=1 /DYAZ_USE_NEW_LOG=1 /I"$(YAZ_DIR)\include"
 
 # Copy yaz.dll to our bin
 yaz: $(BINDIR)\$(YAZD).dll
-$(BINDIR)\$(YAZD).dll: $(YAZ_DIR)\bin\$(YAZD).dll
+$(BINDIR)\$(YAZD).dll: "$(YAZ_DIR)\bin\$(YAZD).dll"
   copy "$(YAZ_DIR)\bin\$(YAZD).dll" $(BINDIR)
 
 # YAZ++ includes & libs
@@ -100,7 +94,7 @@ YAZPP_DEF=/I"$(YAZPP_DIR)\include"
 
 # Copy yazpp.dll to our bin
 yazpp: $(BINDIR)\$(YAZPPD).dll
-$(BINDIR)\$(YAZPPD).dll: $(YAZPP_DIR)\bin\$(YAZPPD).dll
+$(BINDIR)\$(YAZPPD).dll: "$(YAZPP_DIR)\bin\$(YAZPPD).dll"
   copy "$(YAZPP_DIR)\bin\$(YAZPPD).dll" $(BINDIR)
 
 !if $(HAVE_ICONV)
@@ -141,7 +135,7 @@ libxml2:
 
 !if $(HAVE_LIBXSLT)
 LIBXSLT_LIB="$(LIBXSLT_DIR)\lib\libxslt.lib"
-LIBXSLT_DEF=/D HAVE_XSLT=1 /I"$(LIBXSLT_DIR)\include"
+LIBXSLT_DEF=/D YAZ_HAVE_XSLT=1 /I"$(LIBXSLT_DIR)\include"
 libxslt: $(BINDIR)\libxslt.dll $(BINDIR)\zlib1.dll
 
 $(BINDIR)\libxslt.dll:
@@ -149,7 +143,7 @@ $(BINDIR)\libxslt.dll:
 
 !else
 LIBXSLT_LIB=
-LIBXSLT_DEF=/D HAVE_XSLT=0
+LIBXSLT_DEF=/D YAZ_HAVE_XSLT=0
 libxslt: 
 
 !endif
@@ -160,7 +154,8 @@ libxslt:
 # (if you set things up right!)
 
 COMMON_C_OPTIONS=          \
-  /nologo /W3 /GX /FD /c   \
+  /nologo /W3 /EHsc /FD /c \
+  /D "_CRT_SECURE_NO_DEPRECATE" \
   $(ICONV_DEF)             \
   $(YAZ_DEF)               \
   $(YAZPP_DEF)             \
@@ -178,14 +173,14 @@ COMMON_C_INCLUDES= \
 
 DEBUG_C_OPTIONS=  \
   /D "_DEBUG"      \
-  /MDd  /Od /YX /Zi /Gm
+  /MDd  /Od /Zi /Gm
 
 RELEASE_C_OPTIONS=  \
   /D "NDEBUG"        \
   /MD /O2
 
 # /W3  = warning level
-# /GX  = Enable exception handling
+# /EHsc= Enable exception handling
 # /FD  = Generate file dependencies (what ever they are)
 # /c   = compile without linking
 # /FR  = Generate browse info (.sbr file that gets combined into .bsc)
@@ -195,7 +190,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
@@ -204,15 +198,14 @@ RELEASE_C_OPTIONS=  \
 ### Linker options
 LINK=link.exe
 
-LINK_LIBS= kernel32.lib user32.lib   gdi32.lib   \
-           advapi32.lib uuid.lib \
-           wsock32.lib  advapi32.lib \
+LINK_LIBS=kernel32.lib advapi32.lib ws2_32.lib \
            $(YAZ_LIB) $(YAZPP_LIB) $(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_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 
 
@@ -237,9 +230,7 @@ LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) $(LNK_LIBS)
 TCLOPT= $(COMMON_TCL_OPTIONS)
 !endif
 
-###########################################################
-###############  Source and object modules
-###########################################################
+# Source and object modules
 
 YAZPROXY_OBJS= \
    "$(OBJDIR)\yaz-proxy-main.obj"
@@ -274,67 +265,45 @@ 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
 ###########################################################
 
 $(YAZPROXY_DLL) $(YAZPROXY_IMPLIB): "$(BINDIR)" $(YAZPROXY_DLL_OBJS)
-	@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"  
-<<
+	$(LINK) \
+		$(LNKOPT)  \
+		$(LINK_LIBS)  \
+		$(DLL_LINK_OPTIONS) \
+		$(YAZPP_IMPLIB) \
+		$(YAZPROXY_DLL_OBJS) \
+		/out:$(YAZPROXY_DLL)  \
+		/implib:"$(YAZPROXY_IMPLIB)" \
 
 $(YAZPROXY) : "$(BINDIR)" $(YAZPROXY_OBJS) $(YAZPROXY_IMPLIB)
-	@echo Linking $(YAZPROXY)
-	$(LINK) @<<
-        $(LNKOPT) 
-		$(CLIENT_LINK_OPTIONS)
-		$(LINK_LIBS) 
-            $(YAZPP_IMPLIB)
-	      $(YAZPROXY_IMPLIB)
-		$(YAZPROXY_OBJS)
-		/map:"$(LIBDIR)\yazproxy.map"
+	$(LINK) \
+        	$(LNKOPT)  \
+		$(CLIENT_LINK_OPTIONS) \
+		$(LINK_LIBS)  \
+		$(YAZPP_IMPLIB) \
+		$(YAZPROXY_IMPLIB) \
+		$(YAZPROXY_OBJS) \
 		/out:$(YAZPROXY)
-<<
 
-###########################################################
-############### Generated Source files
-###########################################################
-
-############## clean
 clean:
 	-del $(BINDIR)\*.exe
 	-del $(BINDIR)\*.dll
 	-del $(TMPDIR)\*.
-	-del $(LIBDIR)\*.MAP
 	-del $(LIBDIR)\*.LIB
 	-del $(OBJDIR)\*.OBJ
 
 realclean: clean
 
-# 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)