Mostly style cleanups and commentary.

[rocl] / Makefile

diff --git a/Makefile b/Makefile
index 1c6f4a93c2f816dc615bfb1cf8a762817f0ce5fa..31b10dc2dd2c89d397e1e0e4b2f08cf7152b3743 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,18 @@
-# Makefile for RIGHT ON COMMAND-LINE
-#
-# $Id: Makefile,v 1.5 2003/03/02 12:29:38 mdw Exp $
+### Makefile for RIGHT ON COMMAND-LINE
 
-#----- Configuration stuff --------------------------------------------------
-
-# --- Compiling and linking ---
+###--------------------------------------------------------------------------
+### Configuration stuff.
 
+## Compiling and linking.
 CC = gcc
-INCLUDES = 
-CFLAGS = -O2 -g -pedantic -Wall $(INCLUDES)
+INCLUDES =
+CFLAGS = \
+       -O2 -g -Wall -funroll-loops -fomit-frame-pointer \
+       $(INCLUDES)
 LD = gcc
 LDFLAGS = -shared
 
-# --- Installation ---
-
+## Installation.
 INST =
 prefix = /usr/local
 tcllibdir = $(prefix)/lib
@@ -23,46 +22,71 @@ bindir = $(prefix)/bin
 INSTALL = install
 RM = rm
 
-#----- Main machinery -------------------------------------------------------
-#
-# Shouldn't need to fiddle with thiis stuff.
+###--------------------------------------------------------------------------
+### Main machinery.
+###
+### Shouldn't need to fiddle with this stuff.
 
 PACKAGE = rocl
-VERSION = 1.0.2
+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
+
+SRCFILES = elite.c vec.c vec.h graph.c
+
+PKGFILES = elite.so vec.so graph.so elite.tcl
 
-all: elite.so pkgIndex.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 vec.so
+       $(LD) $(LDFLAGS) -Wl,-rpath,$(pkglibdir) graph.o vec.so -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)
+       LD_LIBRARY_PATH=$$(pwd) \
+         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 = \
+       COPYING 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
@@ -83,4 +107,4 @@ distcheck: dist
 
 .PHONY: all install clean dist disttar distzip distdir distcheck
 
-#----- That's all, folks ----------------------------------------------------
+###----- That's all, folks --------------------------------------------------