X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=e9236a6a800c028aa7c86bc240f9785e4866d614;hb=eb70fee6c2f3154f7a8ef264810a3c015337b474;hp=ce8c3d39d278812267cbd3879e1d71600dedb9ee;hpb=0d19fa8f289c9f99f7b06275beac41fc08e76127;p=yaz-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index ce8c3d3..e9236a6 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
 # Copyright (C) 1995-2007, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.133 2007-05-06 20:27:14 adam Exp $
+# $Id: makefile,v 1.139 2007-12-10 20:33:47 adam Exp $
 #
 # Programmed by
 #  Heikki Levanto & Adam Dickmeiss
@@ -8,6 +8,7 @@
 # Parameters 
 
 DEBUG=0   # 0 for release, 1 for debug
+USE_MANIFEST = 0
 
 # TCL
 TCL="C:\Tcl\bin\tclsh84.exe"
@@ -20,11 +21,11 @@ ICONV_DIR = c:\iconv-1.9.2.win32
 
 # libxslt
 HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.17.win32
+LIBXSLT_DIR=c:\libxslt-1.1.19.win32
 
 # libxml2
 HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.6.26.win32
+LIBXML2_DIR=c:\libxml2-2.6.28.win32
 
 # zlib compression (used by libxml2)
 ZLIB_DIR = c:\zlib-1.2.3.win32
@@ -235,9 +236,14 @@ RELEASE_C_OPTIONS=  \
 ### Linker options
 LINK=link.exe
 
-LINK_LIBS= kernel32.lib user32.lib   gdi32.lib   \
-           advapi32.lib uuid.lib wsock32.lib  advapi32.lib \
-           $(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
+!if $(USE_MANIFEST)
+MT=mt.exe /nologo
+!else
+MT=echo
+!endif
+
+LINK_LIBS= kernel32.lib wsock32.lib advapi32.lib \
+	   $(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
 
 COMMON_LNK_OPTIONS= /nologo /subsystem:windows /machine:i386 /incremental:no
 
@@ -253,15 +259,11 @@ COMMON_TCL_OPTIONS= ..\util\yaz-asncomp -I$(INCLDIR) -i yaz
 # 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)
 
 !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)
 !endif
@@ -432,7 +434,9 @@ MISC_OBJS= \
    $(OBJDIR)\query-charset.obj \
    $(OBJDIR)\tokenizer.obj \
    $(OBJDIR)\copy_types.obj \
-   $(OBJDIR)\http.obj
+   $(OBJDIR)\http.obj \
+   $(OBJDIR)\match_glob.obj \
+   $(OBJDIR)\poll.obj
 
 Z3950_OBJS= \
    $(OBJDIR)\z-date.obj\
@@ -730,7 +734,7 @@ RSOPT=/d_NDEBUG
 !endif
 
 $(YAZ_RES): $(YAZ_RC)
-	$(RSC) $(RSOPT) /fo"$(YAZ_RES)" $(YAZ_RC) 
+	$(RSC) $(RSOPT) /I"../include" /fo"$(YAZ_RES)" $(YAZ_RC) 
 
 # Linking
 
@@ -738,62 +742,81 @@ $(DLL) $(YAZ_IMPLIB): "$(BINDIR)" $(DLL_OBJS) $(YAZ_RES)
 	$(LINK_DLL) \
 		$(DLL_OBJS) \
 		$(YAZ_RES) \
-		/out:$(DLL) \
+		/out:$@ \
 		/implib:"$(YAZ_IMPLIB)" 
+	$(MT) -manifest $@.manifest -outputresource:$@;2
 
 $(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS) $(DLL)
-	$(LINK_PROGRAM) $(YAZ_CLIENT_OBJS) /out:$(CLIENT)
+	$(LINK_PROGRAM) $(YAZ_CLIENT_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMSH) : "$(BINDIR)" $(YAZ_ZOOMSH_OBJS) $(DLL)
-	$(LINK_PROGRAM) $(YAZ_ZOOMSH_OBJS) /out:$(ZOOMSH)
+	$(LINK_PROGRAM) $(YAZ_ZOOMSH_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST1) : "$(BINDIR)" $(YAZ_ZOOMTST1_OBJS) $(DLL)
-	$(LINK_PROGRAM) $(YAZ_ZOOMTST1_OBJS) /out:$(ZOOMTST1)
+	$(LINK_PROGRAM) $(YAZ_ZOOMTST1_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST2) : "$(BINDIR)" $(YAZ_ZOOMTST2_OBJS) $(DLL)
-	$(LINK_PROGRAM) $(YAZ_ZOOMTST2_OBJS) /out:$(ZOOMTST2)
+	$(LINK_PROGRAM) $(YAZ_ZOOMTST2_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST3) : "$(BINDIR)" $(YAZ_ZOOMTST3_OBJS) $(DLL)
-	$(LINK_PROGRAM) $(YAZ_ZOOMTST3_OBJS) /out:$(ZOOMTST3)
+	$(LINK_PROGRAM) $(YAZ_ZOOMTST3_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST4) : "$(BINDIR)" $(YAZ_ZOOMTST4_OBJS) $(DLL)
-	$(LINK_PROGRAM) $(YAZ_ZOOMTST4_OBJS) /out:$(ZOOMTST4)
+	$(LINK_PROGRAM) $(YAZ_ZOOMTST4_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST5) : "$(BINDIR)" $(YAZ_ZOOMTST5_OBJS) $(DLL)
-	$(LINK_PROGRAM) $(YAZ_ZOOMTST5_OBJS) /out:$(ZOOMTST5)
+	$(LINK_PROGRAM) $(YAZ_ZOOMTST5_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST6) : "$(BINDIR)" $(YAZ_ZOOMTST6_OBJS) $(DLL)
-	$(LINK_PROGRAM) $(YAZ_ZOOMTST6_OBJS) /out:$(ZOOMTST6)
+	$(LINK_PROGRAM) $(YAZ_ZOOMTST6_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST7) : "$(BINDIR)" $(YAZ_ZOOMTST7_OBJS) $(DLL)
-	$(LINK_PROGRAM) $(YAZ_ZOOMTST7_OBJS) /out:$(ZOOMTST7)
+	$(LINK_PROGRAM) $(YAZ_ZOOMTST7_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST8) : "$(BINDIR)" $(YAZ_ZOOMTST8_OBJS) $(DLL)
-	$(LINK_PROGRAM) $(YAZ_ZOOMTST8_OBJS) /out:$(ZOOMTST8)
+	$(LINK_PROGRAM) $(YAZ_ZOOMTST8_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST9) : "$(BINDIR)" $(YAZ_ZOOMTST9_OBJS) $(DLL)
-	$(LINK_PROGRAM) $(YAZ_ZOOMTST9_OBJS) /out:$(ZOOMTST9)
+	$(LINK_PROGRAM) $(YAZ_ZOOMTST9_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST10) : "$(BINDIR)" $(YAZ_ZOOMTST10_OBJS) $(DLL)
-	$(LINK_PROGRAM) $(YAZ_ZOOMTST10_OBJS) /out:$(ZOOMTST10)
+	$(LINK_PROGRAM) $(YAZ_ZOOMTST10_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(CQL2PQF) : "$(BINDIR)" $(YAZ_CQL2PQF_OBJS) $(DLL)
-	$(LINK_PROGRAM) $(YAZ_CQL2PQF_OBJS) /out:$(CQL2PQF)
+	$(LINK_PROGRAM) $(YAZ_CQL2PQF_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(CQL2XCQL) : "$(BINDIR)" $(YAZ_CQL2XCQL_OBJS) $(DLL)
-	$(LINK_PROGRAM) $(YAZ_CQL2XCQL_OBJS) /out:$(CQL2XCQL)
+	$(LINK_PROGRAM) $(YAZ_CQL2XCQL_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(DLL)
-	$(LINK_PROGRAM)	$(ZTEST_OBJS) /out:$(ZTEST) 
+	$(LINK_PROGRAM)	$(ZTEST_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(YAZ_MARCDUMP) : "$(BINDIR)" $(YAZ_MARCDUMP_OBJS) $(DLL)
-	$(LINK_PROGRAM) $(YAZ_MARCDUMP_OBJS) /out:$(YAZ_MARCDUMP) 
+	$(LINK_PROGRAM) $(YAZ_MARCDUMP_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(TSTLOG) : "$(BINDIR)" $(TSTLOG_OBJS) $(DLL)
-	$(LINK_PROGRAM) $(TSTLOG_OBJS) /out:$(TSTLOG)
+	$(LINK_PROGRAM) $(TSTLOG_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(TST_TIMING) : "$(BINDIR)" $(TST_TIMING_OBJS) $(DLL)
-	$(LINK_PROGRAM) $(TST_TIMING_OBJS) /out:$(TST_TIMING)
+	$(LINK_PROGRAM) $(TST_TIMING_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 # Other rules