X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=win%2Fmakefile;h=c367e7a22965e15def4e02950e764f2db2a0bb41;hb=c57d9273dedac129b03d17cb8f6825d180631fd2;hp=b06a6cbdedc50af064a956950161db4f65873ffc;hpb=44672975f94d9b1c3975fbae4452c07bd9578269;p=yazpp-moved-to-github.git diff --git a/win/makefile b/win/makefile index b06a6cb..c367e7a 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.5 2004-04-11 17:53:03 adam Exp $ +# $Id: makefile,v 1.7 2005-09-27 12:15:09 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" @@ -49,10 +49,12 @@ 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 @@ -145,6 +147,10 @@ TCLOPT= $(COMMON_TCL_OPTIONS) ########################################################### YAZPP_DLL_OBJS = \ + "$(OBJDIR)\socket-observer.obj" \ + "$(OBJDIR)\pdu-observer.obj" \ + "$(OBJDIR)\query.obj" \ + "$(OBJDIR)\z-server.obj" \ "$(OBJDIR)\yaz-socket-manager.obj" \ "$(OBJDIR)\yaz-pdu-assoc.obj" \ "$(OBJDIR)\yaz-z-assoc.obj" \ @@ -164,6 +170,9 @@ YAZPP_DLL_OBJS = \ "$(OBJDIR)\zrs.obj" \ "$(OBJDIR)\zrec.obj" +MY_CLIENT_OBJS = \ + "$(OBJDIR)\yaz-my-client.obj" + ZCLIENT_OBJS = \ "$(OBJDIR)\zclient.obj" @@ -218,6 +227,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) @<<