X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=win%2Fmakefile;h=641da64301dc6285410dd872da4e14548498785f;hb=ff61fa576933d620166732a19cd11a1c2a760914;hp=b5ee8aa806e9bfd244d51800461c8e760c2d1759;hpb=bb79c77f6fdcc29e886082a96c50e02405d6a9d3;p=yazpp-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index b5ee8aa..641da64 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
-# Copyright (C) 1993-2004, Index Data ApS
+# Copyright (C) 1995-2005, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.4 2004-04-11 17:49:36 adam Exp $
+# $Id: makefile,v 1.11 2006-04-30 05:52:06 adam Exp $
 
 ###########################################################
 ############### Parameters 
@@ -9,11 +9,11 @@
 DEBUG=0   # 0 for release, 1 for debug
 
 # YAZ
-YAZ_DIR=c:\yaz
+YAZ_DIR=..\..\yaz
 
 default: all
 
-all: dirs generated dll zclient yaz
+all: dirs generated dll myclient zclient yaz
 
 NSIS="c:\program files\nsis\makensis-bz2.exe"
 
@@ -28,7 +28,7 @@ nsishelp:
 ###########################################################
 # The current directory is supposed to be something like
 # ..../yaz/win, everything is relative to that
-ROOTDIR=..   # The home of yaz++
+ROOTDIR=..   # The home of yazpp
 
 INCLDIR=$(ROOTDIR)\include  # our includes
 LIBDIR=$(ROOTDIR)\lib       # We produce .lib, .exp etc there
@@ -36,7 +36,6 @@ 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
 
 TMPDIR=$(ROOTDIR)\win\tmp
@@ -49,15 +48,18 @@ TMP=$(TMPDIR)
 YAZPP_DLL=$(BINDIR)\yazpp.dll
 YAZPP_IMPLIB=$(LIBDIR)\yazpp.lib
 ZCLIENT=$(BINDIR)\zclient.exe
+MY_CLIENT=$(BINDIR)\yaz-my-client.exe
 
 # shortcut names defined here
 dll: $(YAZPP_DLL)
 zclient: $(ZCLIENT)
+myclient: $(MY_CLIENT)
 
 ###########################################################
 ############### Compiler and linker options 
 ###########################################################
 
+# YAZ includes & libs
 YAZ_LIB="$(YAZ_DIR)\lib\yaz.lib"
 YAZ_DEF=/I"$(YAZ_DIR)\include"
 yaz: $(BINDIR)\yaz.dll $(BINDIR)\yaz.dll
@@ -65,12 +67,9 @@ yaz: $(BINDIR)\yaz.dll $(BINDIR)\yaz.dll
 $(BINDIR)\yaz.dll: $(YAZ_DIR)\bin\yaz.dll
   copy "$(YAZ_DIR)\bin\yaz.dll" $(BINDIR)
 
-### C and CPP compiler  (the same thing)
-# Note: $(CPP) has already been defined in the environment
-# (if you set things up right!)
-
 COMMON_C_OPTIONS=          \
-  /nologo /W3 /GX /FD /c   \
+  /nologo /W3 /EHsc /FD /c   \
+  /D "_CRT_SECURE_NO_DEPRECATE" \
   $(YAZ_DEF)               \
   /D "_WINDOWS"            \
   /D "WIN32"               \
@@ -113,7 +112,7 @@ LINK=link.exe
 LINK_LIBS= kernel32.lib user32.lib   gdi32.lib   \
            advapi32.lib uuid.lib \
            wsock32.lib  advapi32.lib \
-           $(YAZ_LIB) $(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
+           $(YAZ_LIB)
 
 COMMON_LNK_OPTIONS= /nologo \
                     /subsystem:windows \
@@ -130,17 +129,13 @@ CLIENT_LINK_OPTIONS = /subsystem:console
 # Final opt variables
 !if $(DEBUG)
 COPT=   $(COMMON_C_OPTIONS)   $(DEBUG_C_OPTIONS)     $(COMMON_C_INCLUDES)
-MTLOPT= $(COMMON_MTL_OPTIONS) $(DEBUG_MTL_OPTIONS)
 RCOPT=  $(COMMON_RC_OPTIONS)  $(DEBUG_RC_OPTIONS)
 LNKOPT= $(COMMON_LNK_OPTIONS) $(DEBUG_LNK_OPTIONS)   $(LNK_LIBS)
-TCLOPT= $(COMMON_TCL_OPTIONS)
 
 !else
 COPT=   $(COMMON_C_OPTIONS)   $(RELEASE_C_OPTIONS)   $(COMMON_C_INCLUDES) 
-MTLOPT= $(COMMON_MTL_OPTIONS) $(RELEASE_MTL_OPTIONS)
 RCOPT=  $(COMMON_RC_OPTIONS)  $(RELEASE_RC_OPTIONS)
 LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) $(LNK_LIBS)
-TCLOPT= $(COMMON_TCL_OPTIONS)
 !endif
 
 ###########################################################
@@ -148,6 +143,12 @@ TCLOPT= $(COMMON_TCL_OPTIONS)
 ###########################################################
 
 YAZPP_DLL_OBJS = \
+   "$(OBJDIR)\gdu.obj" \
+   "$(OBJDIR)\gduqueue.obj" \
+   "$(OBJDIR)\pdu-observer.obj" \
+   "$(OBJDIR)\query.obj" \
+   "$(OBJDIR)\socket-observer.obj" \
+   "$(OBJDIR)\z-server.obj" \
    "$(OBJDIR)\yaz-socket-manager.obj" \
    "$(OBJDIR)\yaz-pdu-assoc.obj" \
    "$(OBJDIR)\yaz-z-assoc.obj" \
@@ -167,6 +168,9 @@ YAZPP_DLL_OBJS = \
    "$(OBJDIR)\zrs.obj" \
    "$(OBJDIR)\zrec.obj"
 
+MY_CLIENT_OBJS = \
+   "$(OBJDIR)\yaz-my-client.obj"
+
 ZCLIENT_OBJS = \
    "$(OBJDIR)\zclient.obj"
 
@@ -221,6 +225,18 @@ $(YAZPP_DLL) $(YAZPP_IMPLIB): "$(BINDIR)" $(YAZPP_DLL_OBJS)
 		/map:"$(LIBDIR)\yazpp.map"  
 <<
 
+$(MY_CLIENT) : "$(BINDIR)" $(MY_CLIENT_OBJS) $(YAZPP_IMPLIB)
+	@echo Linking $(MY_CLIENT)
+	$(LINK) @<<
+        $(LNKOPT) 
+		$(CLIENT_LINK_OPTIONS)
+		$(LINK_LIBS) 
+            	$(YAZPP_IMPLIB)
+		$(MY_CLIENT_OBJS)
+		/map:"$(LIBDIR)\yaz-my-client.map"
+		/out:$(MY_CLIENT)
+<<
+
 $(ZCLIENT) : "$(BINDIR)" $(ZCLIENT_OBJS) $(YAZPP_IMPLIB)
 	@echo Linking $(ZCLIENT)
 	$(LINK) @<<
@@ -235,7 +251,7 @@ $(ZCLIENT) : "$(BINDIR)" $(ZCLIENT_OBJS) $(YAZPP_IMPLIB)
 
 
 ###########################################################
-############### Generated SOurce files
+############### Generated Source files
 ###########################################################
 
 generated: $(ZOOMDIR)\zoom.h
@@ -255,11 +271,6 @@ clean:
 realclean: clean
 	-del $(ZOOMDIR)\zoom.h
 
-# 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)
 
 $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):