X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=3353ff05efdf25ead90c5a4353e382bdd5b65396;hp=0b6d053c603799ac7a6b7d20f2c87fe5544c9de0;hb=e0fea214f3bf8b0a75ae18c0e9c97c6d5e22df5f;hpb=6c5d249279c2d0035eae94aae229bb9d1324c418

diff --git a/win/makefile b/win/makefile
index 0b6d053..3353ff0 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
-# Makefile.mak - makefile for MS NMAKE 
-# $Id: makefile,v 1.2 1999-06-08 14:07:24 heikki Exp $
+# makefile.mak - makefile for MS NMAKE 
+# $Id: makefile,v 1.18 2000-11-01 14:47:00 adam Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
@@ -8,6 +8,9 @@
 #
 # Missing
 # - Move MS-C's whatnots into win direcotry
+# - The TCL script produces C and H files in the same dir as the 
+#   ASN files. H's are copied to INCL, C's are left there.
+#   They should be produced into OBJ...
 #  
 # Envoronment problems
 # - You need to have the proper path and environment for VC set
@@ -22,14 +25,15 @@
 
 DEBUG=0   # 0 for release, 1 for debug
 
-NEW_Z3950=0  # 0= use old asn files
+NEW_Z3950=1  # 0= use old asn files
              # 1= generate files from *.asn (needs tcl)
 
 
 default: all
 
-all: dirs proto_h dll client server ztest 
+all: dirs proto_h dll client ztest 
 
+generate: generated_files
 
 ###########################################################
 ############### Directories
@@ -52,13 +56,16 @@ ODRDIR=$(SRCDIR)\ODR
 UTILDIR=$(SRCDIR)\UTIL
 ZUTILDIR=$(SRCDIR)\ZUTIL
 RETDIR=$(SRCDIR)\RETRIEVAL
+Z3950DIR=$(SRCDIR)\Z39.50
+ILLDIR=$(SRCDIR)\ill
+CCLDIR=$(SRCDIR)\ccl
 
 CLIENTDIR=$(SRCDIR)\CLIENT
 SERVERDIR=$(SRCDIR)\SERVER
 ZTESTDIR=$(SRCDIR)\ZTEST
 
 TMPDIR=$(ROOTDIR)\win\tmp
-TMP=$(TMP)
+TMP=$(TMPDIR)
 
 ###########################################################
 ############### Targets - what to make
@@ -66,17 +73,15 @@ TMP=$(TMP)
 
 
 DLL=$(BINDIR)\Yaz.dll
-IMPLIB=$(BINDIR)\Yaz.lib
+IMPLIB=$(LIBDIR)\Yaz.lib
 
-CLIENT=$(BINDIR)\client.exe
-SERVER=$(BINDIR)\server.lib
-ZTEST=$(BINDIR)\ztest.exe
-PROTOH=$(INCLDIR)\proto.h
+CLIENT=$(BINDIR)\yaz-client.exe
+ZTEST=$(BINDIR)\yaz-ztest.exe
+PROTOH=$(INCLDIR)\yaz\proto.h
 
 # shortcut names defined here
 dll : $(DLL) 
 client: $(CLIENT)
-server: $(SERVER)
 ztest: $(ZTEST)
 proto_h: $(PROTOH)
 
@@ -92,6 +97,7 @@ proto_h: $(PROTOH)
 COMMON_C_OPTIONS=          \
   /nologo /W3 /GX /FD /c   \
   /D "WIN32" /D "_WINDOWS" \
+  /D "CCL2RPN=1"           \
   /FR"$(OBJDIR)\\"         \
   /Fo"$(OBJDIR)\\"         \
   /Fd"$(OBJDIR)\\" 
@@ -123,12 +129,6 @@ RELEASE_C_OPTIONS=  \
 # /Zi  = Program database for debuggers
 # /ZI  = Pgm database with special "edit&continue" stuff - not available in C5
 
-### 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"
-
 
 ### Linker options
 LINK=link.exe
@@ -152,6 +152,11 @@ CLIENT_LINK_OPTIONS = /subsystem:console
 SERVER_LINK_OPTIONS = -lib 
 ZTEST_LINK_OPTIONS = /subsystem:console  
 
+# TCL
+TCL="C:\Program Files\Tcl\bin\tclsh83.exe"
+HAVE_TCL=1
+
+COMMON_TCL_OPTIONS= ..\util\yaz-comp -I$(INCLDIR) -i yaz
 
 # Final opt variables
 !if $(DEBUG)
@@ -159,12 +164,14 @@ 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
 
 
@@ -173,28 +180,13 @@ LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) $(LNK_LIBS)
 ###############  Source and object modules
 ###########################################################
 
-# The resource files
-
-RCFILE=$(SRCDIR)\compmak.rc
-# Horrible Hack: The resfile contains just one line, pointing
-# to the component.tlb file (which is created by the idl compiler)
-# Devstudio wants that file to live in YazX3950, this makefile in
-# win/obj. So we need to RC files!
-
-RESFILE=$(OBJDIR)\component.res
-
-
-# The def file
-#DEF_FILE= $(ROOTDIR)\component.def 
-
-
-
 # Note: Ordinary source files are not specified here at 
 # all, make finds them in suitable dirs. The object modules
 # need to be specified, though
 
 YAZ_CLIENT_OBJS= \
-   $(OBJDIR)\client.obj
+   $(OBJDIR)\client.obj \
+   $(OBJDIR)\admin.obj
 
 YAZ_SERVER_OBJS= \
 	"$(OBJDIR)\eventl.obj" \
@@ -207,7 +199,15 @@ YAZ_SERVER_OBJS= \
 ZTEST_OBJS= \
 	"$(OBJDIR)\read-grs.obj" \
 	"$(OBJDIR)\ztest.obj" 
-	
+
+YAZ_CCL_OBJS= \
+   $(OBJDIR)\cclerrms.obj \
+   $(OBJDIR)\cclfind.obj \
+   $(OBJDIR)\cclptree.obj \
+   $(OBJDIR)\cclqfile.obj \
+   $(OBJDIR)\cclqual.obj \
+   $(OBJDIR)\cclstr.obj \
+   $(OBJDIR)\ccltoken.obj
 
 YAZ_ASN_OBJS= \
    $(OBJDIR)\proto.obj \
@@ -251,7 +251,6 @@ YAZ_ODR_OBJS= \
    $(OBJDIR)\odr_null.obj \
    $(OBJDIR)\odr_oct.obj \
    $(OBJDIR)\odr_oid.obj \
-   $(OBJDIR)\odr_priv.obj \
    $(OBJDIR)\odr_seq.obj \
    $(OBJDIR)\odr_tag.obj \
    $(OBJDIR)\odr_use.obj \
@@ -259,7 +258,6 @@ YAZ_ODR_OBJS= \
 
 YAZ_UTIL_OBJS= \
    $(OBJDIR)\atoin.obj \
-   $(OBJDIR)\dmalloc.obj \
    $(OBJDIR)\log.obj \
    $(OBJDIR)\marcdisp.obj \
    $(OBJDIR)\nmem.obj \
@@ -278,7 +276,6 @@ YAZ_ZUTIL_OBJS= \
    $(OBJDIR)\prt-ext.obj \
    $(OBJDIR)\logrpn.obj \
    $(OBJDIR)\pquery.obj \
-   $(OBJDIR)\query.obj \
    $(OBJDIR)\yaz-ccl.obj \
    $(OBJDIR)\otherinfo.obj
 
@@ -299,18 +296,181 @@ YAZ_RET_OBJS= \
    $(OBJDIR)\d1_sutrs.obj\
    $(OBJDIR)\d1_tagset.obj\
    $(OBJDIR)\d1_varset.obj\
-   $(OBJDIR)\d1_write.obj
-
-YAZ_OBJS= \
-   $(YAZ_ASN_OBJS) \
-   $(YAZ_COMSTACK_OBJS) \
-   $(YAZ_ODR_OBJS) \
+   $(OBJDIR)\d1_write.obj\
+   $(OBJDIR)\d1_if.obj
+
+Z3950_OBJS= \
+   $(OBJDIR)\z-date.obj\
+   $(OBJDIR)\z-univ.obj\
+   $(OBJDIR)\zes-update.obj\
+   $(OBJDIR)\zes-admin.obj \
+   $(OBJDIR)\z-accdes1.obj \
+   $(OBJDIR)\z-accform1.obj \
+   $(OBJDIR)\z-acckrb1.obj \
+   $(OBJDIR)\z-core.obj \
+   $(OBJDIR)\z-diag1.obj \
+   $(OBJDIR)\z-espec1.obj \
+   $(OBJDIR)\z-estask.obj \
+   $(OBJDIR)\z-exp.obj \
+   $(OBJDIR)\z-grs.obj \
+   $(OBJDIR)\z-opac.obj \
+   $(OBJDIR)\z-uifr1.obj \
+   $(OBJDIR)\z-rrf1.obj \
+   $(OBJDIR)\z-rrf2.obj \
+   $(OBJDIR)\z-sum.obj \
+   $(OBJDIR)\z-sutrs.obj \
+   $(OBJDIR)\zes-expi.obj \
+   $(OBJDIR)\zes-exps.obj \
+   $(OBJDIR)\zes-order.obj \
+   $(OBJDIR)\zes-pquery.obj \
+   $(OBJDIR)\zes-psched.obj \
+   $(OBJDIR)\zes-pset.obj \
+   $(OBJDIR)\zes-update0.obj
+
+ILL_OBJS= \
+   $(OBJDIR)\ill-get.obj\
+   $(OBJDIR)\ill-core.obj\
+   $(OBJDIR)\item-req.obj
+
+COMMON_YAZ_OBJS= \
    $(YAZ_UTIL_OBJS) \
+   $(YAZ_ODR_OBJS) \
+   $(YAZ_COMSTACK_OBJS) \
    $(YAZ_ZUTIL_OBJS) \
-   $(YAZ_RET_OBJS)
+   $(YAZ_CCL_OBJS) \
+   $(YAZ_RET_OBJS) \
+   $(YAZ_SERVER_OBJS) 
+
+!if $(NEW_Z3950)
+YAZ_OBJS= \
+	$(COMMON_YAZ_OBJS) \
+	$(Z3950_OBJS) \
+	$(ILL_OBJS) 
+!else
+YAZ_OBJS= \
+	$(COMMON_YAZ_OBJS) \
+	$(YAZ_ASN_OBJS)
+!endif
 
 DLL_OBJS= $(YAZ_OBJS)
 
+ALL_OBJS= \
+	$(YAZ_OBJS) \
+	$(YAZ_CLIENT_OBJS) \
+	$(ZTEST_OBJS)
+
+
+##########################################################
+############## proto.h
+##########################################################
+
+!if $(NEW_Z3950)
+$(PROTOH): makefile $(INCLDIR)\yaz\z-proto.h
+	type $(INCLDIR)\yaz\z-proto.h > $(PROTOH)
+!else	
+$(PROTOH): makefile $(INCLDIR)\yaz\prt-proto.h 
+	copy $(ASNDIR)\*.h $(INCLDIR)\yaz
+	type $(INCLDIR)\yaz\prt-proto.h > $(PROTOH)
+!endif
+
+
+###########################################################
+############### Generated C and H files
+#####
+######################################################
+
+
+Z3950_C_DIR=$(Z3950DIR)   
+ILL_C_DIR=$(ILLDIR)
+#!!! Should be moved to OBJ, but that requires too much trickery
+
+# Files generated from datetime.asn
+DATETIME_H_FILES = $(INCLDIR)\yaz\z-date.h
+DATETIME_C_FILES = $(Z3950_C_DIR)\z-date.c
+
+# Files generated from univres.asn
+UNIVRES_H_FILES = $(INCLDIR)\yaz\z-univ.h
+UNIVRES_C_FILES = $(Z3950_C_DIR)\z-univ.c
+
+# Files generated from esupdate.asn
+ESUPDATE_H_FILES = $(INCLDIR)\yaz\zes-update.h
+ESUPDATE_C_FILES = $(Z3950_C_DIR)\zes-update.c
+
+# Files generated from esadmin.asn
+ESADMIN_H_FILES = $(INCLDIR)\yaz\zes-admin.h
+ESADMIN_C_FILES = $(Z3950_C_DIR)\zes-admin.c
+
+# Files created from z3950v3.asn
+Z3950V3_H_FILES= \
+   $(INCLDIR)\yaz\z-accdes1.h \
+   $(INCLDIR)\yaz\z-core.h
+
+Z3950V3_C_FILES= \
+   $(Z3950_C_DIR)\z-accdes1.c \
+   $(Z3950_C_DIR)\z-accform1.c \
+   $(Z3950_C_DIR)\z-acckrb1.c \
+   $(Z3950_C_DIR)\z-core.c \
+   $(Z3950_C_DIR)\z-diag1.c \
+   $(Z3950_C_DIR)\z-espec1.c \
+   $(Z3950_C_DIR)\z-estask.c \
+   $(Z3950_C_DIR)\z-exp.c \
+   $(Z3950_C_DIR)\z-grs.c \
+   $(Z3950_C_DIR)\z-opac.c \
+   $(Z3950_C_DIR)\z-uifr1.c \
+   $(Z3950_C_DIR)\z-rrf1.c \
+   $(Z3950_C_DIR)\z-rrf2.c \
+   $(Z3950_C_DIR)\z-sum.c \
+   $(Z3950_C_DIR)\z-sutrs.c \
+   $(Z3950_C_DIR)\zes-expi.c \
+   $(Z3950_C_DIR)\zes-exps.c \
+   $(Z3950_C_DIR)\zes-order.c \
+   $(Z3950_C_DIR)\zes-pquery.c \
+   $(Z3950_C_DIR)\zes-psched.c \
+   $(Z3950_C_DIR)\zes-pset.c \
+   $(Z3950_C_DIR)\zes-update0.c
+
+# Files generated from ill9702.asn
+ILL_CORE_H_FILES= \
+   $(INCLDIR)\yaz\ill-core.h
+
+ILL_CORE_C_FILES= \
+   $(ILL_C_DIR)\ill-core.c
+
+# Files generated from itemreq.asn
+ITEM_REQ_H_FILES= \
+   $(INCLDIR)\yaz\item-req.h
+
+ITEM_REQ_C_FILES= \
+   $(ILL_C_DIR)\item-req.c
+
+# Combined..
+DATETIME_FILES = $(DATETIME_H_FILES) $(DATETIME_C_FILES)
+UNIVRES_FILES = $(UNIVRES_H_FILES) $(UNIVRES_C_FILES)
+ESUPDATE_FILES = $(ESUPDATE_H_FILES) $(ESUPDATE_C_FILES)
+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)
+
+GENERATED_C_FILES= \
+   $(Z3950V3_C_FILES)  \
+   $(ESUPDATE_C_FILES) \
+   $(UNIVRES_C_FILES)  \
+   $(DATETIME_C_FILES) \
+   $(ESADMIN_C_FILES)
+
+GENERATED_H_FILES= \
+   $(Z3950V3_H_FILES)  \
+   $(ESUPDATE_H_FILES) \
+   $(UNIVRES_H_FILES)  \
+   $(DATETIME_H_FILES) \
+   $(ESADMIN_H_FILES)
+
+generated_files: \
+	$(GENERATED_H_FILES) \
+	$(GENERATED_C_FILES) \
+	$(PROTOH)
+
 
 ###########################################################
 ############### Compiling 
@@ -321,75 +481,93 @@ DLL_OBJS= $(YAZ_OBJS)
 
 # DLL sources
 {$(SRCDIR)}.cpp{$(OBJDIR)}.obj:
-	@$(CPP) @<<
-	$(COPT) $<
-<<
+	@$(CPP) $(COPT) $<
 
 # Yaz client
 {$(CLIENTDIR)}.c{$(OBJDIR)}.obj:
-	echo MAKING IN CLIENT !!!!!
-	@$(CPP) @<<  
-	$(COPT) $< 
-	/D"_CONSOLE"
-<<
+	@$(CPP) $(COPT) $< /D"_CONSOLE"
 
 # Ztest
 {$(ZTESTDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) @<<  
-	$(COPT) $< 
-      /D"_CONSOLE"
-	/D"_MBCS"
-<<
-
+	@$(CPP) $(COPT) $< /D"_CONSOLE"
 
 # Server
 {$(SERVERDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) @<<  
-	$(COPT) $< 
-<<
+	@$(CPP) $(COPT) $< 
 
 # Various YAZ source directories
 {$(ASNDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) @<<  
-	$(COPT) $< 
-<<
+	@$(CPP) $(COPT) $< 
 
 {$(COMSTACKDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) @<<  
-	$(COPT) $< 
-<<
+	@$(CPP) $(COPT) $< 
 
 {$(ODRDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) @<<  
-	$(COPT) $< 
-<<
+	@$(CPP) $(COPT) $< 
 
 {$(UTILDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) @<<  
-	$(COPT) $< 
-<<
+	@$(CPP) $(COPT) $< 
 
 {$(ZUTILDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) @<<  
-	$(COPT) $< 
-<<
+	@$(CPP)	$(COPT) $< 
 
 {$(RETDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) @<<  
-	$(COPT) $< 
-<<
+	@$(CPP) $(COPT) $<
+
+{$(Z3950_C_DIR)}.c{$(OBJDIR)}.obj:
+	@$(CPP) $(COPT) $< 
 
+{$(ILL_C_DIR)}.c{$(OBJDIR)}.obj:
+	@$(CPP) $(COPT) $< 
 
-### Resource file
-$(RESFILE): $(RCFILE) $(IDLGENERATED)
-	$(RSC) $(RCOPT) /fo"$(RESFILE)" $(RCFILE) 
+{$(CCLDIR)}.c{$(OBJDIR)}.obj:
+	@$(CPP) $(COPT) $< 
 
+############### ASN-generated files
+
+!if $(HAVE_TCL)
+
+$(Z3950V3_FILES): $(Z3950DIR)\z3950v3.asn
+	@cd $(Z3950DIR)
+	$(TCL) $(TCLOPT) -d z.tcl z3950v3.asn
+	@cd $(WINDIR)
+
+$(DATETIME_FILES): $(Z3950DIR)\datetime.asn
+	@cd $(Z3950DIR)
+	$(TCL) $(TCLOPT) -d z.tcl datetime.asn
+	@cd $(WINDIR)
+
+$(UNIVRES_FILES): $(Z3950DIR)\univres.asn
+	@cd $(Z3950DIR)
+	$(TCL) $(TCLOPT) -d z.tcl univres.asn
+	@cd $(WINDIR)
+
+$(ESUPDATE_FILES): $(Z3950DIR)\esupdate.asn
+	@cd $(Z3950DIR)
+	$(TCL) $(TCLOPT) -d z.tcl esupdate.asn
+	@cd $(WINDIR)
+
+$(ESADMIN_FILES): $(Z3950DIR)\esadmin.asn
+	@cd $(Z3950DIR)
+	$(TCL) $(TCLOPT) -d z.tcl esadmin.asn
+	@cd $(WINDIR)
+
+$(ILL_CORE_FILES): $(ILLDIR)\ill9702.asn
+	@cd $(ILLDIR)
+	$(TCL) $(TCLOPT) -d ill.tcl ill9702.asn
+	@cd $(WINDIR)
+
+$(ITEM_REQ_FILES): $(ILLDIR)\item-req.asn
+	@cd $(ILLDIR)
+	$(TCL) $(TCLOPT) -d ill.tcl item-req.asn
+	@cd $(WINDIR)
+
+!endif
 
 ###########################################################
 ############### Linking
 ###########################################################
 
-
 $(DLL) $(IMPLIB): "$(BINDIR)" $(DLL_OBJS) 
 	@echo Linking the dll  $(DLL)
 	$(LINK) @<<
@@ -398,50 +576,42 @@ $(DLL) $(IMPLIB): "$(BINDIR)" $(DLL_OBJS)
 		$(DLL_LINK_OPTIONS)
 		$(DLL_OBJS) 
 		/out:$(DLL) 
-		/implib:$(IMPLIB)
-		/pdb:"$(LIBDIR)/yaz.pdb" 
-		/map:"$(LIBDIR)/yaz.map"  
+		/implib:"$(LIBDIR)\yaz.lib"
+		/pdb:"$(LIBDIR)\yaz.pdb" 
+		/map:"$(LIBDIR)\yaz.map"  
 <<
 
-$(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS) #####$(IMPLIB)
+$(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS) 
 	@echo Linking the client  $(CLIENT)
 	$(LINK) @<<
-            $(LNKOPT) 
+        $(LNKOPT) 
 		$(CLIENT_LINK_OPTIONS)
 		$(LINK_LIBS) 
 		$(IMPLIB)
-		$(YAZ_CLIENT_OBJS) 
-		/out:$(CLIENT) 
+		$(YAZ_CLIENT_OBJS)
+		/pdb:"$(LIBDIR)\yaz-client.pdb"
+		/map:"$(LIBDIR)\yaz-client.map"
+		/out:$(CLIENT)
 <<
 
-$(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(SERVER) $(DLL)
+$(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(DLL)
 	@echo Linking the ztest  $(ZTEST)
 	$(LINK) @<<
-            $(LNKOPT) 
+        $(LNKOPT) 
 		$(ZTEST_LINK_OPTIONS)
 		$(LINK_LIBS) 
-		shell32.lib 
+		shell32.lib
 		$(IMPLIB)
-		$(SERVER)
 		$(ZTEST_OBJS) 
+		/implib:"$(LIBDIR)\yaz-ztest.lib"
+		/pdb:"$(LIBDIR)\yaz-ztest.pdb"
+		/map:"$(LIBDIR)\yaz-ztest.map"
 		/out:$(ZTEST) 
 <<
 
 
-$(SERVER) : "$(BINDIR)" $(YAZ_SERVER_OBJS) 
-	@echo Linking the server  $(SERVER)
-	$(LINK) $(SERVER_LINK_OPTIONS) @<<
-		/nologo
-		$(LINK_LIBS) 
-		$(IMPLIB)
-		$(YAZ_SERVER_OBJS) 
-		/out:$(SERVER) 
-<<
-
 # note that this links a lib, so it uses completely different options.
 
-
-
 ###########################################################
 ############### Special operations
 ###########################################################
@@ -449,14 +619,31 @@ $(SERVER) : "$(BINDIR)" $(YAZ_SERVER_OBJS)
 
 ############## clean
 clean:
-	del $(OBJDIR)\*.obj
-	del $(OBJDIR)\*.sbr
 	del $(DLL) 
 	del $(CLIENT)
-	del $(SERVER)
 	del $(ZTEST)
 	del $(TMPDIR)\*.
 
+	del $(LIBDIR)\*.MAP
+
+	del $(LIBDIR)\*.LIB
+	del $(OBJDIR)\*.OBJ
+
+	del $(PROTOH)
+
+realclean: clean
+	del $(Z3950_C_DIR)\*.c
+	del $(Z3950_C_DIR)\*.h
+	del $(INCLDIR)\yaz\z-accdes1.h
+	del $(INCLDIR)\yaz\z-core.h
+	del $(DATETIME_H_FILES)
+	del $(UNIVRES_H_FILES)
+	del $(ESUPDATE_H_FILES)
+
+# Because DOS del will only accept one file name to delete,
+# the _H_ files work only on sets that have just one file.
+# Z3950_H_FILES had to be spelled out. One more point for MS!
+
 ########### check directories and create if needed
 dirs: $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR)
 
@@ -468,20 +655,77 @@ $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
 ############### Explicit dependencies
 ###########################################################
 
-$(OBJDIR)/client.obj: $(IDLGENERATED)
+$(ALL_OBJS): $(PROTOH)
 
-$(DLL_OBJS): makefile $(PROTOH)
+# force recompilation of everything, if makefile changed
 
+$(Z3950_OBJS): $(GENERATED_C_FILES) $(GENERATED_H_FILES)
 
-# Debug test
-foo: $(OBJDIR)\ztest.obj
+$(ILL_OBJS): $(ILL_CORE_FILES) $(ITEM_REQ_FILES)
+
+!if $(NEW_Z3950)
+$(PROTOH): $(GENERATED_C_FILES) $(GENERATED_H_FILES)
+!endif
+# makes sure we generate before compiling anything, as the
+# new proto.h refers to the generated files, and is included
+# in various places
 
 ###########################################################
 ############### Log
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.2  1999-06-08 14:07:24  heikki
+# Revision 1.18  2000-11-01 14:47:00  adam
+# Added CCL support for WIN32.
+#
+# Revision 1.17  2000/10/06 12:01:12  adam
+# Updates regarding ASN-code generation (mostly).
+#
+# Revision 1.16  2000/05/05 13:48:15  adam
+# Minor changes.
+#
+# Revision 1.15  2000/04/17 14:21:38  adam
+# WIN32 update.
+#
+# Revision 1.14  2000/03/02 08:48:21  adam
+# Renamed ASN.1 compiler to yaz-comp (used to be yc.tcl).
+#
+# Revision 1.13  2000/02/28 11:13:03  adam
+# Removed odr_priv.obj.
+#
+# Revision 1.12  2000/01/06 11:27:16  adam
+# Updated for ILL.
+#
+# Revision 1.11  1999/12/21 14:16:20  ian
+# Changed retrieval module to allow data1 trees with no associated absyn.
+# Also added a simple interface for extracting values from data1 trees using
+# a string based tagpath.
+#
+# Revision 1.10  1999/12/08 13:10:48  adam
+# New version.
+#
+# Revision 1.9  1999/11/30 13:47:12  adam
+# Improved installation. Moved header files to include/yaz.
+#
+# Revision 1.8  1999/07/21 08:48:02  adam
+# Removed dmalloc.obj.
+#
+# Revision 1.7  1999/06/09 15:10:08  heikki
+# Cleaning up. Seems to work all right
+#
+# Revision 1.6  1999/06/09 13:33:32  heikki
+# Compiles and links both old and new type stuff all right
+#
+# Revision 1.5  1999/06/09 11:05:30  heikki
+# At least it can compile
+#
+# Revision 1.4  1999/06/09 09:41:09  heikki
+# More work on the ASN-generated files.
+#
+# Revision 1.3  1999/06/08 14:32:30  heikki
+# Proto.h works all right, removed linker warnings from server.lib
+#
+# Revision 1.2  1999/06/08 14:07:24  heikki
 # Renamed a pile of files
 # Tmpdir (to get around Ms leaving temp files around, and crashing
 # when too many with same number...)