X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=ce31be2994d0bd45d7a7838b7500685f086aa19f;hp=432f231b0f680b8b7bd25e355386ea33e66269fa;hb=44ceeaf709eb733c9e10f8f7de06b62d36dead63;hpb=ac9456cb81f1b7d6fdd3523d9c6ede458106c378

diff --git a/win/makefile b/win/makefile
index 432f231..ce31be2 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,17 +1,15 @@
-# Copyright (C) 1995-2006, Index Data ApS
+# Copyright (C) 1999-2006, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.13 2006-04-30 07:43:06 adam Exp $
+# $Id: makefile,v 1.21 2008-02-21 10:16:26 adam Exp $
 
-###########################################################
-############### Parameters 
-###########################################################
+# Parameters 
 
-DEBUG=1   # 0 for release, 1 for debug
+DEBUG=0   # 0 for release, 1 for debug
+USE_MANIFEST = 0 # Can be enabled Visual Studio 2005
 
 # YAZ
 YAZ_DIR=..\..\yaz
 
-
 default: all
 
 all: dirs generated dll myclient zclient yaz
@@ -24,9 +22,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
@@ -35,45 +31,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)\yazppd.dll
-YAZPP_IMPLIB=$(LIBDIR)\yazppd.lib
-YAZD=yazd
+DLL=$(BINDIR)\yazpp3d.dll
+YAZPP_IMPLIB=$(LIBDIR)\yazpp3d.lib
+YAZD=yaz3d
 !else
-YAZPP_DLL=$(BINDIR)\yazpp.dll
-YAZPP_IMPLIB=$(LIBDIR)\yazpp.lib
-YAZD=yaz
+DLL=$(BINDIR)\yazpp3.dll
+YAZPP_IMPLIB=$(LIBDIR)\yazpp3.lib
+YAZD=yaz3
 !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=          \
@@ -117,15 +114,11 @@ RELEASE_C_OPTIONS=  \
 ### Linker options
 LINK=link.exe
 
-LINK_LIBS= kernel32.lib user32.lib   gdi32.lib   \
-           advapi32.lib uuid.lib \
+LINK_LIBS= kernel32.lib user32.lib gdi32.lib advapi32.lib uuid.lib \
            wsock32.lib  advapi32.lib \
            $(YAZ_LIB)
 
-COMMON_LNK_OPTIONS= /nologo \
-                    /subsystem:windows \
-                    /machine:i386 \
-			  /incremental:no
+COMMON_LNK_OPTIONS= /nologo /subsystem:windows /machine:i386 /incremental:no
 
 DEBUG_LNK_OPTIONS= /debug 
 
@@ -146,11 +139,9 @@ 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)\gdu.obj" \
    "$(OBJDIR)\gduqueue.obj" \
    "$(OBJDIR)\pdu-observer.obj" \
@@ -182,10 +173,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.
 
@@ -195,83 +182,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