X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=dc8a301226460da03c2ea5700da8447f2be84192;hb=7401a51ed865b1dcdf5905b2bc6c793dc023416e;hp=acf07e596a8bfc61f14e8ea879a5aeef7c00c827;hpb=bc66c2a11aa31c16f46c49100e99dc9b7e940faf;p=yaz-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index acf07e5..dc8a301 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # makefile.mak - makefile for MS NMAKE 
-# $Id: makefile,v 1.27 2001-10-24 12:24:43 adam Exp $
+# $Id: makefile,v 1.32 2002-01-30 22:02:03 adam Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
@@ -23,11 +23,11 @@
 ############### Parameters 
 ###########################################################
 
-DEBUG=1   # 0 for release, 1 for debug
+DEBUG=0   # 0 for release, 1 for debug
 
 default: all
 
-all: dirs yaz_date_h dll client ztest zoomsh
+all: dirs yaz_date_h generate dll client ztest zoomsh
 
 generate: generated_files
 
@@ -84,14 +84,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)
 
 ###########################################################
@@ -106,8 +108,9 @@ yaz_date_h: $(YAZ_DATE_H)
 COMMON_C_OPTIONS=          \
   /nologo /W3 /GX /FD /c   \
   /D "YAZ_MODULE_ill=1"    \
-  /D "WIN32" /D "_WINDOWS" \
-  /D "CCL2RPN=1"           \
+  /D "YAZ_MODULE_ccl=1"    \
+  /D "_WINDOWS"            \
+  /D "WIN32"               \
   /FR"$(OBJDIR)\\"         \
   /Fo"$(OBJDIR)\\"         \
   /Fd"$(OBJDIR)\\" 
@@ -196,6 +199,7 @@ TCLOPT= $(COMMON_TCL_OPTIONS)
 
 YAZ_CLIENT_OBJS= \
    $(OBJDIR)\client.obj \
+   $(OBJDIR)\tabcomplete.obj \
    $(OBJDIR)\admin.obj
 
 YAZ_ZOOMSH_OBJS = \
@@ -215,6 +219,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" \
@@ -728,6 +734,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) @<<
@@ -753,10 +772,8 @@ $(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(DLL)
 
 ############## clean
 clean:
-	del $(DLL) 
-	del $(CLIENT)
-	del $(ZTEST)
-	del $(ZOOMSH)
+	del $(BINDIR)\*.exe
+	del $(BINDIR)\*.dll
 	del $(TMPDIR)\*.
 
 	del $(LIBDIR)\*.MAP
@@ -781,7 +798,7 @@ realclean: clean
 dirs: $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR)
 
 $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
- 	if not exist "$@/$(NUL)" mkdir "$@"
+	if not exist "$@/$(NUL)" mkdir "$@"
 
 
 ###########################################################
@@ -803,7 +820,22 @@ $(ILL_OBJS): $(ILL_CORE_FILES) $(ITEM_REQ_FILES)
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.27  2001-10-24 12:24:43  adam
+# 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
+# codecs not built as they should.
+#
+# Revision 1.28  2001/10/25 10:45:08  adam
+# Fixed make clean.
+#
+# Revision 1.27  2001/10/24 12:24:43  adam
 # WIN32 updates: ZOOM runs, nmem_init/nmem_exit called in DllMain.
 #
 # Revision 1.26  2001/09/27 12:09:18  adam