Document -x and -k

[yaz-moved-to-github.git] / win / makefile

diff --git a/win/makefile b/win/makefile
index c85318f..7b2e649 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
 # Copyright (C) 1994-2003, Index Data
 # All rights reserved.
-# $Id: makefile,v 1.62 2003-07-19 13:48:49 adam Exp $
+# $Id: makefile,v 1.65 2003-10-02 06:30:45 adam Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
@@ -23,7 +23,7 @@ ICONV_DIR = c:\iconv-1.8.win32
 
 # libxml2
 HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.5.3.win32
+LIBXML2_DIR=c:\libxml2-2.5.10.win32
 
 # WIN32 binaries libxml2 & iconv from here:
 #  http://www.zlatkovic.com/projects/libxml/binaries.html
@@ -50,8 +50,8 @@ generate: generated_files
 ############### Directories
 ###########################################################
 # The current directory is supposed to be something like
-# ..../Yaz/Win, everything is relative to that
-ROOTDIR=..   # The home of Yaz
+# ..../yaz/win, everything is relative to that
+ROOTDIR=..   # The home of yaz
 
 INCLDIR=$(ROOTDIR)\include  # our includes
 LIBDIR=$(ROOTDIR)\lib       # We produce .lib, .exp etc there
@@ -85,8 +85,8 @@ TMP=$(TMPDIR)
 ############### Targets - what to make
 ###########################################################
 
-DLL=$(BINDIR)\Yaz.dll
-IMPLIB=$(LIBDIR)\Yaz.lib
+DLL=$(BINDIR)\yaz.dll
+IMPLIB=$(LIBDIR)\yaz.lib
 
 CLIENT=$(BINDIR)\yaz-client.exe
 ZOOMSH=$(BINDIR)\zoomsh.exe
@@ -123,11 +123,11 @@ ICONV_DEF= \
   /D HAVE_ICONV_H=1 \
   /I"$(ICONV_DIR)\include"
 ICONV_LIB= \
-  $(ICONV_DIR)\lib\iconv.lib
+  "$(ICONV_DIR)\lib\iconv.lib"
 iconv: $(BINDIR)\iconv.dll
 
 $(BINDIR)\iconv.dll:
-  copy $(ICONV_DIR)\lib\iconv.dll $(BINDIR)
+  copy "$(ICONV_DIR)\lib\iconv.dll" $(BINDIR)
 !else
 ICONV_DEF= \
   /D HAVE_ICONV_H=0
@@ -137,12 +137,12 @@ iconv:
 !endif
 
 !if $(HAVE_LIBXML2)
-LIBXML2_LIB=$(LIBXML2_DIR)\lib\libxml2.lib
+LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib"
 LIBXML2_DEF=/D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
 libxml2: $(BINDIR)\libxml2.dll
 
 $(BINDIR)\libxml2.dll:
-  copy $(LIBXML2_DIR)\lib\libxml2.dll $(BINDIR)
+  copy "$(LIBXML2_DIR)\lib\libxml2.dll" $(BINDIR)
 !else
 LIBXML2_LIB=
 LIBXML2_DEF=/D HAVE_XML2=0
@@ -364,7 +364,9 @@ YAZ_ZUTIL_OBJS= \
    $(OBJDIR)\opacdisp.obj \
    $(OBJDIR)\zgdu.obj \
    $(OBJDIR)\soap.obj \
-   $(OBJDIR)\srw.obj
+   $(OBJDIR)\srw.obj \
+   $(OBJDIR)\zoom-c.obj \
+   $(OBJDIR)\zoom-opt.obj
 
 Z3950_OBJS= \
    $(OBJDIR)\z-date.obj\
@@ -403,10 +405,6 @@ ILL_OBJS= \
    $(OBJDIR)\ill-core.obj\
    $(OBJDIR)\item-req.obj
 
-YAZ_ZOOM_OBJS = \
-   $(OBJDIR)\zoom-c.obj \
-   $(OBJDIR)\zoom-opt.obj
-
 YAZ_CQL_OBJS = \
    $(OBJDIR)\cql.obj \
    $(OBJDIR)\cqlstdio.obj \
@@ -416,20 +414,16 @@ YAZ_CQL_OBJS = \
    $(OBJDIR)\cqlstrer.obj \
    $(OBJDIR)\xcqlutil.obj
 
-COMMON_YAZ_OBJS= \
+YAZ_OBJS =\
    $(YAZ_UTIL_OBJS) \
    $(YAZ_ODR_OBJS) \
    $(YAZ_COMSTACK_OBJS) \
+   $(Z3950_OBJS) \
+   $(ILL_OBJS) \
    $(YAZ_ZUTIL_OBJS) \
    $(YAZ_CCL_OBJS) \
-   $(YAZ_SERVER_OBJS) \
-   $(YAZ_ZOOM_OBJS) \
-   $(YAZ_CQL_OBJS)
-
-YAZ_OBJS= \
-       $(COMMON_YAZ_OBJS) \
-       $(Z3950_OBJS) \
-       $(ILL_OBJS)
+   $(YAZ_CQL_OBJS) \
+   $(YAZ_SERVER_OBJS)
 
 DLL_OBJS= $(YAZ_OBJS)
 
@@ -565,7 +559,7 @@ generated_files: \
 {$(SRCDIR)}.cpp{$(OBJDIR)}.obj:
        @$(CPP) $(COPT) $<
 
-# Yaz client
+# yaz client
 {$(CLIENTDIR)}.c{$(OBJDIR)}.obj:
        @$(CPP) $(COPT) $< /D"_CONSOLE"
 
@@ -944,7 +938,16 @@ $(ILL_OBJS): $(ILL_CORE_FILES) $(ITEM_REQ_FILES)
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.62  2003-07-19 13:48:49  adam
+# Revision 1.65  2003-10-02 06:30:45  adam
+# Quote ICONV_DIR/LIBXML2_DIR as suggested by Michael Freidgeim
+#
+# Revision 1.64  2003/09/04 18:52:02  adam
+# Minor changes. Use libxml-2.5.10
+#
+# Revision 1.63  2003/07/25 11:11:19  adam
+# Change order of compilation to reflect Unix AM.
+#
+# Revision 1.62  2003/07/19 13:48:49  adam
 # makefile updated for oclcui.asn
 #
 # Revision 1.61  2003/07/15 08:26:26  adam