From: Adam Dickmeiss Date: Tue, 22 Oct 2002 14:41:29 +0000 (+0000) Subject: data1 moved to zebra (WIN32) X-Git-Tag: ZEBRA.1.3.3.DEBIAN.5~8 X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=7bb5a5e32f98b8b836d3a3806f5307f7a5ad6d51;p=idzebra-moved-to-github.git data1 moved to zebra (WIN32) --- diff --git a/win/makefile b/win/makefile index 8150743..fa795d3 100644 --- a/win/makefile +++ b/win/makefile @@ -1,5 +1,5 @@ # Zebra makefile for MS NMAKE -# $Id: makefile,v 1.17 2002-09-03 12:22:21 adam Exp $ +# $Id: makefile,v 1.18 2002-10-22 14:41:29 adam Exp $ ########################################################### ############### Parameters @@ -62,6 +62,7 @@ ISAMBDIR=$(SRCDIR)\ISAMB RECCTRLDIR=$(SRCDIR)\RECCTRL RSETDIR=$(SRCDIR)\RSET UTILDIR=$(SRCDIR)\UTIL +DATA1DIR=$(SRCDIR)\DATA1 APITESTDIR=$(SRCDIR)\APITEST # Force temp files in a local temp, easier to clean @@ -287,7 +288,25 @@ ZEBRALIB_OBJS= \ $(OBJDIR)\extract.obj \ $(OBJDIR)\kinput.obj \ $(OBJDIR)\rsisams.obj \ - $(OBJDIR)\trav.obj + $(OBJDIR)\trav.obj \ + $(OBJDIR)\d1_absyn.obj \ + $(OBJDIR)\d1_attset.obj \ + $(OBJDIR)\d1_doespec.obj \ + $(OBJDIR)\d1_espec.obj \ + $(OBJDIR)\d1_expout.obj \ + $(OBJDIR)\d1_grs.obj \ + $(OBJDIR)\d1_handle.obj \ + $(OBJDIR)\d1_if.obj \ + $(OBJDIR)\d1_map.obj \ + $(OBJDIR)\d1_marc.obj \ + $(OBJDIR)\d1_prtree.obj \ + $(OBJDIR)\d1_read.obj \ + $(OBJDIR)\d1_soif.obj \ + $(OBJDIR)\d1_sumout.obj \ + $(OBJDIR)\d1_sutrs.obj \ + $(OBJDIR)\d1_tagset.obj \ + $(OBJDIR)\d1_varset.obj \ + $(OBJDIR)\d1_write.obj ALL_OBJS=\ $(ZEBRALIB_OBJS) \ @@ -342,6 +361,9 @@ ALL_OBJS=\ {$(UTILDIR)}.c{$(OBJDIR)}.obj: $(CPP) $(COPT) $< +{$(DATA1DIR)}.c{$(OBJDIR)}.obj: + $(CPP) $(COPT) $< + {$(APITESTDIR)}.c{$(OBJDIR)}.obj: $(CPP) $(COPT) $< diff --git a/win/zebra.nsi b/win/zebra.nsi index 0fe53ac..c56d29a 100644 --- a/win/zebra.nsi +++ b/win/zebra.nsi @@ -1,4 +1,4 @@ -; $Id: zebra.nsi,v 1.6 2002-09-18 21:01:16 adam Exp $ +; $Id: zebra.nsi,v 1.7 2002-10-22 14:41:30 adam Exp $ !define VERSION "1.3.3" @@ -103,6 +103,8 @@ Section "Zebra Source" File ..\isamc\*.h SetOutPath $INSTDIR\isamb File ..\isamb\*.c + SetOutPath $INSTDIR\data1 + File ..\data1\*.c SetOutPath $INSTDIR\recctrl File ..\recctrl\*.c File ..\recctrl\*.h