X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=8c0ddee1ec79d9452ec7f1a32dfc6f5ad10220c4;hp=b323b49072da5a92edab4e974675e0cbbeffad6a;hb=HEAD;hpb=a95799991397f6e30b76afb784b6b6795db9386c diff --git a/win/makefile b/win/makefile index b323b49..8c0ddee 100644 --- a/win/makefile +++ b/win/makefile @@ -1,11 +1,8 @@ -# Copyright (C) 1993-2004, Index Data ApS -# All rights reserved. -# $Id: makefile,v 1.8 2005-11-03 14:46:34 adam Exp $ - -########################################################### -############### Parameters -########################################################### +# This file is part of the yazpp toolkit +# Copyright (C) Index Data +# See the file LICENSE for details. +# Parameters DEBUG=0 # 0 for release, 1 for debug # YAZ @@ -15,61 +12,60 @@ default: all all: dirs generated dll myclient zclient yaz -NSIS="c:\program files\nsis\makensis-bz2.exe" - -nsis: all - $(NSIS) yazpp.nsi - -nsishelp: - $(NSIS) - -########################################################### -############### Directories -########################################################### +# Directories # 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 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 +!if $(DEBUG) +OBJDIR=$(WINDIR)\dobj +!else +OBJDIR=$(WINDIR)\obj +!endif + TMPDIR=$(ROOTDIR)\win\tmp TMP=$(TMPDIR) -########################################################### -############### Targets - what to make -########################################################### +# Targets - what to make + +!if $(DEBUG) +DLL=$(BINDIR)\yazpp6d.dll +YAZPP_IMPLIB=$(LIBDIR)\yazpp6d.lib +YAZD=yaz5d +!else +DLL=$(BINDIR)\yazpp6.dll +YAZPP_IMPLIB=$(LIBDIR)\yazpp6.lib +YAZD=yaz5 +!endif -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) +dll: $(DLL) zclient: $(ZCLIENT) myclient: $(MY_CLIENT) -########################################################### -############### Compiler and linker options -########################################################### +# Compiler and linker options # YAZ includes & libs -YAZ_LIB="$(YAZ_DIR)\lib\yaz.lib" +YAZ_LIB="$(YAZ_DIR)\lib\$(YAZD).lib" YAZ_DEF=/I"$(YAZ_DIR)\include" -yaz: $(BINDIR)\yaz.dll $(BINDIR)\yaz.dll +yaz: $(BINDIR)\$(YAZD).dll -$(BINDIR)\yaz.dll: $(YAZ_DIR)\bin\yaz.dll - copy "$(YAZ_DIR)\bin\yaz.dll" $(BINDIR) +$(BINDIR)\$(YAZD).dll: "$(YAZ_DIR)\bin\$(YAZD).dll" + copy "$(YAZ_DIR)\bin\$(YAZD).dll" $(BINDIR) COMMON_C_OPTIONS= \ - /nologo /W3 /GX /FD /c \ + /nologo /W3 /EHsc /FD /c \ + /D "_CRT_SECURE_NO_DEPRECATE" \ $(YAZ_DEF) \ /D "_WINDOWS" \ /D "WIN32" \ @@ -83,7 +79,7 @@ COMMON_C_INCLUDES= \ DEBUG_C_OPTIONS= \ /D "_DEBUG" \ - /MDd /Od /YX /Zi /Gm + /MDd /Od /Zi /Gm RELEASE_C_OPTIONS= \ /D "NDEBUG" \ @@ -100,7 +96,6 @@ RELEASE_C_OPTIONS= \ # /MDd = Runtime library: Multithread DLL (debug) # /Od = Disable optimising (debug) # /O2 = Optimize for speed -# /YX = Automatic use of precomipled headers # /Gm = Minimal rebuild (some cpp class stuff) # /Zi = Program database for debuggers # /ZI = Pgm database with special "edit&continue" stuff - not available in C5 @@ -109,15 +104,9 @@ RELEASE_C_OPTIONS= \ ### Linker options 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) +LINK_LIBS= kernel32.lib advapi32.lib $(YAZ_LIB) -COMMON_LNK_OPTIONS= /nologo \ - /subsystem:windows \ - /machine:i386 \ - /incremental:no +COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no $(MTOPT) DEBUG_LNK_OPTIONS= /debug @@ -129,26 +118,20 @@ 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) +LNKOPT= $(COMMON_LNK_OPTIONS) $(DEBUG_LNK_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) +LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) !endif -########################################################### -############### Source and object modules -########################################################### +# Source and object modules -YAZPP_DLL_OBJS = \ +DLL_OBJS = \ + "$(OBJDIR)\timestat.obj" \ "$(OBJDIR)\gdu.obj" \ "$(OBJDIR)\gduqueue.obj" \ + "$(OBJDIR)\limit-connect.obj" \ "$(OBJDIR)\pdu-observer.obj" \ "$(OBJDIR)\query.obj" \ "$(OBJDIR)\socket-observer.obj" \ @@ -178,108 +161,39 @@ MY_CLIENT_OBJS = \ ZCLIENT_OBJS = \ "$(OBJDIR)\zclient.obj" -########################################################### -############### Compiling -########################################################### - -# Note: This defines where to look for the necessary -# source files. Funny way of doing it, but it works. - {$(SRCDIR)}.cpp{$(OBJDIR)}.obj: $(CPP) $(COPT) $< {$(ZOOMDIR)}.cpp{$(OBJDIR)}.obj: $(CPP) $(COPT) $< -########################################################### -############### Resources -########################################################### - -### The RC compiler (resource files) -RSC=rc.exe -COMMON_RC_OPTIONS= /l 0x406 /i"$(ROOTDIR)" -DEBUG_RC_OPTIONS=/d "_DEBUG" -RELEASE_RC_OPTIONS=/d "NDEBUG" - -YAZ_RES=$(OBJDIR)\yaz.res -YAZ_RC=$(WINDIR)\yaz.rc +LINK_DLL = $(LINK) $(LNKOPT) $(LINK_LIBS) $(DLL_LINK_OPTIONS) +LINK_PROGRAM = $(LINK) $(LNKOPT) $(CLIENT_LINK_OPTIONS) $(LINK_LIBS) $(YAZPP_IMPLIB) -!if $(DEBUG) -RSOPT=/d_DEBUG -!else -RSOPT=/d_NDEBUG -!endif - -$(YAZ_RES): $(YAZ_RC) - $(RSC) $(RSOPT) /fo"$(YAZ_RES)" $(YAZ_RC) - -########################################################### -############### Linking -########################################################### - -$(YAZPP_DLL) $(YAZPP_IMPLIB): "$(BINDIR)" $(YAZPP_DLL_OBJS) - @echo Linking $(YAZPP_DLL) - $(LINK) @<< - $(LNKOPT) - $(LINK_LIBS) - $(DLL_LINK_OPTIONS) - $(YAZPP_DLL_OBJS) - /out:"$(YAZPP_DLL)" - /implib:"$(YAZPP_IMPLIB)" - /map:"$(LIBDIR)\yazpp.map" -<< +$(DLL) $(YAZPP_IMPLIB): "$(BINDIR)" $(DLL_OBJS) + $(LINK_DLL) $(DLL_OBJS) /out:$@ /implib:"$(YAZPP_IMPLIB)" $(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) -<< + $(LINK_PROGRAM) $(MY_CLIENT_OBJS) /out:$@ $(ZCLIENT) : "$(BINDIR)" $(ZCLIENT_OBJS) $(YAZPP_IMPLIB) - @echo Linking $(ZCLIENT) - $(LINK) @<< - $(LNKOPT) - $(CLIENT_LINK_OPTIONS) - $(LINK_LIBS) - $(YAZPP_IMPLIB) - $(ZCLIENT_OBJS) - /map:"$(LIBDIR)\zclient.map" - /out:$(ZCLIENT) -<< - - -########################################################### -############### Generated Source files -########################################################### + $(LINK_PROGRAM) $(ZCLIENT_OBJS) /out:$@ generated: $(ZOOMDIR)\zoom.h "$(ZOOMDIR)\zoom.h": "$(ZOOMDIR)\master-header" - sed "s/^* / /; s/^*/ /" "$(ZOOMDIR)\master-header" >"$(ZOOMDIR)\zoom.h" + sed "s/^* / /; s/^*/ /" < "$(ZOOMDIR)\master-header" >"$(ZOOMDIR)\zoom.h" -############## clean clean: -del $(BINDIR)\*.exe -del $(BINDIR)\*.dll -del $(TMPDIR)\*. - -del $(LIBDIR)\*.MAP -del $(LIBDIR)\*.LIB -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! - -########### check directories and create if needed dirs: $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR) $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):