X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=25b78ccf30881132572cc76ec135980daab708e9;hp=0a14dae62df446d9226536b0391e01cf100998a5;hb=d62e0baee8ee3cccced41746ef09fc3e01f401d5;hpb=7f5ac724aed4a7413c396051269ff80acb748123 diff --git a/win/makefile b/win/makefile index 0a14dae..25b78cc 100644 --- a/win/makefile +++ b/win/makefile @@ -1,12 +1,10 @@ -# Copyright (C) 1995-2006, Index Data ApS -# All rights reserved. -# $Id: makefile,v 1.15 2006-04-30 13:04:03 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 +USE_MANIFEST = 1 # Can be enabled Visual Studio 2005 # YAZ YAZ_DIR=..\..\yaz @@ -23,9 +21,7 @@ nsis: all nsishelp: $(NSIS) -########################################################### -############### Directories -########################################################### +# Directories # The current directory is supposed to be something like # ..../yaz/win, everything is relative to that ROOTDIR=.. # The home of yazpp @@ -34,45 +30,46 @@ 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 ZOOMDIR=$(ROOTDIR)\zoom +!if $(DEBUG) +OBJDIR=$(WINDIR)\dobj # where we store intermediate files +!else +OBJDIR=$(WINDIR)\obj # where we store intermediate files +!endif + TMPDIR=$(ROOTDIR)\win\tmp TMP=$(TMPDIR) -########################################################### -############### Targets - what to make -########################################################### +# Targets - what to make !if $(DEBUG) -YAZPP_DLL=$(BINDIR)\yazpp_1_d.dll -YAZPP_IMPLIB=$(LIBDIR)\yazpp_1_d.lib -YAZD=yazd +DLL=$(BINDIR)\yazpp6d.dll +YAZPP_IMPLIB=$(LIBDIR)\yazpp6d.lib +YAZD=yaz5d !else -YAZPP_DLL=$(BINDIR)\yazpp_1.dll -YAZPP_IMPLIB=$(LIBDIR)\yazpp_1.lib -YAZD=yaz +DLL=$(BINDIR)\yazpp6.dll +YAZPP_IMPLIB=$(LIBDIR)\yazpp6.lib +YAZD=yaz5 !endif 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\$(YAZD).lib" YAZ_DEF=/I"$(YAZ_DIR)\include" -yaz: $(BINDIR)\$(YAZD).dll $(BINDIR)\$(YAZD).dll +yaz: $(BINDIR)\$(YAZD).dll -$(BINDIR)\$(YAZD).dll: $(YAZ_DIR)\bin\$(YAZD).dll +$(BINDIR)\$(YAZD).dll: "$(YAZ_DIR)\bin\$(YAZD).dll" copy "$(YAZ_DIR)\bin\$(YAZD).dll" $(BINDIR) COMMON_C_OPTIONS= \ @@ -116,11 +113,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) +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 DEBUG_LNK_OPTIONS= /debug @@ -141,13 +136,13 @@ RCOPT= $(COMMON_RC_OPTIONS) $(RELEASE_RC_OPTIONS) LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) $(LNK_LIBS) !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" \ @@ -177,10 +172,6 @@ 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. @@ -190,83 +181,50 @@ ZCLIENT_OBJS = \ {$(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 - !if $(DEBUG) RSOPT=/d_DEBUG !else RSOPT=/d_NDEBUG !endif -$(YAZ_RES): $(YAZ_RC) - $(RSC) $(RSOPT) /fo"$(YAZ_RES)" $(YAZ_RC) +!if $(USE_MANIFEST) +MT=mt.exe /nologo +!else +MT=echo +!endif + + +LINK_DLL = $(LINK) $(LNKOPT) $(LINK_LIBS) $(DLL_LINK_OPTIONS) +LINK_PROGRAM = $(LINK) $(LNKOPT) $(CLIENT_LINK_OPTIONS) $(LINK_LIBS) $(YAZPP_IMPLIB) -########################################################### -############### 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)" -<< +$(DLL) $(YAZPP_IMPLIB): "$(BINDIR)" $(DLL_OBJS) + $(LINK_DLL) $(DLL_OBJS) /out:$@ /implib:"$(YAZPP_IMPLIB)" + $(MT) -manifest $@.manifest -outputresource:$@;2 $(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:$@ + $(MT) -manifest $@.manifest -outputresource:$@;1 $(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:$@ + $(MT) -manifest $@.manifest -outputresource:$@;1 generated: $(ZOOMDIR)\zoom.h "$(ZOOMDIR)\zoom.h": "$(ZOOMDIR)\master-header" 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