X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=b5ee8aa806e9bfd244d51800461c8e760c2d1759;hb=bb79c77f6fdcc29e886082a96c50e02405d6a9d3;hp=bff38de91337e7f67935b916e15322f57d68d2f7;hpb=b200a151ba181895b6da93b37005c9a36ea84652;p=yazpp-moved-to-github.git diff --git a/win/makefile b/win/makefile index bff38de..b5ee8aa 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.4 2004-04-11 17:49:36 adam Exp $ ########################################################### ############### Parameters @@ -11,27 +11,9 @@ DEBUG=0 # 0 for release, 1 for debug # YAZ YAZ_DIR=c:\yaz -# iconv charcter conversion utility -HAVE_ICONV=1 -ICONV_DIR = c:\iconv-1.9.1.win32 - -# libxslt -HAVE_LIBXSLT=1 -LIBXSLT_DIR=c:\libxslt-1.1.4.win32 - -# libxml2 (used by libxslt) -HAVE_LIBXML2=1 -LIBXML2_DIR=c:\libxml2-2.6.7.win32 - -# zlib compression (used by libxml2) -ZLIB_DIR = c:\zlib-1.1.4.win32 - -# get WIN32 binaries for libxslt, libxml, iconv, zlib from here: -# http://www.zlatkovic.com/libxml.en.html - default: all -all: dirs dll proxy iconv libxml2 libxslt +all: dirs generated dll zclient yaz NSIS="c:\program files\nsis\makensis-bz2.exe" @@ -65,15 +47,12 @@ TMP=$(TMPDIR) ########################################################### YAZPP_DLL=$(BINDIR)\yazpp.dll -YAZPROXY_DLL=$(BINDIR)\yazproxy.dll 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) +dll: $(YAZPP_DLL) +zclient: $(ZCLIENT) ########################################################### ############### Compiler and linker options @@ -81,58 +60,10 @@ proxy: $(YAZPROXY) YAZ_LIB="$(YAZ_DIR)\lib\yaz.lib" YAZ_DEF=/I"$(YAZ_DIR)\include" +yaz: $(BINDIR)\yaz.dll $(BINDIR)\yaz.dll -!if $(HAVE_ICONV) -ICONV_DEF= \ - /D HAVE_ICONV_H=1 \ - /I"$(ICONV_DIR)\include" -ICONV_LIB= \ - "$(ICONV_DIR)\lib\iconv.lib" -iconv: $(BINDIR)\iconv.dll - -$(BINDIR)\iconv.dll: - copy "$(ICONV_DIR)\lib\iconv.dll" $(BINDIR) -!else -ICONV_DEF= \ - /D HAVE_ICONV_H=0 -ICONV_LIB= -iconv: - -!endif - -!if $(HAVE_LIBXML2) -LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib" -LIBXML2_DEF=/D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include" -libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib.dll - -$(BINDIR)\libxml2.dll: - copy "$(LIBXML2_DIR)\lib\libxml2.dll" $(BINDIR) - -$(BINDIR)\zlib.dll: - copy "$(ZLIB_DIR)\lib\zlib.dll" $(BINDIR) - -!else -LIBXML2_LIB= -LIBXML2_DEF=/D HAVE_XML2=0 -libxml2: - -!endif - -!if $(HAVE_LIBXSLT) -LIBXSLT_LIB="$(LIBXSLT_DIR)\lib\libxslt.lib" -LIBXSLT_DEF=/D HAVE_XSLT=1 /I"$(LIBXSLT_DIR)\include" -libxslt: $(BINDIR)\libxslt.dll $(BINDIR)\zlib.dll - -$(BINDIR)\libxslt.dll: - copy "$(LIBXSLT_DIR)\lib\libxslt.dll" $(BINDIR) - -!else -LIBXSLT_LIB= -LIBXSLT_DEF=/D HAVE_XSLT=0 -libxslt: - -!endif - +$(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 @@ -140,10 +71,7 @@ libxslt: COMMON_C_OPTIONS= \ /nologo /W3 /GX /FD /c \ - $(ICONV_DEF) \ $(YAZ_DEF) \ - $(LIBXML2_DEF) \ - $(LIBXSLT_DEF) \ /D "_WINDOWS" \ /D "WIN32" \ /D "HAVE_WCHAR_H=1" \ @@ -219,9 +147,6 @@ TCLOPT= $(COMMON_TCL_OPTIONS) ############### Source and object modules ########################################################### -YAZPROXY_OBJS= \ - "$(OBJDIR)\yaz-proxy-main.obj" - YAZPP_DLL_OBJS = \ "$(OBJDIR)\yaz-socket-manager.obj" \ "$(OBJDIR)\yaz-pdu-assoc.obj" \ @@ -235,12 +160,15 @@ 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 +ZCLIENT_OBJS = \ + "$(OBJDIR)\zclient.obj" ########################################################### ############### Compiling @@ -249,11 +177,6 @@ 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,42 +217,31 @@ $(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) - @echo Linking $(YAZPROXY_DLL) - $(LINK) @<< - $(LNKOPT) - $(LINK_LIBS) - $(DLL_LINK_OPTIONS) - $(YAZPROXY_DLL_OBJS) - /out:$(YAZPROXY_DLL) - /implib:"$(YAZPROXY_IMPLIB)" - /map:"$(LIBDIR)\yazproxy.map" -<< - - -$(YAZPROXY) : "$(BINDIR)" $(YAZPROXY_OBJS) $(YAZPP_IMPLIB) $(YAZPROXY_IMPLIB) - @echo Linking $(YAZPROXY) +$(ZCLIENT) : "$(BINDIR)" $(ZCLIENT_OBJS) $(YAZPP_IMPLIB) + @echo Linking $(ZCLIENT) $(LINK) @<< $(LNKOPT) $(CLIENT_LINK_OPTIONS) $(LINK_LIBS) $(YAZPP_IMPLIB) - $(YAZPROXY_IMPLIB) - $(IMPLIB) - $(YAZPROXY_OBJS) - /map:"$(LIBDIR)\yaz-proxy.map" - /out:$(YAZPROXY) + $(ZCLIENT_OBJS) + /map:"$(LIBDIR)\zclient.map" + /out:$(ZCLIENT) << -# note that this links a lib, so it uses completely different options. + ########################################################### -############### 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 +253,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!