X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/rocl/blobdiff_plain/1ded87baa037e0d9a72ae58b86bdf34244464f01..9590c915c9bfe4a4fbe6a2d3af91fa4a9cb7027b:/Makefile

diff --git a/Makefile b/Makefile
index 90d0ca0..de93b6f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Makefile for RIGHT ON COMMAND-LINE
 #
-# $Id: Makefile,v 1.4 2003/03/01 17:47:07 mdw Exp $
+# $Id$
 
 #----- Configuration stuff --------------------------------------------------
 
@@ -8,7 +8,9 @@
 
 CC = gcc
 INCLUDES = 
-CFLAGS = -O2 -g -pedantic -Wall $(INCLUDES)
+CFLAGS = \
+	-O2 -g -pedantic -Wall -funroll-loops -fomit-frame-pointer \
+	$(INCLUDES)
 LD = gcc
 LDFLAGS = -shared
 
@@ -28,41 +30,63 @@ RM = rm
 # Shouldn't need to fiddle with thiis stuff.
 
 PACKAGE = rocl
-VERSION = 1.0.1
+VERSION = 1.1.5
 
 TCLSCRIPTS = \
 	elite-editor elite-pairs elite-path elite-find elite-map \
-	elite-prices elite-describe elite-reach elite-cmdr
+	elite-prices elite-describe elite-reach elite-cmdr elite-salesman \
+	elite-tantalus
 
-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
+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 $@ $<
 
-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) -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:
-	$(RM) -f elite.o elite.so pkgIndex.tcl
+	$(RM) -f *.o *.so pkgIndex.tcl
 
 DISTDIR = $(PACKAGE)-$(VERSION)
-DISTFILES = README Makefile elite.c elite.tcl elite.def $(TCLSCRIPTS)
+DISTFILES = \
+	README Makefile $(SRCFILES) elite.tcl steele.cmdr \
+	elite.def vec.def graph.def $(TCLSCRIPTS) \
+	debian/rules debian/control debian/copyright debian/changelog
 distdir: $(DISTFILES)
 	$(RM) -rf $(DISTDIR)
-	mkdir $(DISTDIR)
-	for i in $(DISTFILES); do ln -s ../$$i $(DISTDIR); done
+	mkdir $(DISTDIR) $(DISTDIR)/debian
+	for i in $(DISTFILES); do \
+	  case $$i in \
+	    */*) \
+	      dir=$${i%/*}; \
+	      up=`echo $$dir | sed 's:[^/]\+:..:g'`; \
+	      mkdir -p $(DISTDIR)/$$dir;; \
+	    *) dir= up=;; \
+	  esac; \
+	  ln -s ../$$up/$$i $(DISTDIR)/$$i; \
+	done
 disttar: distdir
-	tar chofz $(DISTDIR).tar.gz $(DISTDIR)
+	tar chofz $(INST)$(DISTDIR).tar.gz $(DISTDIR)
 distzip: distdir
-	cd $(DISTDIR) && zip -rq ../$(DISTDIR).zip .
+	cd $(DISTDIR) && zip -rq ../$(INST)$(DISTDIR).zip .
 dist: disttar distzip
 	$(RM) -rf $(DISTDIR)
 distcheck: dist