~mdw
/
rocl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mostly style cleanups and commentary.
[rocl]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
b6f6d71
..
31b10dc
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,21
+1,18
@@
-# Makefile for RIGHT ON COMMAND-LINE
-#
-# $Id$
+### Makefile for RIGHT ON COMMAND-LINE
-#----- Configuration stuff --------------------------------------------------
-
-# --- Compiling and linking ---
+###--------------------------------------------------------------------------
+### Configuration stuff.
+## Compiling and linking.
CC = gcc
CC = gcc
-INCLUDES =
+INCLUDES =
CFLAGS = \
CFLAGS = \
- -O2 -g -
pedantic -
Wall -funroll-loops -fomit-frame-pointer \
+ -O2 -g -Wall -funroll-loops -fomit-frame-pointer \
$(INCLUDES)
LD = gcc
LDFLAGS = -shared
$(INCLUDES)
LD = gcc
LDFLAGS = -shared
-# --- Installation ---
-
+## Installation.
INST =
prefix = /usr/local
tcllibdir = $(prefix)/lib
INST =
prefix = /usr/local
tcllibdir = $(prefix)/lib
@@
-25,9
+22,10
@@
bindir = $(prefix)/bin
INSTALL = install
RM = rm
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.1.5
PACKAGE = rocl
VERSION = 1.1.5
@@
-47,15
+45,17
@@
elite.so: elite.o
$(LD) $(LDFLAGS) elite.o -o elite.so
vec.so: vec.o
$(LD) $(LDFLAGS) vec.o -o vec.so
$(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.so: graph.o
vec.so
+ $(LD) $(LDFLAGS)
-Wl,-rpath,$(pkglibdir) graph.o vec.s
o -o graph.so
graph.o vec.o: vec.h
.SUFFIXES: .c .o
.c.o:; $(CC) -c $(CFLAGS) -o $@ $<
pkgIndex.tcl: $(PKGFILES)
graph.o vec.o: vec.h
.SUFFIXES: .c .o
.c.o:; $(CC) -c $(CFLAGS) -o $@ $<
pkgIndex.tcl: $(PKGFILES)
- echo "pkg_mkIndex -verbose -direct -load Vec . $(PKGFILES) " | tclsh
+ LD_LIBRARY_PATH=$$(pwd) \
+ 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)
@@
-107,4
+107,4
@@
distcheck: dist
.PHONY: all install clean dist disttar distzip distdir distcheck
.PHONY: all install clean dist disttar distzip distdir distcheck
-#
----- That's all, folks --
--------------------------------------------------
+#
##----- That's all, folks
--------------------------------------------------