projects
/
ir-tcl-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Event type set to connect a little earlier in the do_connect function.
[ir-tcl-moved-to-github.git]
/
Makefile.in
diff --git
a/Makefile.in
b/Makefile.in
index
ab4c96c
..
f9cb2ca
100644
(file)
--- a/
Makefile.in
+++ b/
Makefile.in
@@
-2,7
+2,7
@@
# (c) Index Data 1995
# See the file LICENSE for details.
# Sebastian Hammer, Adam Dickmeiss
# (c) Index Data 1995
# See the file LICENSE for details.
# Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.29 1996-02-26 18:38:31 adam Exp $
+# $Id: Makefile.in,v 1.34 1996-06-06 10:45:59 adam Exp $
SHELL=/bin/sh
# IrTcl Version
SHELL=/bin/sh
# IrTcl Version
@@
-21,18
+21,16
@@
INCDIR=$(prefix)/include
IRTCLDIR=$(prefix)/lib/irtcl
YAZDIR=@YAZDIR@
IRTCLDIR=$(prefix)/lib/irtcl
YAZDIR=@YAZDIR@
-LIBS=@LIBS@ -lm
CC=@CC@
CC=@CC@
-# X11 libraries and include file paths
-XLIB=@XLIBSW@
-XINCLUDE=@XINCLUDES@
-
-# Tcl/Tk libraries and include files
+# Tcl libraries and include files
TCLLIB=@TCLLIB@
TCLLIB=@TCLLIB@
+TCLINC=@TCLINC@
+
+# Tk & X11 libraries and include files
TKLIB=@TKLIB@
TKLIB=@TKLIB@
-TCLINCLUDE=@TCLINCLUDE@
+TKINC=@TKINC@
# MOSI settings, directory with libmosi.a and source
MOSI=@MOSI@
# MOSI settings, directory with libmosi.a and source
MOSI=@MOSI@
@@
-44,7
+42,7
@@
MOSIINC=@MOSIINC@
YAZLIB=$(YAZDIR)/lib/libyaz.a $(MOSILIB)
# All include paths
YAZLIB=$(YAZDIR)/lib/libyaz.a $(MOSILIB)
# All include paths
-INCLUDE=-I. -I$(YAZDIR)/include $(XINCLUDE) $(TCLINCLUDE) $(MOSIINC)
+INCLUDE=-I. -I$(YAZDIR)/include $(TKINC) $(TCLINC) $(MOSIINC)
# All command line options except CFLAGS
DEFS=-DCCL2RPN=0 @DEFS@ -DMOSI=$(MOSI) -DIRTCLDIR=\"$(IRTCLDIR)\" \
# All command line options except CFLAGS
DEFS=-DCCL2RPN=0 @DEFS@ -DMOSI=$(MOSI) -DIRTCLDIR=\"$(IRTCLDIR)\" \
@@
-57,23
+55,25
@@
RANLIB = @RANLIB@
O=ir-tcl.o marc.o queue.o mem.o grs.o
O=ir-tcl.o marc.o queue.o mem.o grs.o
-all: ir-tk ir-tcl
+all: ir-tcl ir-tk
ir-tk: libirtcl.a tkinit.o
ir-tk: libirtcl.a tkinit.o
- $(CC) $(CFLAGS) tkinit.o -o ir-tk libirtcl.a $(YAZLIB) $(TKLIB) \
- $(TCLLIB) $(XLIB) $(LIBS)
+ $(CC) $(CFLAGS) tkinit.o -o ir-tk libirtcl.a $(YAZLIB) $(TKLIB)
ir-tcl: libirtcl.a tclmain.o
ir-tcl: libirtcl.a tclmain.o
- $(CC) $(CFLAGS) tclmain.o -o ir-tcl libirtcl.a $(YAZLIB) $(TCLLIB) $(LIBS)
+ $(CC) $(CFLAGS) tclmain.o -o ir-tcl libirtcl.a $(YAZLIB) $(TCLLIB)
+
+WAISDIR=../freeWAIS-sf-2.0
wais-tcl: libirtcl.a wais-tcl.o waismain.o
wais-tcl: libirtcl.a wais-tcl.o waismain.o
- $(CC) $(CFLAGS) wais-tcl.o waismain.o -o wais-tcl libirtcl.a $(YAZLIB) $(TCLLIB) /home/proj/freeWAIS-sf/freeWAIS-sf-2.0.60/ir/libwais.a $(LIBS)
+ $(CC) $(CFLAGS) wais-tcl.o waismain.o -o wais-tcl libirtcl.a \
+ $(YAZLIB) $(WAISDIR)/ir/libwais.a $(TCLLIB)
waismain.o: tclmain.c
$(CC) -c $(CFLAGS) -DUSE_WAIS=1 $(DEFS) tclmain.c -o waismain.o
wais-tcl.o: wais-tcl.c
waismain.o: tclmain.c
$(CC) -c $(CFLAGS) -DUSE_WAIS=1 $(DEFS) tclmain.c -o waismain.o
wais-tcl.o: wais-tcl.c
- $(CC) -c $(CFLAGS) -I/home/proj/freeWAIS-sf/freeWAIS-sf-2.0.60/ir $(DEFS) wais-tcl.c
+ $(CC) -c $(CFLAGS) -I$(WAISDIR)/ir $(DEFS) wais-tcl.c
libirtcl.a: $(O)
rm -f libirtcl.a
libirtcl.a: $(O)
rm -f libirtcl.a
@@
-128,7
+128,7
@@
install: ir-tcl
fi;
clean:
fi;
clean:
- rm -f *.[oa] ir-tk ir-tcl core gmon.out mon.out *.bak config.cache
+ rm -f *.[oa] ir-tk ir-tcl wais-tcl core gmon.out mon.out *.bak config.cache
autoconf:
-rm config.cache
autoconf:
-rm config.cache
@@
-156,5
+156,5
@@
distribution:
.c.o:
$(CC) -c $(CFLAGS) $(DEFS) $<
.c.o:
$(CC) -c $(CFLAGS) $(DEFS) $<
-$(O) tkinit.o tclmain.o: ir-tcl.h ir-tclp.h
+$(O) tkinit.o tclmain.o wais-tcl.o waismain.o: ir-tcl.h ir-tclp.h