X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=f0d1cb70041a6e275b88b1a0e6ce11f28953596b;hp=e7de5bfbc60704da9b8b8b9fa174bcd0d13c1b21;hb=30cfc59b71c25923e2e9cfb63c310c095bb3b6c1;hpb=25fa35a0e1f84fa9b6366d71ee5b2ab58a2bd468 diff --git a/win/makefile b/win/makefile index e7de5bf..f0d1cb7 100644 --- a/win/makefile +++ b/win/makefile @@ -1,5 +1,5 @@ # Makefile.mak - makefile for MS NMAKE -# $Id: makefile,v 1.4 1999-06-09 09:41:09 heikki Exp $ +# $Id: makefile,v 1.9 1999-11-30 13:47:12 adam Exp $ # # Programmed by # HL: Heikki Levanto, Index Data @@ -25,7 +25,7 @@ DEBUG=0 # 0 for release, 1 for debug -NEW_Z3950=1 # 0= use old asn files +NEW_Z3950=0 # 0= use old asn files # 1= generate files from *.asn (needs tcl) @@ -33,6 +33,7 @@ default: all all: dirs proto_h dll client server ztest +generate: generated_files ########################################################### ############### Directories @@ -72,10 +73,10 @@ TMP=$(TMPDIR) DLL=$(BINDIR)\Yaz.dll IMPLIB=$(LIBDIR)\Yaz.lib -CLIENT=$(BINDIR)\client.exe +CLIENT=$(BINDIR)\yaz-client.exe SERVER=$(LIBDIR)\server.lib -ZTEST=$(BINDIR)\ztest.exe -PROTOH=$(INCLDIR)\proto.h +ZTEST=$(BINDIR)\yaz-ztest.exe +PROTOH=$(INCLDIR)\yaz\proto.h # shortcut names defined here dll : $(DLL) @@ -127,12 +128,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 @@ -159,8 +154,7 @@ ZTEST_LINK_OPTIONS = /subsystem:console # TCL TCL="C:\Program Files\Tcl\bin\tclsh80.exe" -COMMON_TCL_OPTIONS= ..\util\yc.tcl -d z.tcl - +COMMON_TCL_OPTIONS= ..\util\yc.tcl -d z.tcl -I$(INCLDIR) -i yaz # Final opt variables !if $(DEBUG) @@ -184,22 +178,6 @@ TCLOPT= $(COMMON_TCL_OPTIONS) ############### 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 @@ -270,7 +248,6 @@ YAZ_ODR_OBJS= \ YAZ_UTIL_OBJS= \ $(OBJDIR)\atoin.obj \ - $(OBJDIR)\dmalloc.obj \ $(OBJDIR)\log.obj \ $(OBJDIR)\marcdisp.obj \ $(OBJDIR)\nmem.obj \ @@ -289,7 +266,6 @@ YAZ_ZUTIL_OBJS= \ $(OBJDIR)\prt-ext.obj \ $(OBJDIR)\logrpn.obj \ $(OBJDIR)\pquery.obj \ - $(OBJDIR)\query.obj \ $(OBJDIR)\yaz-ccl.obj \ $(OBJDIR)\otherinfo.obj @@ -312,8 +288,10 @@ YAZ_RET_OBJS= \ $(OBJDIR)\d1_varset.obj\ $(OBJDIR)\d1_write.obj - Z3950_OBJS= \ + $(OBJDIR)\z-date.obj\ + $(OBJDIR)\z-univ.obj\ + $(OBJDIR)\zes-update.obj\ $(OBJDIR)\z-accdes1.obj \ $(OBJDIR)\z-accform1.obj \ $(OBJDIR)\z-acckrb1.obj \ @@ -356,6 +334,11 @@ YAZ_OBJS= \ DLL_OBJS= $(YAZ_OBJS) +ALL_OBJS= \ + $(YAZ_OBJS) \ + $(YAZ_CLIENT_OBJS) \ + $(YAZ_SERVER_OBJS) \ + $(ZTEST_OBJS) ########################################################## @@ -363,45 +346,37 @@ DLL_OBJS= $(YAZ_OBJS) ########################################################## !if $(NEW_Z3950) -$(PROTOH): makefile $(INCLDIR)\z-proto.h $(Z3950V3_H_FILES) - copy $(INCLDIR)\z-proto.h $(INCLDIR)\proto.h +$(PROTOH): makefile $(INCLDIR)\yaz\z-proto.h + type $(INCLDIR)\yaz\z-proto.h > $(PROTOH) !else -$(PROTOH): makefile $(INCLDIR)\prt-proto.h - copy $(INCLDIR)\prt-proto.h $(INCLDIR)\proto.h +$(PROTOH): makefile $(INCLDIR)\yaz\prt-proto.h + type $(INCLDIR)\yaz\prt-proto.h > $(PROTOH) !endif - ########################################################### ############### Generated C and H files ########################################################### -Z3950_C_DIR=$(Z3950DIR) #!!! Should be moved to OBJ +Z3950_C_DIR=$(Z3950DIR) +#!!! Should be moved to OBJ, but that requires too much trickery # Files generated from datetime.asn -DATETIME_H_FILES = z-date.h -DATETIME_C_FILES = z-date.c -DATETIME_FILES = $(DATETIME_H_FILES) $(DATETIME_C_FILES) -$(DATETIME_C_FILES): $(DATETIME_H_FILES) - +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 = z-univ.h -UNIVRES_C_FILES = z-univ.c -UNIVRES_FILES = $(UNIVRES_H_FILES) $(UNIVRES_C_FILES) -$(UNIVRES_C_FILES): $(UNIVRES_H_FILES) +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 = zes-update.h -ESUPDATE_C_FILES = zes-update.c -ESUPDATE_FILES = $(ESUPDATE_H_FILES) $(ESUPDATE_C_FILES) -$(ESUPDATE_C_FILES): $(ESUPDATE_H_FILES) - +ESUPDATE_H_FILES = $(INCLDIR)\yaz\zes-update.h +ESUPDATE_C_FILES = $(Z3950_C_DIR)\zes-update.c # Files created from z3950v3.asn Z3950V3_H_FILES= \ - $(INCLDIR)\z-accdes1.h \ - $(INCLDIR)\z-core.h + $(INCLDIR)\yaz\z-accdes1.h \ + $(INCLDIR)\yaz\z-core.h Z3950V3_C_FILES= \ $(Z3950_C_DIR)\z-accdes1.c \ @@ -427,10 +402,11 @@ Z3950V3_C_FILES= \ $(Z3950_C_DIR)\zes-pset.c \ $(Z3950_C_DIR)\zes-update0.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) -$(Z3950V3_C_FILES): $(Z3950V3_H_FILES) - GENERATED_C_FILES= \ $(Z3950V3_C_FILES) \ $(ESUPDATE_C_FILES) \ @@ -443,6 +419,10 @@ GENERATED_H_FILES= \ $(UNIVRES_H_FILES) \ $(DATETIME_H_FILES) +generated_files: \ + $(GENERATED_H_FILES) \ + $(GENERATED_C_FILES) \ + $(PROTOH) ########################################################### ############### Compiling @@ -453,103 +433,69 @@ GENERATED_H_FILES= \ # DLL sources {$(SRCDIR)}.cpp{$(OBJDIR)}.obj: - @$(CPP) @<< - $(COPT) $< -<< + @$(CPP) $(COPT) $< # Yaz client {$(CLIENTDIR)}.c{$(OBJDIR)}.obj: - @$(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) $< -<< + @$(CPP) $(COPT) $< -### Resource file -$(RESFILE): $(RCFILE) $(IDLGENERATED) - $(RSC) $(RCOPT) /fo"$(RESFILE)" $(RCFILE) ############### ASN-generated files - $(Z3950V3_FILES): $(Z3950DIR)\z3950v3.asn @cd $(Z3950DIR) $(TCL) $(TCLOPT) z3950v3.asn - copy *.h $(INCLDIR) >NUL + @cd $(WINDIR) $(DATETIME_FILES): $(Z3950DIR)\datetime.asn @cd $(Z3950DIR) $(TCL) $(TCLOPT) datetime.asn - copy *.h $(INCLDIR) >NUL + @cd $(WINDIR) $(UNIVRES_FILES): $(Z3950DIR)\univres.asn @cd $(Z3950DIR) $(TCL) $(TCLOPT) univres.asn - copy *.h $(INCLDIR) >NUL + @cd $(WINDIR) $(ESUPDATE_FILES): $(Z3950DIR)\esupdate.asn @cd $(Z3950DIR) $(TCL) $(TCLOPT) esupdate.asn - copy *.h $(INCLDIR) >NUL - + @cd $(WINDIR) ########################################################### ############### Linking ########################################################### -###$(DLL) $(IMPLIB): "$(BINDIR)" $(Z3950_OBJS) - $(DLL) $(IMPLIB): "$(BINDIR)" $(DLL_OBJS) @echo Linking the dll $(DLL) $(LINK) @<< @@ -558,41 +504,37 @@ $(DLL) $(IMPLIB): "$(BINDIR)" $(DLL_OBJS) $(DLL_LINK_OPTIONS) $(DLL_OBJS) /out:$(DLL) - /implib:$(IMPLIB) + /implib:"$(LIBDIR)/yaz.lib" /pdb:"$(LIBDIR)/yaz.pdb" /map:"$(LIBDIR)/yaz.map" << -#foo: -# rem $(Z3950_OBJS) -# pause -# rem $(DLL_OBJS) - -foo: $(OBJDIR)\comstack.obj - echo foo - - $(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) @echo Linking the ztest $(ZTEST) $(LINK) @<< - $(LNKOPT) + $(LNKOPT) $(ZTEST_LINK_OPTIONS) $(LINK_LIBS) - shell32.lib + shell32.lib $(IMPLIB) $(SERVER) - $(ZTEST_OBJS) + $(ZTEST_OBJS) + /implib:"$(LIBDIR)/yaz-ztest.lib" + /pdb:"$(LIBDIR)/yaz-ztest.pdb" + /map:"$(LIBDIR)/yaz-ztest.map" /out:$(ZTEST) << @@ -606,8 +548,6 @@ $(SERVER) : "$(BINDIR)" $(YAZ_SERVER_OBJS) /out:$(SERVER) << -# $(LINK_LIBS) - # note that this links a lib, so it uses completely different options. @@ -619,15 +559,28 @@ $(SERVER) : "$(BINDIR)" $(YAZ_SERVER_OBJS) ############## clean clean: - del $(OBJDIR)\*.obj - del $(OBJDIR)\*.sbr del $(DLL) del $(CLIENT) del $(SERVER) del $(ZTEST) - del $(TMPDIR)\*. + 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) @@ -640,23 +593,40 @@ $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR): ############### Explicit dependencies ########################################################### -$(DLL_OBJS): makefile $(PROTOH) $(GENERATED_C_FILES) +$(ALL_OBJS): makefile $(PROTOH) -# Note: The objects depend on their own C file already, the -# dependency here is actually to make sure we get the -# proper H files generated before trying to compile anything -# Unfortunately make clean can not delete the H files so -# easily. This hack assures that if the C's are deleted -# (as make clean does), the H's will be generated anew... +# force recompilation of everything, if makefile changed +$(Z3950_OBJS): $(GENERATED_C_FILES) $(GENERATED_H_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.4 1999-06-09 09:41:09 heikki +# 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