projects
/
yazpp-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
inserted Emacs nxml-mode in bottom of XML files
[yazpp-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
b06a6cb
..
cfdc57d
100644
(file)
--- 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.
# All rights reserved.
-# $Id: makefile,v 1.5 2004-04-11 17:53:03 adam Exp $
+# $Id: makefile,v 1.10 2006-03-29 13:14:19 adam Exp $
###########################################################
############### Parameters
###########################################################
############### Parameters
@@
-9,11
+9,11
@@
DEBUG=0 # 0 for release, 1 for debug
# YAZ
DEBUG=0 # 0 for release, 1 for debug
# YAZ
-YAZ_DIR=c:\yaz
+YAZ_DIR=..\..\yaz
default: all
default: all
-all: dirs generated dll zclient yaz
+all: dirs generated dll myclient zclient yaz
NSIS="c:\program files\nsis\makensis-bz2.exe"
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
###########################################################
# 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
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
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
ZOOMDIR=$(ROOTDIR)\zoom
TMPDIR=$(ROOTDIR)\win\tmp
@@
-49,10
+48,12
@@
TMP=$(TMPDIR)
YAZPP_DLL=$(BINDIR)\yazpp.dll
YAZPP_IMPLIB=$(LIBDIR)\yazpp.lib
ZCLIENT=$(BINDIR)\zclient.exe
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)
# shortcut names defined here
dll: $(YAZPP_DLL)
zclient: $(ZCLIENT)
+myclient: $(MY_CLIENT)
###########################################################
############### Compiler and linker options
###########################################################
############### Compiler and linker options
@@
-127,17
+128,13
@@
CLIENT_LINK_OPTIONS = /subsystem:console
# Final opt variables
!if $(DEBUG)
COPT= $(COMMON_C_OPTIONS) $(DEBUG_C_OPTIONS) $(COMMON_C_INCLUDES)
# 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)
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)
!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)
RCOPT= $(COMMON_RC_OPTIONS) $(RELEASE_RC_OPTIONS)
LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) $(LNK_LIBS)
-TCLOPT= $(COMMON_TCL_OPTIONS)
!endif
###########################################################
!endif
###########################################################
@@
-145,6
+142,12
@@
TCLOPT= $(COMMON_TCL_OPTIONS)
###########################################################
YAZPP_DLL_OBJS = \
###########################################################
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" \
"$(OBJDIR)\yaz-socket-manager.obj" \
"$(OBJDIR)\yaz-pdu-assoc.obj" \
"$(OBJDIR)\yaz-z-assoc.obj" \
@@
-164,6
+167,9
@@
YAZPP_DLL_OBJS = \
"$(OBJDIR)\zrs.obj" \
"$(OBJDIR)\zrec.obj"
"$(OBJDIR)\zrs.obj" \
"$(OBJDIR)\zrec.obj"
+MY_CLIENT_OBJS = \
+ "$(OBJDIR)\yaz-my-client.obj"
+
ZCLIENT_OBJS = \
"$(OBJDIR)\zclient.obj"
ZCLIENT_OBJS = \
"$(OBJDIR)\zclient.obj"
@@
-218,6
+224,18
@@
$(YAZPP_DLL) $(YAZPP_IMPLIB): "$(BINDIR)" $(YAZPP_DLL_OBJS)
/map:"$(LIBDIR)\yazpp.map"
<<
/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) @<<
$(ZCLIENT) : "$(BINDIR)" $(ZCLIENT_OBJS) $(YAZPP_IMPLIB)
@echo Linking $(ZCLIENT)
$(LINK) @<<
@@
-252,11
+270,6
@@
clean:
realclean: clean
-del $(ZOOMDIR)\zoom.h
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):
dirs: $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR)
$(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):