Lots of new files.

diff --git a/Makefile b/Makefile
index 3860d0a3f7af5c1d7082949cbef0f0ef6e07f5b7..4af2d9820f2ad6c9f8234490898db74054e4ba45 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Makefile for RIGHT ON COMMAND-LINE
 #
 # Makefile for RIGHT ON COMMAND-LINE
 #

-# $Id: Makefile,v 1.6 2003/03/04 10:27:11 mdw Exp $
+# $Id: Makefile,v 1.7 2003/03/07 00:47:26 mdw Exp $

 
 #----- Configuration stuff --------------------------------------------------
 
 
 #----- Configuration stuff --------------------------------------------------
 


@@ -8,7 +8,9 @@
 
 CC = gcc
 INCLUDES = 
 
 CC = gcc
 INCLUDES = 

-CFLAGS = -O2 -g -pedantic -Wall $(INCLUDES)
+CFLAGS = \
+       -O2 -g -pedantic -Wall -funroll-loops -fomit-frame-pointer \
+       $(INCLUDES)

 LD = gcc
 LDFLAGS = -shared
 
 LD = gcc
 LDFLAGS = -shared
 


@@ -28,33 +30,42 @@ RM = rm
 # Shouldn't need to fiddle with thiis stuff.
 
 PACKAGE = rocl
 # Shouldn't need to fiddle with thiis stuff.
 
 PACKAGE = rocl

-VERSION = 1.0.3
+VERSION = 1.1.0

 
 TCLSCRIPTS = \
        elite-editor elite-pairs elite-path elite-find elite-map \
        elite-prices elite-describe elite-reach elite-cmdr
 
 
 TCLSCRIPTS = \
        elite-editor elite-pairs elite-path elite-find elite-map \
        elite-prices elite-describe elite-reach elite-cmdr
 

-all: elite.so pkgIndex.tcl
+SRCFILES = elite.c vec.c vec.h graph.c
+
+PKGFILES = elite.so vec.so graph.so elite.tcl
+
+all: $(PKGFILES) pkgIndex.tcl

 
 elite.so: elite.o
        $(LD) $(LDFLAGS) elite.o -o elite.so
 
 elite.so: elite.o
        $(LD) $(LDFLAGS) elite.o -o elite.so

+vec.so: vec.o
+       $(LD) $(LDFLAGS) vec.o -o vec.so
+graph.so: graph.o
+       $(LD) $(LDFLAGS) graph.o -o graph.so
+graph.o vec.o: vec.h

 
 .SUFFIXES: .c .o
 .c.o:; $(CC) -c $(CFLAGS) -o $@ $<
 
 
 .SUFFIXES: .c .o
 .c.o:; $(CC) -c $(CFLAGS) -o $@ $<
 

-pkgIndex.tcl: elite.so elite.tcl
-       echo "pkg_mkIndex -verbose -direct . elite.so elite.tcl" | tclsh
+pkgIndex.tcl: $(PKGFILES)
+       echo "pkg_mkIndex -verbose -direct -load Vec . $(PKGFILES) " | tclsh

 
 install: all
        $(INSTALL) -d $(INST)$(bindir) $(INST)$(pkglibdir)
 
 install: all
        $(INSTALL) -d $(INST)$(bindir) $(INST)$(pkglibdir)

-       $(INSTALL) -m 644 elite.so elite.tcl pkgIndex.tcl $(INST)$(pkglibdir)
+       $(INSTALL) -m 644 $(PKGFILES) pkgIndex.tcl $(INST)$(pkglibdir)

        $(INSTALL) -m 755 $(TCLSCRIPTS) $(INST)$(bindir)
 
 clean:
        $(INSTALL) -m 755 $(TCLSCRIPTS) $(INST)$(bindir)
 
 clean:

-       $(RM) -f elite.o elite.so pkgIndex.tcl
+       $(RM) -f *.o *.so pkgIndex.tcl

 
 DISTDIR = $(PACKAGE)-$(VERSION)
 
 DISTDIR = $(PACKAGE)-$(VERSION)

-DISTFILES = README Makefile elite.c elite.tcl elite.def $(TCLSCRIPTS)
+DISTFILES = README Makefile $(SRCFILES) elite.tcl elite.def $(TCLSCRIPTS)

 distdir: $(DISTFILES)
        $(RM) -rf $(DISTDIR)
        mkdir $(DISTDIR)
 distdir: $(DISTFILES)
        $(RM) -rf $(DISTDIR)
        mkdir $(DISTDIR)