X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=7493cffd8fd09aad544494940f0bca585e45fb1c;hb=6d04fc7a64ab1dd82574935bb189e055fe2d5e72;hp=f0d1cb70041a6e275b88b1a0e6ce11f28953596b;hpb=d9ee01635f03f9095a66f71b73580560d48798e8;p=yaz-moved-to-github.git diff --git a/win/makefile b/win/makefile index f0d1cb7..7493cff 100644 --- a/win/makefile +++ b/win/makefile @@ -1,5 +1,5 @@ # Makefile.mak - makefile for MS NMAKE -# $Id: makefile,v 1.9 1999-11-30 13:47:12 adam Exp $ +# $Id: makefile,v 1.14 2000-03-02 08:48:21 adam Exp $ # # Programmed by # HL: Heikki Levanto, Index Data @@ -25,7 +25,7 @@ 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) @@ -57,6 +57,7 @@ UTILDIR=$(SRCDIR)\UTIL ZUTILDIR=$(SRCDIR)\ZUTIL RETDIR=$(SRCDIR)\RETRIEVAL Z3950DIR=$(SRCDIR)\Z39.50 +ILLDIR=$(SRCDIR)\ill CLIENTDIR=$(SRCDIR)\CLIENT SERVERDIR=$(SRCDIR)\SERVER @@ -152,9 +153,9 @@ SERVER_LINK_OPTIONS = -lib ZTEST_LINK_OPTIONS = /subsystem:console # TCL -TCL="C:\Program Files\Tcl\bin\tclsh80.exe" +TCL="C:\Program Files\Tcl\bin\tclsh82.exe" -COMMON_TCL_OPTIONS= ..\util\yc.tcl -d z.tcl -I$(INCLDIR) -i yaz +COMMON_TCL_OPTIONS= ..\util\yaz-comp -I$(INCLDIR) -i yaz # Final opt variables !if $(DEBUG) @@ -240,7 +241,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 \ @@ -286,7 +286,8 @@ YAZ_RET_OBJS= \ $(OBJDIR)\d1_sutrs.obj\ $(OBJDIR)\d1_tagset.obj\ $(OBJDIR)\d1_varset.obj\ - $(OBJDIR)\d1_write.obj + $(OBJDIR)\d1_write.obj\ + $(OBJDIR)\d1_if.obj Z3950_OBJS= \ $(OBJDIR)\z-date.obj\ @@ -315,6 +316,11 @@ Z3950_OBJS= \ $(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_COMSTACK_OBJS) \ $(YAZ_ODR_OBJS) \ @@ -325,6 +331,7 @@ COMMON_YAZ_OBJS= \ !if $(NEW_Z3950) YAZ_OBJS= \ $(COMMON_YAZ_OBJS) \ + $(ILL_OBJS) \ $(Z3950_OBJS) !else YAZ_OBJS= \ @@ -359,6 +366,7 @@ $(PROTOH): makefile $(INCLDIR)\yaz\prt-proto.h ########################################################### Z3950_C_DIR=$(Z3950DIR) +ILL_C_DIR=$(ILLDIR) #!!! Should be moved to OBJ, but that requires too much trickery # Files generated from datetime.asn @@ -402,10 +410,24 @@ Z3950V3_C_FILES= \ $(Z3950_C_DIR)\zes-pset.c \ $(Z3950_C_DIR)\zes-update0.c +ILL_CORE_H_FILES= \ + $(INCLDIR)\yaz\ill-core.h + +ILL_CORE_C_FILES= \ + $(ILL_C_DIR)\ill-core.c + +ITEM_REQ_H_FILES= \ + $(INCLDIR)\yaz\item-req.h + +ITEM_REQ_C_FILES= \ + $(ILL_C_DIR)\item-req.c + DATETIME_FILES = $(DATETIME_H_FILES) $(DATETIME_C_FILES) UNIVRES_FILES = $(UNIVRES_H_FILES) $(UNIVRES_C_FILES) ESUPDATE_FILES = $(ESUPDATE_H_FILES) $(ESUPDATE_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) \ @@ -469,27 +491,39 @@ generated_files: \ {$(Z3950_C_DIR)}.c{$(OBJDIR)}.obj: @$(CPP) $(COPT) $< +{$(ILL_C_DIR)}.c{$(OBJDIR)}.obj: + @$(CPP) $(COPT) $< ############### ASN-generated files $(Z3950V3_FILES): $(Z3950DIR)\z3950v3.asn @cd $(Z3950DIR) - $(TCL) $(TCLOPT) z3950v3.asn + $(TCL) $(TCLOPT) -d z.tcl z3950v3.asn @cd $(WINDIR) $(DATETIME_FILES): $(Z3950DIR)\datetime.asn @cd $(Z3950DIR) - $(TCL) $(TCLOPT) datetime.asn + $(TCL) $(TCLOPT) -d z.tcl datetime.asn @cd $(WINDIR) $(UNIVRES_FILES): $(Z3950DIR)\univres.asn @cd $(Z3950DIR) - $(TCL) $(TCLOPT) univres.asn + $(TCL) $(TCLOPT) -d z.tcl univres.asn @cd $(WINDIR) $(ESUPDATE_FILES): $(Z3950DIR)\esupdate.asn @cd $(Z3950DIR) - $(TCL) $(TCLOPT) esupdate.asn + $(TCL) $(TCLOPT) -d z.tcl esupdate.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) ########################################################### @@ -516,8 +550,10 @@ $(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS) $(CLIENT_LINK_OPTIONS) $(LINK_LIBS) $(IMPLIB) - $(YAZ_CLIENT_OBJS) - /pdb:"$(LIBDIR)/yaz-client.pdb" + $(YAZ_CLIENT_OBJS) + + /pdb:"$(LIBDIR)/yaz-client.pdb" + /map:"$(LIBDIR)/yaz-client.map" /out:$(CLIENT) << @@ -531,9 +567,12 @@ $(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(SERVER) $(DLL) shell32.lib $(IMPLIB) $(SERVER) - $(ZTEST_OBJS) - /implib:"$(LIBDIR)/yaz-ztest.lib" - /pdb:"$(LIBDIR)/yaz-ztest.pdb" + $(ZTEST_OBJS) + + /implib:"$(LIBDIR)/yaz-ztest.lib" + + /pdb:"$(LIBDIR)/yaz-ztest.pdb" + /map:"$(LIBDIR)/yaz-ztest.map" /out:$(ZTEST) << @@ -563,10 +602,13 @@ clean: del $(CLIENT) del $(SERVER) del $(ZTEST) - del $(TMPDIR)\*. - del $(LIBDIR)\*.MAP + del $(TMPDIR)\*. + + del $(LIBDIR)\*.MAP + del $(LIBDIR)\*.LIB - del $(OBJDIR)\*.OBJ + del $(OBJDIR)\*.OBJ + del $(PROTOH) realclean: clean @@ -599,6 +641,8 @@ $(ALL_OBJS): makefile $(PROTOH) $(Z3950_OBJS): $(GENERATED_C_FILES) $(GENERATED_H_FILES) +$(ILL_OBJS): $(ILL_CORE_FILES) $(ITEM_REQ_FILES) + !if $(NEW_Z3950) $(PROTOH): $(GENERATED_C_FILES) $(GENERATED_H_FILES) !endif @@ -611,7 +655,24 @@ $(PROTOH): $(GENERATED_C_FILES) $(GENERATED_H_FILES) ########################################################### # # $Log: makefile,v $ -# Revision 1.9 1999-11-30 13:47:12 adam +# 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