X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=win%2Fmakefile;h=54766e03855e2458d93c56b0b7e24350ead14c5f;hb=4747b581a54bf1a0e80eefd324b3096b03399821;hp=bff38de91337e7f67935b916e15322f57d68d2f7;hpb=b200a151ba181895b6da93b37005c9a36ea84652;p=yazpp-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index bff38de..54766e0 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
 # Copyright (C) 1993-2004, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.1 2004-03-30 17:42:25 adam Exp $
+# $Id: makefile,v 1.3 2004-03-30 18:58:40 adam Exp $
 
 ###########################################################
 ############### Parameters 
@@ -31,7 +31,7 @@ ZLIB_DIR = c:\zlib-1.1.4.win32
 
 default: all
 
-all: dirs dll proxy iconv libxml2 libxslt
+all: dirs generated dll zclient proxy iconv libxml2 libxslt yaz
 
 NSIS="c:\program files\nsis\makensis-bz2.exe"
 
@@ -70,10 +70,12 @@ YAZPP_IMPLIB=$(LIBDIR)\yazpp.lib
 YAZPROXY_IMPLIB=$(LIBDIR)\yazproxy.lib
 
 YAZPROXY=$(BINDIR)\yaz-proxy.exe
+ZCLIENT=$(BINDIR)\zclient.exe
 
 # shortcut names defined here
 dll: $(YAZPP_DLL) $(YAZPROXY_DLL)
 proxy: $(YAZPROXY)
+zclient: $(ZCLIENT)
 
 ###########################################################
 ############### Compiler and linker options 
@@ -81,6 +83,10 @@ proxy: $(YAZPROXY)
 
 YAZ_LIB="$(YAZ_DIR)\lib\yaz.lib"
 YAZ_DEF=/I"$(YAZ_DIR)\include"
+yaz: $(BINDIR)\yaz.dll $(BINDIR)\yaz.dll
+
+$(BINDIR)\yaz.dll: $(YAZ_DIR)\bin\yaz.dll
+  copy "$(YAZ_DIR)\bin\yaz.dll" $(BINDIR)
 
 !if $(HAVE_ICONV)
 ICONV_DEF= \
@@ -235,12 +241,20 @@ YAZPP_DLL_OBJS = \
    "$(OBJDIR)\yaz-z-server-update.obj" \
    "$(OBJDIR)\yaz-z-databases.obj" \
    "$(OBJDIR)\yaz-z-cache.obj" \
-   "$(OBJDIR)\yaz-cql2rpn.obj"
+   "$(OBJDIR)\yaz-cql2rpn.obj" \
+   "$(OBJDIR)\zexcept.obj" \
+   "$(OBJDIR)\zconn.obj" \
+   "$(OBJDIR)\zquery.obj" \
+   "$(OBJDIR)\zrs.obj" \
+   "$(OBJDIR)\zrec.obj"
 
 YAZPROXY_DLL_OBJS = \
    "$(OBJDIR)\yaz-proxy.obj" \
    "$(OBJDIR)\yaz-proxy-config.obj" \
-   "$(OBJDIR)\yaz-bw.obj
+   "$(OBJDIR)\yaz-bw.obj"
+
+ZCLIENT_OBJS = \
+   "$(OBJDIR)\zclient.obj"
 
 ###########################################################
 ############### Compiling 
@@ -249,11 +263,9 @@ YAZPROXY_DLL_OBJS = \
 # Note: This defines where to look for the necessary
 # source files. Funny way of doing it, but it works.
 
-# yaz proxy
 {$(PROXYDIR)}.cpp{$(OBJDIR)}.obj:
 	@$(CPP) $(COPT) $<
 
-# Various YAZ source directories
 {$(SRCDIR)}.cpp{$(OBJDIR)}.obj:
 	$(CPP) $(COPT) $< 
 
@@ -294,16 +306,17 @@ $(YAZPP_DLL) $(YAZPP_IMPLIB): "$(BINDIR)" $(YAZPP_DLL_OBJS)
 		$(DLL_LINK_OPTIONS)
 		$(YAZPP_DLL_OBJS)
 		/out:"$(YAZPP_DLL)"
-		/implib:$(YAZPP_IMPLIB)
+		/implib:"$(YAZPP_IMPLIB)"
 		/map:"$(LIBDIR)\yazpp.map"  
 <<
 
-$(YAZPROXY_DLL) $(YAZPROXY_IMPLIB): "$(BINDIR)" $(YAZPROXY_DLL_OBJS)
+$(YAZPROXY_DLL) $(YAZPROXY_IMPLIB): "$(BINDIR)" $(YAZPROXY_DLL_OBJS) $(YAZPP_IMPLIB)
 	@echo Linking $(YAZPROXY_DLL)
 	$(LINK) @<<
 		$(LNKOPT) 
 		$(LINK_LIBS) 
 		$(DLL_LINK_OPTIONS)
+		$(YAZPP_IMPLIB)
 		$(YAZPROXY_DLL_OBJS)
 		/out:$(YAZPROXY_DLL) 
 		/implib:"$(YAZPROXY_IMPLIB)"
@@ -324,12 +337,29 @@ $(YAZPROXY) : "$(BINDIR)" $(YAZPROXY_OBJS) $(YAZPP_IMPLIB) $(YAZPROXY_IMPLIB)
 		/map:"$(LIBDIR)\yaz-proxy.map"
 		/out:$(YAZPROXY)
 <<
-# note that this links a lib, so it uses completely different options.
+
+$(ZCLIENT) : "$(BINDIR)" $(ZCLIENT_OBJS) $(YAZPP_IMPLIB)
+	@echo Linking $(ZCLIENT)
+	$(LINK) @<<
+        $(LNKOPT) 
+		$(CLIENT_LINK_OPTIONS)
+		$(LINK_LIBS) 
+            $(YAZPP_IMPLIB)
+		$(IMPLIB)
+		$(ZCLIENT_OBJS)
+		/map:"$(LIBDIR)\zclient.map"
+		/out:$(ZCLIENT)
+<<
+
 
 ###########################################################
-############### Special operations
+############### Generated SOurce files
 ###########################################################
 
+generated: $(ZOOMDIR)\zoom.h
+
+"$(ZOOMDIR)\zoom.h": "$(ZOOMDIR)\master-header"
+	sed "s/^*	/	/; s/^*/ /" "$(ZOOMDIR)\master-header" >"$(ZOOMDIR)\zoom.h"
 
 ############## clean
 clean:
@@ -341,6 +371,8 @@ clean:
 	-del $(OBJDIR)\*.OBJ
 
 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!