X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=e5c0e2d3d4c674c0117647a44ad7da38898d8444;hb=f722c8d9517ec491e2469cdc91a3751dd5e7a6df;hp=851330fbaf8429238aad0e900cd3d913bd1b0d16;hpb=8ac07324aa0d1da687ce2d0a2d734e783c2e9144;p=yaz-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 851330f..e5c0e2d 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # makefile.mak - makefile for MS NMAKE 
-# $Id: makefile,v 1.30 2001-10-28 23:28:26 adam Exp $
+# $Id: makefile,v 1.35 2002-03-16 10:26:57 adam Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
@@ -29,6 +29,14 @@ default: all
 
 all: dirs yaz_date_h generate dll client ztest zoomsh
 
+NSIS="c:\program files\nsis\makensis.exe"
+
+nsis: all
+	$(NSIS) yaz.nsi
+
+nsishelp:
+	$(NSIS)
+
 generate: generated_files
 
 ###########################################################
@@ -84,14 +92,16 @@ ZOOMTST4=$(BINDIR)\zoomtst4.exe
 ZOOMTST5=$(BINDIR)\zoomtst5.exe
 ZOOMTST6=$(BINDIR)\zoomtst6.exe
 ZOOMTST7=$(BINDIR)\zoomtst7.exe
-
+ZOOMTST8=$(BINDIR)\zoomtst8.exe
 
 # shortcut names defined here
 dll : $(DLL) 
 client: $(CLIENT)
 ztest: $(ZTEST)
+
 zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
- $(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7)
+ $(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8)
+
 yaz_date_h: $(YAZ_DATE_H)
 
 ###########################################################
@@ -197,6 +207,7 @@ TCLOPT= $(COMMON_TCL_OPTIONS)
 
 YAZ_CLIENT_OBJS= \
    $(OBJDIR)\client.obj \
+   $(OBJDIR)\tabcomplete.obj \
    $(OBJDIR)\admin.obj
 
 YAZ_ZOOMSH_OBJS = \
@@ -216,6 +227,8 @@ YAZ_ZOOMTST6_OBJS = \
    $(OBJDIR)\zoomtst6.obj
 YAZ_ZOOMTST7_OBJS = \
    $(OBJDIR)\zoomtst7.obj
+YAZ_ZOOMTST8_OBJS = \
+   $(OBJDIR)\zoomtst8.obj
 
 YAZ_SERVER_OBJS= \
 	"$(OBJDIR)\eventl.obj" \
@@ -343,7 +356,8 @@ Z3950_OBJS= \
    $(OBJDIR)\zes-psched.obj \
    $(OBJDIR)\zes-pset.obj \
    $(OBJDIR)\zes-update0.obj \
-   $(OBJDIR)\prt-ext.obj
+   $(OBJDIR)\prt-ext.obj \
+   $(OBJDIR)\z-charneg.obj
 
 ILL_OBJS= \
    $(OBJDIR)\ill-get.obj\
@@ -401,6 +415,10 @@ ESUPDATE_C_FILES = $(Z3950_C_DIR)\zes-update.c
 ESADMIN_H_FILES = $(INCLDIR)\yaz\zes-admin.h
 ESADMIN_C_FILES = $(Z3950_C_DIR)\zes-admin.c
 
+# Files generated from esadmin.asn
+CHARNEG_H_FILES = $(INCLDIR)\yaz\z-charneg.h
+CHARNEG_C_FILES = $(Z3950_C_DIR)\z-charneg.c
+
 # Files created from z3950v3.asn
 Z3950V3_H_FILES= \
    $(INCLDIR)\yaz\z-accdes1.h \
@@ -452,20 +470,23 @@ ESADMIN_FILES = $(ESADMIN_H_FILES) $(ESADMIN_C_FILES)
 Z3950V3_FILES= $(Z3950V3_C_FILES) $(Z3950V3_H_FILES)
 ILL_CORE_FILES= $(ILL_CORE_C_FILES) $(ILL_CORE_H_FILES)
 ITEM_REQ_FILES= $(ITEM_REQ_C_FILES) $(ITEM_REQ_H_FILES)
+CHARNEG_FILES = $(CHARNEG_C_FILES) $(CHARNEG_H_FILES)
 
 GENERATED_C_FILES= \
    $(Z3950V3_C_FILES)  \
    $(ESUPDATE_C_FILES) \
    $(UNIVRES_C_FILES)  \
    $(DATETIME_C_FILES) \
-   $(ESADMIN_C_FILES)
+   $(ESADMIN_C_FILES) \
+   $(CHARNEG_C_FILES)
 
 GENERATED_H_FILES= \
    $(Z3950V3_H_FILES)  \
    $(ESUPDATE_H_FILES) \
    $(UNIVRES_H_FILES)  \
    $(DATETIME_H_FILES) \
-   $(ESADMIN_H_FILES)
+   $(ESADMIN_H_FILES) \
+   $(CHARNEG_H_FILES)
 
 generated_files: \
 	$(GENERATED_H_FILES) \
@@ -559,6 +580,11 @@ $(ESADMIN_FILES): $(Z3950DIR)\esadmin.asn
 	$(TCL) $(TCLOPT) -d z.tcl esadmin.asn
 	@cd $(WINDIR)
 
+$(CHARNEG_FILES): $(Z3950DIR)\charneg-3.asn
+	@cd $(Z3950DIR)
+	$(TCL) $(TCLOPT) -d z.tcl charneg-3.asn
+	@cd $(WINDIR)
+
 $(ILL_CORE_FILES): $(ILLDIR)\ill9702.asn
 	@cd $(ILLDIR)
 	$(TCL) $(TCLOPT) -d ill.tcl ill9702.asn
@@ -729,6 +755,19 @@ $(ZOOMTST7) : "$(BINDIR)" $(YAZ_ZOOMTST7_OBJS)
 		/out:$(ZOOMTST7)
 <<
 
+$(ZOOMTST8) : "$(BINDIR)" $(YAZ_ZOOMTST8_OBJS) 
+	@echo Linking $(ZOOMTST8)
+	$(LINK) @<<
+        $(LNKOPT) 
+		$(ZOOMSH_LINK_OPTIONS)
+		$(LINK_LIBS) 
+		$(IMPLIB)
+		$(YAZ_ZOOMTST8_OBJS)
+		/pdb:"$(LIBDIR)\zoomtst8.pdb"
+		/map:"$(LIBDIR)\zoomtst8.map"
+		/out:$(ZOOMTST8)
+<<
+
 $(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(DLL)
 	@echo Linking the ztest  $(ZTEST)
 	$(LINK) @<<
@@ -780,7 +819,7 @@ realclean: clean
 dirs: $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR)
 
 $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
- 	if not exist "$@/$(NUL)" mkdir "$@"
+	if not exist "$@/$(NUL)" mkdir "$@"
 
 
 ###########################################################
@@ -802,7 +841,22 @@ $(ILL_OBJS): $(ILL_CORE_FILES) $(ITEM_REQ_FILES)
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.30  2001-10-28 23:28:26  adam
+# Revision 1.35  2002-03-16 10:26:57  adam
+# Added NSIS rules (nmake nsis).
+#
+# Revision 1.34  2002/02/12 15:59:12  adam
+# added z-charneg.obj
+#
+# Revision 1.33  2002/02/11 23:25:26  adam
+# Rustam's patch
+#
+# Revision 1.32  2002/01/30 22:02:03  adam
+# WIN32 updates for YAZ client.
+#
+# Revision 1.31  2001/12/30 22:21:11  adam
+# Scan for ZOOM.
+#
+# Revision 1.30  2001/10/28 23:28:26  adam
 # Enable CCL-to-RPN for YAZ client on WIN32.
 #
 # Revision 1.29  2001/10/25 12:46:07  adam