[nauty] 01/02: Merge tag 'upstream/2.5r6'
Jerome Benoit
calculus-guest at moszumanska.debian.org
Wed Dec 4 08:49:14 UTC 2013
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository nauty.
commit ece8ba4109b8402ef0edb1141676c495825ad418
Merge: fb4b22d 9e43fa4
Author: Jerome Benoit <calculus at rezozer.net>
Date: Mon Dec 2 16:14:32 2013 +0100
Merge tag 'upstream/2.5r6'
Upstream version 2.5r6
Conflicts:
makefile.in
NRswitchg.c | 6 +-
README | 255 +-
README => README_24 | 10 +
addedgeg.c | 1 -
amtog.c | 9 +-
biplabg.c | 14 +-
bliss2dre.c | 161 +
blisstog.c | 194 +
callgeng.c | 4 +-
catg.c | 5 +-
changes24-25.txt | 114 +
checks6.c | 5 +-
complg.c | 9 +-
config.guess | 1067 +++--
config.sub | 473 +-
configure | 10968 ++++++++++++++++++---------------------------
configure.ac | 138 +-
copyg.c | 12 +-
deledgeg.c | 12 +-
directg.c | 577 +--
dreadnaut.c | 2591 +++++++----
dreadtest.c | 1407 ------
dretog.c | 5 +-
genbg.c | 2250 +++++-----
geng.c | 3183 ++++++-------
genrang.c | 751 ++--
gentourng.c | 22 +-
gread.me | 164 -
gtnauty.c | 1262 +++---
gtools-h.in | 48 +-
gtools.c | 350 +-
gtools.h | 54 +-
gutil1.c | 736 +--
gutil2.c | 80 +-
gutils.h | 48 +-
labelg.c | 79 +-
linegraphg.c | 218 +
listg.c | 770 ++--
makefile.basic | 711 +--
makefile.in | 586 ++-
multig.c | 757 ++--
naucompare.c | 264 ++
naugraph.c | 920 ++--
naugroup.c | 42 +-
naugroup.h | 10 +-
rng.c => naurng.c | 52 +-
naurng.h | 40 +
nausparse.c | 2229 ++++-----
nausparse.h | 61 +-
nautaux.c | 227 +-
nautaux.h | 9 +-
nautest.c | 19 +-
nautest1.dre | 58 +
nautest1a.ans | 149 +
nautest1a.dre | 149 +
nautest1b.ans | 150 +
nautest1b.dre | 150 +
nautest1c.ans | 142 +
nautest1c.dre | 143 +
nautest2.c | 2 +-
nautest2.dre | 7 +
nautest2a.ans | 24 +
nautest2b.ans | 24 +
nautest2c.ans | 17 +
nautesta.ans | 2 +
nautestb.ans | 3391 ++++++++++++++
nautestc.ans | 2 +
nauthread1.c | 134 +
nauthread2.c | 140 +
nautil.c | 723 +--
nautinv.c | 390 +-
nautinv.h | 54 +-
naututil-h.in | 67 +-
naututil.c | 2733 +++++++----
naututil.h | 66 +-
nauty-h.in | 225 +-
nauty.c | 1388 +++---
nauty.h | 226 +-
nautyex1.c | 52 +-
nautyex10.c | 151 +
nautyex2.c | 52 +-
nautyex3.c | 36 +-
nautyex4.c | 16 +-
nautyex5.c | 61 +-
nautyex6.c | 103 +
nautyex5.c => nautyex7.c | 69 +-
nautyex8.c | 109 +
nautyex9.c | 118 +
newedgeg.c | 8 +-
nug.pdf | Bin 392620 -> 0 bytes
nug25.pdf | Bin 0 -> 574391 bytes
planarg.c | 587 +--
planarity.c | 25 +-
planarity.h | 2 +
biplabg.c => ranlabg.c | 86 +-
rng.c | 6 +-
runalltests | 80 +
schreier.c | 1124 +++++
schreier.h | 68 +
schreier.txt | 132 +
shortg.c | 866 ++--
showg.c | 32 +-
sorttemplates.c | 438 ++
splay.c | 1 +
subdivideg.c | 225 +
sumlines.c | 2011 ++++-----
testB.dre | 9 -
testL.dre | 81 -
testM.dre | 984 ----
testS.dre | 57 -
testW.dre | 57 -
testa.dre | 13 -
testg.c | 57 +-
testlab.c | 213 -
traces.c | 9396 ++++++++++++++++++++++++++++++++++++++
traces.h | 48 +
watercluster2.c | 4078 +++++++++++++++++
117 files changed, 43481 insertions(+), 22505 deletions(-)
diff --cc makefile.in
index 135c675,459c551..fcc5324
--- a/makefile.in
+++ b/makefile.in
@@@ -9,225 -10,234 +10,324 @@@ THREADLIB=@threadlib
LOK=@lok@ # 0 if no 64-bit integers
TESTPROGS=@testprogs@
EXEEXT=@EXEEXT@
- BIGTEST=1 # set to 0 if less than 512MB is available
SMALL=-DMAXN=WORDSIZE
- L1=-DMAXN=WORDSIZE -DWORDSIZE=64
- W1=-DMAXN=WORDSIZE -DWORDSIZE=32
S1=-DMAXN=WORDSIZE -DWORDSIZE=16
+ W1=-DMAXN=WORDSIZE -DWORDSIZE=32
+ L1=-DMAXN=WORDSIZE -DWORDSIZE=64
S=-DWORDSIZE=16
+ W=-DWORDSIZE=32
L=-DWORDSIZE=64
++<<<<<<< HEAD
+FOURK=-DMAXN=4096
+PICFLAGS=-fPIC
+TESTCFLAGS=-static
+
+NAUTYLIBOBJ= naututil.o nauty.o nautil.o nautinv.o naugraph.o rng.o
+GTLIBOBJ=gtools.o gtnauty.o nausparse.o gutil1.o gutil2.o naugroup.o
+LIBOBJ=${NAUTYLIBOBJ} ${GTLIBOBJ}
+
+SHNAUTYLIBOBJ= naututil.os nauty.os nautil.os nautinv.os naugraph.os rng.os
+SHGTLIBOBJ=gtools.os gtnauty.os nausparse.os gutil1.os gutil2.os naugroup.os
+SHLIBOBJ=${SHNAUTYLIBOBJ} ${SHGTLIBOBJ}
+
+STLIB=libnauty.a
+
+ifeq ($(SHARED),yes)
+SONAME?=libnauty.so.0
+SOMINOR?=.0.0
+SHLIB?=$(SONAME)$(SOMINOR)
+SHLINK?=libnauty.so
+BUILDSHLIBS=$(SONAME) $(SHLIB) $(SHLINK)
+LDFLAGS:=-L. -lnauty $(LDFLAGS)
+else
+BUILDSHLIBS=
+endif
+
+DESTDIR=
+GTOOLSBIN=copyg listg labelg dretog amtog geng complg shortg showg NRswitchg \
+ biplabg addedgeg deledgeg countg pickg genrang newedgeg catg genbg directg \
+ multig planarg gentourng
+BINARIES=$(GTOOLSBIN) dreadnaut
+
+.SUFFIXES: .os
+.c.os:
+ ${CC} -c ${PICFLAGS} ${CFLAGS} -o $@ $<
+
+%.o: %.c
+ ${CC} -c ${CFLAGS} -o $@ $<
+
+.PHONY: all nauty libs gtools install clean
++=======
+
+ CCOBJ=${CC} -c ${CFLAGS} -o $@
+ GTOOLSH=gtools.h nauty.h naututil.h nausparse.h naurng.h
+
+ # @edit_msg@
++>>>>>>> upstream/2.5r6
all : nauty gtools ;
- nauty : dreadnaut ;
+ nauty : dreadnaut nauty.a nauty1.a ;
++<<<<<<< HEAD
+LIBS=$(STLIB) $(BUILDSHLIBS)
+libs: $(LIBS)
+
+gtools: $(GTOOLSBIN)
+
+$(SHLIB): $(SHLIBOBJ)
+ gcc -shared -Wl,-soname=$(SONAME) -o $(SONAME)$(SOMINOR) $(SHLIBOBJ)
+
+$(SONAME): $(SHLIB)
+ rm -f $@ && ln -s $(SHLIB) $@
+
+$(SHLINK): $(SONAME)
+ rm -f $@ && ln -s $(SONAME) $@
+
+install-shlibs: $(SHLIB)
+ mkdir -p $(DESTDIR)/usr/lib
+ install -t $(DESTDIR)/usr/lib $(SHLIB)
+ cd $(DESTDIR)/usr/lib && ln -sf $(SONAME) $(SHLINK) && ln -sf $(SHLIB) $(SONAME)
+
+install:
+ mkdir -p $(DESTDIR)/usr/bin
+ install -t $(DESTDIR)/usr/bin $(BINARIES)
+
+install-dev:
+ mkdir -p $(DESTDIR)/usr/include
+ install -t $(DESTDIR)/usr/include nauty.h
+ mkdir -p $(DESTDIR)/usr/lib
+ install -t $(DESTDIR)/usr/lib $(STLIB)
+
+$(STLIB): $(LIBOBJ)
+ ar r $@ $(LIBOBJ)
+
+rng.o: rng.c
+ ${CC} -c ${CFLAGS} rng.c
+
+dreadnaut: dreadnaut.c $(LIBS)
+ ${CC} -o dreadnaut ${SAFECFLAGS} dreadnaut.c ${LDFLAGS}
+
+naututil.o: nauty.h naututil.h naututil.c
+nautil.o: nauty.h nautil.c
+nauty.o: nauty.h nauty.c
+nautinv.o: nauty.h naututil.h nautinv.c
+nautaux.o: nautaux.h nauty.h naututil.h nautaux.c
+naugraph.o: nauty.h naugraph.c
+nausparse.o : nauty.h nausparse.h nausparse.c
++=======
+ gtools : copyg listg labelg dretog amtog geng complg showg NRswitchg \
+ biplabg addedgeg deledgeg countg pickg genrang newedgeg catg genbg directg \
+ ranlabg multig planarg gentourng linegraphg watercluster2 \
+ subdivideg @shortg_or_null@ ;
+
+ NAUTYO=nauty.o nautil.o nausparse.o naugraph.o schreier.o naurng.o
+ NAUTY1O=nauty1.o nautil1.o nausparse.o naugraph1.o schreier.o naurng.o
+ NAUTYSO=nautyS.o nautilS.o nausparseS.o naugraphS.o schreierS.o naurng.o
+ NAUTYS1O=nautyS1.o nautilS1.o nausparseS.o naugraphS1.o schreierS.o naurng.o
+ NAUTYWO=nautyW.o nautilW.o nausparseW.o naugraphW.o schreierW.o naurng.o
+ NAUTYW1O=nautyW1.o nautilW1.o nausparseW.o naugraphW1.o schreierW.o naurng.o
+ NAUTYLO=nautyL.o nautilL.o nausparseL.o naugraphL.o schreierL.o naurng.o
+ NAUTYL1O=nautyL1.o nautilL1.o nausparseL.o naugraphL1.o schreierL.o naurng.o
+
+ nauty.o: nauty.h schreier.h nauty.c
+ ${CCOBJ} nauty.c
+ nauty1.o: nauty.h schreier.h nauty.c
+ ${CCOBJ} ${SMALL} nauty.c
+ nautyS.o: nauty.h schreier.h nauty.c
+ ${CCOBJ} ${S} nauty.c
+ nautyS1.o: nauty.h schreier.h nauty.c
+ ${CCOBJ} ${S1} nauty.c
+ nautyW.o: nauty.h schreier.h nauty.c
+ ${CCOBJ} ${W} nauty.c
+ nautyW1.o: nauty.h schreier.h nauty.c
+ ${CCOBJ} ${W1} nauty.c
+ nautyL.o: nauty.h schreier.h nauty.c
+ ${CCOBJ} ${L} nauty.c
+ nautyL1.o: nauty.h schreier.h nauty.c
+ ${CCOBJ} ${L1} nauty.c
+
+ nautil.o: nauty.h nautil.c sorttemplates.c
+ ${CCOBJ} nautil.c
+ nautil1.o: nauty.h nautil.c sorttemplates.c
+ ${CCOBJ} ${SMALL} nautil.c
+ nautilS.o: nauty.h nautil.c sorttemplates.c
+ ${CCOBJ} ${S} nautil.c
+ nautilS1.o: nauty.h nautil.c sorttemplates.c
+ ${CCOBJ} ${S1} nautil.c
+ nautilW.o: nauty.h nautil.c sorttemplates.c
+ ${CCOBJ} ${W} nautil.c
+ nautilW1.o: nauty.h nautil.c sorttemplates.c
+ ${CCOBJ} ${W1} nautil.c
+ nautilL.o: nauty.h nautil.c sorttemplates.c
+ ${CCOBJ} ${L} nautil.c
+ nautilL1.o: nauty.h nautil.c sorttemplates.c
+ ${CCOBJ} ${L1} nautil.c
++>>>>>>> upstream/2.5r6
- dreadnaut1: dreadnaut.c naututil1.o nauty1.o nautil1.o \
- nautinv1.o naugraph1.o rng.o
- ${CC} -o dreadnaut1 ${SAFECFLAGS} ${SMALL} dreadnaut.c naututil1.o \
- nauty1.o nautil1.o nautinv1.o naugraph1.o rng.o ${LDFLAGS}
- naututil1.o: nauty.h naututil.h naututil.c
- ${CC} -c ${CFLAGS} ${SMALL} -o naututil1.o naututil.c
- nautil1.o: nauty.h nautil.c
- ${CC} -c ${CFLAGS} ${SMALL} -o nautil1.o nautil.c
- nauty1.o: nauty.h nauty.c
- ${CC} -c ${CFLAGS} ${SMALL} -o nauty1.o nauty.c
- nautinv1.o: nauty.h naututil.h nautinv.c
- ${CC} -c ${CFLAGS} ${SMALL} -o nautinv1.o nautinv.c
- nautaux1.o: nautaux.h nauty.h naututil.h nautaux.c
- ${CC} -c ${CFLAGS} ${SMALL} -o nautaux1.o nautaux.c
+ naugraph.o: nauty.h naugraph.c
+ ${CCOBJ} naugraph.c
naugraph1.o: nauty.h naugraph.c
- ${CC} -c ${CFLAGS} ${SMALL} -o naugraph1.o naugraph.c
-
- dreadnaut4K: dreadnaut.c naututil4K.o nauty4K.o nautil4K.o \
- nautinv4K.o naugraph4K.o rng.o
- ${CC} -o dreadnaut4K ${SAFECFLAGS} ${FOURK} dreadnaut.c naututil4K.o \
- nauty4K.o nautil4K.o nautinv4K.o naugraph4K.o rng.o ${LDFLAGS}
- naututil4K.o: nauty.h naututil.h naututil.c
- ${CC} -c ${CFLAGS} ${FOURK} -o naututil4K.o naututil.c
- nautil4K.o: nauty.h nautil.c
- ${CC} -c ${CFLAGS} ${FOURK} -o nautil4K.o nautil.c
- nauty4K.o: nauty.h nauty.c
- ${CC} -c ${CFLAGS} ${FOURK} -o nauty4K.o nauty.c
- nautinv4K.o: nauty.h naututil.h nautinv.c
- ${CC} -c ${CFLAGS} ${FOURK} -o nautinv4K.o nautinv.c
- nautaux4K.o: nautaux.h nauty.h naututil.h nautaux.c
- ${CC} -c ${CFLAGS} ${FOURK} -o nautaux4K.o nautaux.c
- naugraph4K.o: nauty.h naugraph.c
- ${CC} -c ${CFLAGS} ${FOURK} -o naugraph4K.o naugraph.c
-
- dreadnautL1: dreadnaut.c naututilL1.o nautyL1.o nautilL1.o nautinvL1.o \
- naugraphL1.o rng.o
- ${CC} -o dreadnautL1 ${SAFECFLAGS} ${L1} dreadnaut.c naututilL1.o \
- nautyL1.o nautilL1.o nautinvL1.o naugraphL1.o rng.o ${LDFLAGS}
- naututilL1.o: nauty.h naututil.h naututil.c
- ${CC} -c ${CFLAGS} ${L1} -o naututilL1.o naututil.c
- nautilL1.o: nauty.h nautil.c
- ${CC} -c ${CFLAGS} ${L1} -o nautilL1.o nautil.c
- nautyL1.o: nauty.h nauty.c
- ${CC} -c ${CFLAGS} ${L1} -o nautyL1.o nauty.c
- nautinvL1.o: nauty.h naututil.h nautinv.c
- ${CC} -c ${CFLAGS} ${L1} -o nautinvL1.o nautinv.c
- nautauxL1.o: nautaux.h nauty.h naututil.h nautaux.c
- ${CC} -c ${CFLAGS} ${L1} -o nautauxL1.o nautaux.c
- naugraphL1.o: nauty.h naugraph.c
- ${CC} -c ${CFLAGS} ${L1} -o naugraphL1.o naugraph.c
-
- dreadnautW1: dreadnaut.c naututilW1.o nautyW1.o nautilW1.o nautinvW1.o \
- naugraphW1.o rng.o
- ${CC} -o dreadnautW1 ${SAFECFLAGS} ${W1} dreadnaut.c naututilW1.o \
- nautyW1.o nautilW1.o nautinvW1.o naugraphW1.o rng.o ${LDFLAGS}
- naututilW1.o: nauty.h naututil.h naututil.c
- ${CC} -c ${CFLAGS} ${W1} -o naututilW1.o naututil.c
- nautilW1.o: nauty.h nautil.c
- ${CC} -c ${CFLAGS} ${W1} -o nautilW1.o nautil.c
- nautyW1.o: nauty.h nauty.c
- ${CC} -c ${CFLAGS} ${W1} -o nautyW1.o nauty.c
- nautinvW1.o: nauty.h naututil.h nautinv.c
- ${CC} -c ${CFLAGS} ${W1} -o nautinvW1.o nautinv.c
- nautauxW1.o: nautaux.h nauty.h naututil.h nautaux.c
- ${CC} -c ${CFLAGS} ${W1} -o nautauxW1.o nautaux.c
+ ${CCOBJ} ${SMALL} naugraph.c
+ naugraphS.o: nauty.h naugraph.c
+ ${CCOBJ} ${S} naugraph.c
+ naugraphS1.o: nauty.h naugraph.c
+ ${CCOBJ} ${S1} naugraph.c
+ naugraphW.o: nauty.h naugraph.c
+ ${CCOBJ} ${W} naugraph.c
naugraphW1.o: nauty.h naugraph.c
- ${CC} -c ${CFLAGS} ${W1} -o naugraphW1.o naugraph.c
- gtoolsW1.o : gtools.h gtools.c
- ${CC} -c ${CFLAGS} ${W1} -o gtoolsW1.o gtools.c
-
-
- dreadnautS1: dreadnaut.c naututilS1.o nautyS1.o nautilS1.o nautinvS1.o \
- naugraphS1.o rng.o
- ${CC} -o dreadnautS1 ${SAFECFLAGS} ${S1} dreadnaut.c naututilS1.o \
- nautyS1.o nautilS1.o nautinvS1.o naugraphS1.o rng.o ${LDFLAGS}
- naututilS1.o: nauty.h naututil.h naututil.c
- ${CC} -c ${CFLAGS} ${S1} -o naututilS1.o naututil.c
- nautilS1.o: nauty.h nautil.c
- ${CC} -c ${CFLAGS} ${S1} -o nautilS1.o nautil.c
- nautyS1.o: nauty.h nauty.c
- ${CC} -c ${CFLAGS} ${S1} -o nautyS1.o nauty.c
+ ${CCOBJ} ${W1} naugraph.c
+ naugraphL.o: nauty.h naugraph.c
+ ${CCOBJ} ${L} naugraph.c
+ naugraphL1.o: nauty.h naugraph.c
+ ${CCOBJ} ${L1} naugraph.c
+
+ naututil.o: nauty.h naututil.h nausparse.h naututil.c
+ ${CCOBJ} naututil.c
+ naututil1.o: nauty.h naututil.h nausparse.h naututil.c
+ ${CCOBJ} ${SMALL} naututil.c
+ naututilS.o: nauty.h naututil.h nausparse.h naututil.c
+ ${CCOBJ} ${S} naututil.c
+ naututilS1.o: nauty.h naututil.h nausparse.h naututil.c
+ ${CCOBJ} ${S1} naututil.c
+ naututilW.o: nauty.h naututil.h nausparse.h naututil.c
+ ${CCOBJ} ${W} naututil.c
+ naututilW1.o: nauty.h naututil.h nausparse.h naututil.c
+ ${CCOBJ} ${W1} naututil.c
+ naututilL.o: nauty.h naututil.h nausparse.h naututil.c
+ ${CCOBJ} ${L} naututil.c
+ naututilL1.o: nauty.h naututil.h nausparse.h naututil.c
+ ${CCOBJ} ${L1} naututil.c
+
+ nautinv.o: nauty.h naututil.h nautinv.c
+ ${CCOBJ} nautinv.c
+ nautinv1.o: nauty.h naututil.h nautinv.c
+ ${CCOBJ} ${SMALL} nautinv.c
+ nautinvS.o: nauty.h naututil.h nautinv.c
+ ${CCOBJ} ${S} nautinv.c
nautinvS1.o: nauty.h naututil.h nautinv.c
- ${CC} -c ${CFLAGS} ${S1} -o nautinvS1.o nautinv.c
- nautauxS1.o: nautaux.h nauty.h naututil.h nautaux.c
- ${CC} -c ${CFLAGS} ${S1} -o nautauxS1.o nautaux.c
- naugraphS1.o: nauty.h naugraph.c
- ${CC} -c ${CFLAGS} ${S1} -o naugraphS1.o naugraph.c
+ ${CCOBJ} ${S1} nautinv.c
+ nautinvW.o: nauty.h naututil.h nautinv.c
+ ${CCOBJ} ${W} nautinv.c
+ nautinvW1.o: nauty.h naututil.h nautinv.c
+ ${CCOBJ} ${W1} nautinv.c
+ nautinvL.o: nauty.h naututil.h nautinv.c
+ ${CCOBJ} ${L} nautinv.c
+ nautinvL1.o: nauty.h naututil.h nautinv.c
+ ${CCOBJ} ${L1} nautinv.c
+
+ schreier.o : nauty.h naurng.h schreier.h schreier.c
+ ${CCOBJ} schreier.c
+ schreierS.o : nauty.h naurng.h schreier.h schreier.c
+ ${CCOBJ} ${S} schreier.c
+ schreierW.o : nauty.h naurng.h schreier.h schreier.c
+ ${CCOBJ} ${W} schreier.c
+ schreierL.o : nauty.h naurng.h schreier.h schreier.c
+ ${CCOBJ} ${L} schreier.c
+
+ nausparse.o : nauty.h nausparse.h nausparse.c sorttemplates.c
+ ${CCOBJ} nausparse.c
+ nausparseS.o: nauty.h nausparse.h nausparse.c sorttemplates.c
+ ${CCOBJ} ${S} nausparse.c
+ nausparseW.o: nauty.h nausparse.h nausparse.c sorttemplates.c
+ ${CCOBJ} ${W} nausparse.c
+ nausparseL.o: nauty.h nausparse.h nausparse.c sorttemplates.c
+ ${CCOBJ} ${L} nausparse.c
+
+ traces.o : nauty.h naurng.h schreier.h traces.h nausparse.h traces.c
+ ${CCOBJ} traces.c
+ tracesS.o : nauty.h naurng.h schreier.h traces.h nausparse.h traces.c
+ ${CCOBJ} ${S} traces.c
+ tracesW.o : nauty.h naurng.h schreier.h traces.h nausparse.h traces.c
+ ${CCOBJ} ${W} traces.c
+ tracesL.o : nauty.h naurng.h schreier.h traces.h nausparse.h traces.c
+ ${CCOBJ} ${L} traces.c
+
+ gtools.o : ${GTOOLSH} gtools.c
+ ${CCOBJ} gtools.c
+ gtoolsS.o : ${GTOOLSH} gtools.c
+ ${CCOBJ} ${S} gtools.c
+ gtoolsW.o : ${GTOOLSH} gtools.c
+ ${CCOBJ} ${W} gtools.c
+ gtoolsL.o : ${GTOOLSH} gtools.c
+ ${CCOBJ} ${L} gtools.c
+ nautaux.o: nautaux.h nauty.h naututil.h nautaux.c
+ ${CCOBJ} nautaux.c
+ nautauxS.o: nautaux.h nauty.h naututil.h nautaux.c
+ ${CCOBJ} ${S} nautaux.c
+ nautauxW.o: nautaux.h nauty.h naututil.h nautaux.c
+ ${CCOBJ} ${W} nautaux.c
+ nautauxL.o: nautaux.h nauty.h naututil.h nautaux.c
+ ${CCOBJ} ${L} nautaux.c
+
+ gtnauty.o : ${GTOOLSH} gtnauty.c sorttemplates.c
+ ${CCOBJ} gtnauty.c
+ gtnautyL1.o : ${GTOOLSH} gtnauty.c sorttemplates.c
+ ${CCOBJ} ${L1} gtnauty.c
+ gtnautyW1.o : ${GTOOLSH} gtnauty.c sorttemplates.c
+ ${CCOBJ} ${W1} gtnauty.c
+ gtnautyL.o : ${GTOOLSH} gtnauty.c sorttemplates.c
+ ${CCOBJ} ${L} gtnauty.c
+ gtnautyW.o : ${GTOOLSH} gtnauty.c sorttemplates.c
+ ${CCOBJ} ${W} gtnauty.c
+
+ naurng.o: naurng.c nauty.h
+ ${CCOBJ} naurng.c
+ rng.o: rng.c nauty.h
+ ${CCOBJ} rng.c
+
+ dreadnaut: dreadnaut.c naututil.o nautinv.o traces.o gtools.o ${NAUTYO}
+ ${CC} -o dreadnaut ${SAFECFLAGS} dreadnaut.c naututil.o \
+ nautinv.o gtools.o traces.o ${NAUTYO} ${LDFLAGS} ${THREADLIB}
dreadnautL: dreadnaut.c naututilL.o nautyL.o nautilL.o nautinvL.o \
- naugraphL.o rng.o
+ nausparseL.o naugraphL.o naurng.o schreierL.o tracesL.o gtoolsL.o
${CC} -o dreadnautL ${SAFECFLAGS} ${L} dreadnaut.c naututilL.o \
- nautyL.o nautilL.o nautinvL.o naugraphL.o rng.o ${LDFLAGS}
- naututilL.o: nauty.h naututil.h naututil.c
- ${CC} -c ${CFLAGS} ${L} -o naututilL.o naututil.c
- nautilL.o: nauty.h nautil.c
- ${CC} -c ${CFLAGS} ${L} -o nautilL.o nautil.c
- nautyL.o: nauty.h nauty.c
- ${CC} -c ${CFLAGS} ${L} -o nautyL.o nauty.c
- nautinvL.o: nauty.h naututil.h nautinv.c
- ${CC} -c ${CFLAGS} ${L} -o nautinvL.o nautinv.c
- nautauxL.o: nautaux.h nauty.h naututil.h nautaux.c
- ${CC} -c ${CFLAGS} ${L} -o nautauxL.o nautaux.c
- naugraphL.o: nauty.h naugraph.c
- ${CC} -c ${CFLAGS} ${L} -o naugraphL.o naugraph.c
-
- dreadnautS: dreadnaut.c naututilS.o nautyS.o nautilS.o nautinvS.o \
- naugraphS.o rng.o
- ${CC} -o dreadnautS ${SAFECFLAGS} ${S} dreadnaut.c naututilS.o \
- nautyS.o nautilS.o nautinvS.o naugraphS.o rng.o ${LDFLAGS}
- naututilS.o: nauty.h naututil.h naututil.c
- ${CC} -c ${CFLAGS} ${S} -o naututilS.o naututil.c
- nautilS.o: nauty.h nautil.c
- ${CC} -c ${CFLAGS} ${S} -o nautilS.o nautil.c
- nautyS.o: nauty.h nauty.c
- ${CC} -c ${CFLAGS} ${S} -o nautyS.o nauty.c
- nautinvS.o: nauty.h naututil.h nautinv.c
- ${CC} -c ${CFLAGS} ${S} -o nautinvS.o nautinv.c
- nautauxS.o: nautaux.h nauty.h naututil.h nautaux.c
- ${CC} -c ${CFLAGS} ${S} -o nautauxS.o nautaux.c
- naugraphS.o: nauty.h naugraph.c
- ${CC} -c ${CFLAGS} ${S} -o naugraphS.o naugraph.c
+ nautyL.o nautilL.o nautinvL.o naugraphL.o naurng.o gtoolsL.o \
+ nausparseL.o schreierL.o tracesL.o ${LDFLAGS}
+ dreadnaut1: dreadnaut.c naututil1.o nauty1.o nautil1.o nautinv1.o \
+ nausparse.o naugraph1.o naurng.o schreier.o traces.o gtools.o
+ ${CC} -o dreadnaut1 ${SAFECFLAGS} ${SMALL} dreadnaut.c naututil1.o \
+ nauty1.o nautil1.o nautinv1.o naugraph1.o naurng.o gtools.o \
+ nausparse.o schreier.o traces.o ${LDFLAGS}
+
+ nauty.a: ${NAUTYO} traces.o gtools.o naututil.o nautinv.o \
+ gutil1.o gutil2.o gtnauty.o naugroup.o
+ rm -rf nauty.a
+ ar crs nauty.a ${NAUTYO} traces.o gtools.o naututil.o \
+ nautinv.o gutil1.o gutil2.o gtnauty.o naugroup.o \
+ naurng.o schreier.o
+
+ nauty1.a: ${NAUTY1O} traces.o gtools.o naututil1.o nautinv1.o \
+ gutil1.o gutil2.o gtnauty.o naugroup.o
+ rm -rf nauty1.a
+ ar crs nauty1.a ${NAUTY1O} traces.o gtools.o naututil1.o \
+ nautinv1.o gutil1.o gutil2.o gtnauty.o naugroup.o
+
+ nautyW.a: ${NAUTYWO} traces.o gtoolsW.o naututilW.o nautinvW.o \
+ gutil1W.o gutil2W.o gtnautyW.o naugroupW.o
+ rm -rf nautyW.a
+ ar crs nautyW.a ${NAUTYWO} traces.o gtoolsW.o naututilW.o \
+ nautinvW.o gutil1W.o gutil2W.o gtnautyW.o naugroupW.o
+
+ nautyW1.a: ${NAUTYW1O} traces.o gtoolsW.o naututilW1.o nautinvW1.o \
+ gutil1W1.o gutil2W1.o gtnautyW1.o naugroupW.o
+ rm -rf nautyW1.a
+ ar crs nautyW1.a ${NAUTYW1O} traces.o gtoolsW.o naututilW1.o \
+ nautinvW1.o gutil1W1.o gutil2W1.o gtnautyW1.o naugroupW.o
+
+ nautyL.a: ${NAUTYLO} traces.o gtoolsL.o naututilL.o nautinvL.o \
+ gutil1L.o gutil2L.o gtnautyL.o naugroupL.o
+ rm -rf nautyL.a
+ ar crs nautyL.a ${NAUTYL1O} traces.o gtoolsL.o naututilL.o \
+ nautinvL.o gutil1L.o gutil2L.o gtnautyL.o naugroupL.o
+
+ nautyL1.a: ${NAUTYL1O} traces.o gtoolsL.o naututilL1.o nautinvL1.o \
+ gutil1L1.o gutil2L1.o gtnautyL1.o naugroupL.o
+ rm -rf nautyL1.a
+ ar crs nautyL1.a ${NAUTYL1O} traces.o gtoolsL.o naututilL1.o \
+ nautinvL1.o gutil1L1.o gutil2L1.o gtnautyL1.o naugroupL.o
clean:
rm -f *.o config.log config.cache config.status
@@@ -235,103 -246,145 +336,236 @@@
dreadtestS${EXEEXT} dreadtestS1${EXEEXT} \
dreadtest4K${EXEEXT} dreadtest1${EXEEXT} \
dreadtestL1${EXEEXT} dreadtestW1${EXEEXT}
+ rm -f libnauty.* *.os
+
++<<<<<<< HEAD
+gtools.h : nauty.h naututil.h nausparse.h
+ touch gtools.h
+
+gtools.o : gtools.h gtools.c
+ ${CC} -c ${CFLAGS} gtools.c
+
+gtnauty.o : gtools.h gtnauty.c
+ ${CC} -c ${CFLAGS} gtnauty.c
+gutil1.o : gtools.h gutils.h gutil1.c
+ ${CC} -c ${CFLAGS} gutil1.c
+
+gutil2.o : gtools.h gutils.h gutil2.c
+ ${CC} -c ${CFLAGS} gutil2.c
+
+catg : gtools.h catg.c $(LIBS)
+ ${CC} -o catg ${CFLAGS} catg.c ${LDFLAGS}
+
+copyg : gtools.h copyg.c $(LIBS)
+ ${CC} -o copyg ${CFLAGS} copyg.c ${LDFLAGS}
+
+listg : gtools.h listg.c $(LIBS)
+ ${CC} -o listg ${CFLAGS} listg.c ${LDFLAGS}
+
+labelg : gtools.h naututil.h labelg.c $(LIBS)
+ ${CC} -o labelg ${SAFECFLAGS} labelg.c ${LDFLAGS}
+
+shortg : gtools.h shortg.c $(LIBS)
+ ${CC} -o shortg ${CFLAGS} shortg.c ${LDFLAGS}
+
+dretog : gtools.h dretog.c $(LIBS)
+ ${CC} -o dretog ${CFLAGS} dretog.c ${LDFLAGS}
+
+amtog : gtools.h amtog.c $(LIBS)
+ ${CC} -o amtog ${CFLAGS} amtog.c ${LDFLAGS}
-
- genbg : gtools.h genbg.c gtoolsW1.o nautyW1.o nautilW1.o naugraphW1.o
- ${CC} -o genbg ${CFLAGS} ${W1} genbg.c gtoolsW1.o \
- nautyW1.o nautilW1.o naugraphW1.o ${LDFLAGS}
-
- genbgL : gtools.h genbg.c gtoolsL1.o nautyL1.o nautilL1.o naugraphL1.o
- ${CC} -o genbgL ${CFLAGS} ${L1} -DMAXN1=30 genbg.c gtoolsL1.o \
- nautyL1.o nautilL1.o naugraphL1.o ${LDFLAGS}
-
++=======
+ gutil1.o : ${GTOOLSH} gutils.h gutil1.c
+ ${CCOBJ} gutil1.c
+ gutil2.o : ${GTOOLSH} gutils.h gutil2.c
+ ${CCOBJ} gutil2.c
+ gutil1W1.o : ${GTOOLSH} gutils.h gutil1.c
+ ${CCOBJ} ${W1} gutil1.c
+ gutil2W1.o : ${GTOOLSH} gutils.h gutil2.c
+ ${CCOBJ} ${W1} gutil2.c
+ gutil1L1.o : ${GTOOLSH} gutils.h gutil1.c
+ ${CCOBJ} ${L1} gutil1.c
+ gutil2L1.o : ${GTOOLSH} gutils.h gutil2.c
+ ${CCOBJ} ${L1} gutil2.c
+ gutil1W.o : ${GTOOLSH} gutils.h gutil1.c
+ ${CCOBJ} ${W} gutil1.c
+ gutil2W.o : ${GTOOLSH} gutils.h gutil2.c
+ ${CCOBJ} ${W} gutil2.c
+ gutil1L.o : ${GTOOLSH} gutils.h gutil1.c
+ ${CCOBJ} ${L} gutil1.c
+ gutil2L.o : ${GTOOLSH} gutils.h gutil2.c
+ ${CCOBJ} ${L} gutil2.c
+
+ catg : ${GTOOLSH} catg.c gtools.o
+ ${CC} -o catg ${CFLAGS} catg.c gtools.o ${LDFLAGS}
+
+ copyg : ${GTOOLSH} copyg.c gtools.o
+ ${CC} -o copyg ${CFLAGS} copyg.c gtools.o ${LDFLAGS}
+
+ listg : ${GTOOLSH} listg.c gtools.o nautil.o
+ ${CC} -o listg ${CFLAGS} listg.c gtools.o nautil.o ${LDFLAGS}
+
+ labelg : ${GTOOLSH} naututil.h labelg.c gtools.o gtnauty.o ${NAUTYO} \
+ nautinv.o nausparse.h gutils.h gutil2.o traces.h traces.o
+ ${CC} -o labelg ${SAFECFLAGS} labelg.c gtools.o gtnauty.o \
+ nautinv.o gutil2.o traces.o ${NAUTYO} ${LDFLAGS} ${THREADLIB}
+
+ shortg : ${GTOOLSH} shortg.c gtools.o gtnauty.o ${NAUTYO} \
+ nausparse.h gutils.h gutil2.o nautinv.h nautinv.o traces.o
+ ${CC} -o shortg ${CFLAGS} shortg.c gtools.o gtnauty.o nautinv.o \
+ ${NAUTYO} gutil2.o traces.o ${LDFLAGS} ${THREADLIB}
+
+ dretog : ${GTOOLSH} dretog.c naututil.o gtools.o ${NAUTYO}
+ ${CC} -o dretog ${CFLAGS} dretog.c naututil.o gtools.o \
+ ${NAUTYO} ${LDFLAGS}
+
+ amtog : ${GTOOLSH} amtog.c gtools.o ${NAUTYO}
+ ${CC} -o amtog ${CFLAGS} amtog.c gtools.o ${NAUTYO} ${LDFLAGS}
++>>>>>>> upstream/2.5r6
+
+ genbg : ${GTOOLSH} genbg.c gtoolsW.o nautyW1.o nautilW1.o naugraphW1.o \
+ schreierW.o naurng.o
+ ${CC} -o genbg ${CFLAGS} ${W1} genbg.c gtoolsW.o schreierW.o \
+ nautyW1.o nautilW1.o naugraphW1.o naurng.o ${LDFLAGS}
+
+ genbgL : ${GTOOLSH} genbg.c gtoolsL.o nautyL1.o nautilL1.o naugraphL1.o \
+ schreierL.o naurng.o
+ ${CC} -o genbgL ${CFLAGS} ${L1} -DMAXN1=30 genbg.c gtoolsL.o \
+ schreierL.o naurng.o nautyL1.o nautilL1.o naugraphL1.o ${LDFLAGS}
+
++<<<<<<< HEAD
+geng : gtools.h geng.c nauty1.o nautil1.o naugraph1.o
+ ${CC} -o geng ${CFLAGS} -DMAXN=32 geng.c nauty1.o \
+ nautil1.o naugraph1.o ${LDFLAGS}
+
+geng16 : gtools.h geng.c nauty1.o nautil1.o naugraph1.o
+ ${CC} -o geng16 ${CFLAGS} -DMAXN=16 geng.c nauty1.o \
+ nautil1.o naugraph1.o ${LDFLAGS}
+
+geng24 : gtools.h geng.c nauty1.o nautil1.o naugraph1.o
+ ${CC} -o geng24 ${CFLAGS} -DMAXN=24 geng.c nauty1.o \
+ nautil1.o naugraph1.o ${LDFLAGS}
-
- gentourng : gtools.h gentourng.c gtools.o nauty1.o nautil1.o naugraph1.o
++=======
+ geng : ${GTOOLSH} geng.c gtools.o nauty1.o nautil1.o naugraph1.o schreier.o naurng.o
+ ${CC} -o geng ${CFLAGS} -DMAXN=32 geng.c gtools.o nauty1.o \
+ nautil1.o naugraph1.o schreier.o naurng.o ${LDFLAGS}
+
+ geng16 : ${GTOOLSH} geng.c gtools.o nauty1.o nautil1.o naugraph1.o schreier.o naurng.o
+ ${CC} -o geng16 ${CFLAGS} -DMAXN=16 geng.c gtools.o nauty1.o \
+ nautil1.o naugraph1.o schreier.o naurng.o ${LDFLAGS}
+
+ geng24 : ${GTOOLSH} geng.c gtools.o nauty1.o nautil1.o naugraph1.o schreier.o naurng.o
+ ${CC} -o geng24 ${CFLAGS} -DMAXN=24 geng.c gtools.o nauty1.o \
+ nautil1.o naugraph1.o schreier.o naurng.o ${LDFLAGS}
++>>>>>>> upstream/2.5r6
+
+ gentourng : ${GTOOLSH} gentourng.c gtools.o nauty1.o nautil1.o \
+ naugraph1.o schreier.o naurng.o
${CC} -o gentourng ${CFLAGS} -DMAXN=24 gentourng.c gtools.o nauty1.o \
- nautil1.o naugraph1.o ${LDFLAGS}
+ nautil1.o naugraph1.o schreier.o naurng.o ${LDFLAGS}
++<<<<<<< HEAD
+genrang : gtools.h genrang.c $(LIBS)
+ ${CC} -o genrang ${CFLAGS} genrang.c ${LDFLAGS}
+
+complg : gtools.h complg.c
+ ${CC} -o complg ${CFLAGS} complg.c ${LDFLAGS}
+
+biplabg : gtools.h biplabg.c $(LIBS)
+ ${CC} -o biplabg ${CFLAGS} biplabg.c ${LDFLAGS}
+
+NRswitchg : gtools.h NRswitchg.c $(LIBS)
+ ${CC} -o NRswitchg ${CFLAGS} NRswitchg.c ${LDFLAGS}
+
+deledgeg : gtools.h deledgeg.c $(LIBS)
+ ${CC} -o deledgeg ${CFLAGS} deledgeg.c ${LDFLAGS}
+
+addedgeg : gtools.h addedgeg.c $(LIBS)
+ ${CC} -o addedgeg ${CFLAGS} addedgeg.c ${LDFLAGS}
+
+newedgeg : gtools.h newedgeg.c $(LIBS)
+ ${CC} -o newedgeg ${CFLAGS} newedgeg.c ${LDFLAGS}
+
+pickg : gtools.h testg.c splay.c $(LIBS)
+ ${CC} -o pickg ${SAFECFLAGS} testg.c ${LDFLAGS}
+
+countg : gtools.h testg.c splay.c $(LIBS)
+ ${CC} -o countg ${SAFECFLAGS} testg.c ${LDFLAGS}
+
+directg : gtools.h naugroup.h directg.c $(LIBS)
+ ${CC} -o directg ${CFLAGS} directg.c ${LDFLAGS}
+
+multig : gtools.h naugroup.h multig.c $(LIBS)
+ ${CC} -o multig ${CFLAGS} multig.c ${LDFLAGS}
+
+planarg : gtools.h planarg.c planarity.c $(LIBS)
+ ${CC} -o planarg ${CFLAGS} planarg.c planarity.c ${LDFLAGS}
++=======
+ genrang : ${GTOOLSH} genrang.c gtools.o naututil.o ${NAUTYO}
+ ${CC} -o genrang ${CFLAGS} genrang.c \
+ gtools.o naututil.o ${NAUTYO} ${LDFLAGS}
+
+ complg : ${GTOOLSH} complg.c gtools.o gtnauty.o ${NAUTYO}
+ ${CC} -o complg ${CFLAGS} complg.c gtools.o gtnauty.o \
+ ${NAUTYO} ${LDFLAGS}
+
+ linegraphg : ${GTOOLSH} linegraphg.c gtools.o ${NAUTYO}
+ ${CC} -o linegraphg ${CFLAGS} linegraphg.c gtools.o \
+ ${NAUTYO} ${LDFLAGS}
+
+ subdivideg : ${GTOOLSH} subdivideg.c gtools.o ${NAUTYO}
+ ${CC} -o subdivideg ${CFLAGS} subdivideg.c gtools.o \
+ ${NAUTYO} ${LDFLAGS}
+
+ biplabg : ${GTOOLSH} gutils.h biplabg.c gtools.o gutil1.o ${NAUTYO}
+ ${CC} -o biplabg ${CFLAGS} biplabg.c \
+ gtools.o gutil1.o ${NAUTYO} ${LDFLAGS}
+
+ ranlabg : ${GTOOLSH} ranlabg.c gtools.o ${NAUTYO}
+ ${CC} -o ranlabg ${CFLAGS} ranlabg.c gtools.o ${NAUTYO} ${LDFLAGS}
+
+ NRswitchg : ${GTOOLSH} NRswitchg.c gtools.o gtnauty.o ${NAUTYO}
+ ${CC} -o NRswitchg ${CFLAGS} NRswitchg.c gtools.o gtnauty.o \
+ ${NAUTYO} ${LDFLAGS}
+
+ deledgeg : ${GTOOLSH} deledgeg.c gtools.o gtnauty.o ${NAUTYO}
+ ${CC} -o deledgeg ${CFLAGS} deledgeg.c gtools.o gtnauty.o \
+ ${NAUTYO} ${LDFLAGS}
+
+ addedgeg : ${GTOOLSH} gutils.h addedgeg.c gtools.o gtnauty.o gutil1.o ${NAUTYO}
+ ${CC} -o addedgeg ${CFLAGS} addedgeg.c gtools.o gtnauty.o \
+ gutil1.o ${NAUTYO} ${LDFLAGS}
+
+ newedgeg : ${GTOOLSH} gutils.h newedgeg.c gtools.o gtnauty.o ${NAUTYO}
+ ${CC} -o newedgeg ${CFLAGS} newedgeg.c gtools.o gtnauty.o \
+ ${NAUTYO} ${LDFLAGS}
+
+ pickg : ${GTOOLSH} gutils.h testg.c splay.c ${NAUTYO} \
+ gtools.o gtnauty.o gutil1.o gutil2.o
+ ${CC} -o pickg ${SAFECFLAGS} testg.c gtools.o gtnauty.o gutil1.o \
+ gutil2.o ${NAUTYO} ${LDFLAGS}
+
+ countg : ${GTOOLSH} gutils.h testg.c splay.c ${NAUTYO} \
+ gtools.o gtnauty.o gutil1.o gutil2.o
+ ${CC} -o countg ${SAFECFLAGS} testg.c gtools.o gtnauty.o gutil1.o \
+ gutil2.o ${NAUTYO} ${LDFLAGS}
+
+ directg : ${GTOOLSH} naugroup.h directg.c gtools.o naugroup.o ${NAUTYO}
+ ${CC} -o directg ${CFLAGS} directg.c gtools.o \
+ ${NAUTYO} naugroup.o ${LDFLAGS}
+
+ multig : ${GTOOLSH} naugroup.h multig.c gtools.o naugroup.o ${NAUTYO}
+ ${CC} -o multig ${CFLAGS} multig.c gtools.o \
+ ${NAUTYO} naugroup.o ${LDFLAGS}
+
+ planarg : ${GTOOLSH} planarg.c gtools.o planarity.c
+ ${CC} -o planarg ${CFLAGS} \
+ planarg.c planarity.c gtools.o ${LDFLAGS}
++>>>>>>> upstream/2.5r6
+
+ watercluster2 : ${GTOOLSH} nauty.h watercluster2.c gtools.o ${NAUTYO}
+ ${CC} -o watercluster2 ${CFLAGS} -DMAXN=32 watercluster2.c \
+ gtools.o ${NAUTYO} ${LDFLAGS}
showg : showg.c
${CC} -o showg ${CFLAGS} showg.c ${LDFLAGS}
@@@ -349,107 -397,74 +578,169 @@@ readg
sumlines : sumlines.c
${CC} -o sumlines ${CFLAGS} sumlines.c ${LDFLAGS} -lgmp
- nautyex1 : nauty.h nauty.o nautil.o naugraph.o nautyex1.c
- ${CC} -o nautyex1 ${CFLAGS} nautyex1.c nauty.o nautil.o \
- naugraph.o ${LDFLAGS}
-
- nautyex2 : nauty.h nauty.o nautil.o naugraph.o nautyex2.c
- ${CC} -o nautyex2 ${CFLAGS} \
- nautyex2.c nauty.o nautil.o naugraph.o ${LDFLAGS}
-
naugroup.o : nauty.h naugroup.h naugroup.c
++<<<<<<< HEAD
+ ${CC} -c ${CFLAGS} naugroup.c
+
+nautyex3 : nauty.h nauty.o nautil.o naugraph.o naugroup.o nautyex3.c
+ ${CC} -o nautyex3 ${CFLAGS} \
+ nautyex3.c nauty.o nautil.o naugraph.o naugroup.o ${LDFLAGS}
+
+nautyex4 : nauty.h nausparse.h nauty.o nautil.o \
+ nausparse.o naugroup.o nautyex4.c
+ ${CC} -o nautyex4 ${CFLAGS} \
+ nautyex4.c nauty.o nautil.o nausparse.o naugroup.o ${LDFLAGS}
+
+nautyex5 : nauty.h nausparse.h nauty.o nautil.o \
+ nausparse.o naugroup.o nautyex5.c
+ ${CC} -o nautyex5 ${CFLAGS} \
+ nautyex5.c nauty.o nautil.o nausparse.o naugroup.o ${LDFLAGS}
+
+dreadtest: dreadtest.c naututil.o nauty.o nautil.o nautinv.o naugraph.o rng.o
+ ${CC} -o dreadtest ${TESTCFLAGS} ${SAFECFLAGS} dreadtest.c \
+ naututil.o nauty.o nautil.o nautinv.o naugraph.o rng.o ${LDFLAGS}
+ ./dreadtest <testS.dre
+ ./dreadtest <testW.dre
+ ./dreadtest <testL.dre
+ ./dreadtest <testM.dre
+ ./dreadtest <testa.dre
+ test ${BIGTEST} -eq 0 || ./dreadtest < testB.dre
+ rm dreadtest${EXEEXT}
+
+dreadtestL: dreadtest.c \
+ naututilL.o nautyL.o nautilL.o nautinvL.o naugraphL.o rng.o
+ ${CC} -o dreadtestL ${TESTCFLAGS} ${SAFECFLAGS} ${L} dreadtest.c naututilL.o \
+ nautyL.o nautilL.o nautinvL.o naugraphL.o rng.o ${LDFLAGS}
+ ./dreadtestL < testS.dre
+ ./dreadtestL < testW.dre
+ ./dreadtestL < testL.dre
+ ./dreadtestL < testM.dre
+ ./dreadtestL < testa.dre
+ rm dreadtestL${EXEEXT}
+
+dreadtestS: dreadtest.c \
+ naututilS.o nautyS.o nautilS.o nautinvS.o naugraphS.o rng.o
+ ${CC} -o dreadtestS ${TESTCFLAGS} ${SAFECFLAGS} ${S} dreadtest.c naututilS.o \
+ nautyS.o nautilS.o nautinvS.o naugraphS.o rng.o ${LDFLAGS}
+ ./dreadtestS < testS.dre
+ ./dreadtestS < testW.dre
+ ./dreadtestS < testL.dre
+ ./dreadtestS < testM.dre
+ ./dreadtestS < testa.dre
+ rm dreadtestS${EXEEXT}
+
+dreadtest4K: dreadtest.c \
+ naututil4K.o nauty4K.o nautil4K.o nautinv4K.o naugraph4K.o rng.o
+ ${CC} -o dreadtest4K ${TESTCFLAGS} ${SAFECFLAGS} ${FOURK} dreadtest.c naututil4K.o \
+ nauty4K.o nautil4K.o nautinv4K.o naugraph4K.o rng.o ${LDFLAGS}
+ ./dreadtest4K <testS.dre
+ ./dreadtest4K <testW.dre
+ ./dreadtest4K < testM.dre
+ rm dreadtest4K${EXEEXT}
+
+dreadtest1: dreadtest.c \
+ naututil1.o nauty1.o nautil1.o nautinv1.o naugraph1.o rng.o
+ ${CC} -o dreadtest1 ${TESTCFLAGS} ${SAFECFLAGS} ${SMALL} dreadtest.c naututil1.o \
+ nauty1.o nautil1.o nautinv1.o naugraph1.o rng.o ${LDFLAGS}
+ ./dreadtest1 < testS.dre
+ ./dreadtest1 < testW.dre
+ rm dreadtest1${EXEEXT}
+
+dreadtestL1: dreadtest.c \
+ naututilL1.o nautyL1.o nautilL1.o nautinvL1.o naugraphL1.o rng.o
+ ${CC} -o dreadtestL1 ${TESTCFLAGS} ${SAFECFLAGS} ${L1} dreadtest.c naututilL1.o \
+ nautyL1.o nautilL1.o nautinvL1.o naugraphL1.o rng.o ${LDFLAGS}
+ ./dreadtestL1 <testS.dre
+ ./dreadtestL1 <testW.dre
+ ./dreadtestL1 <testL.dre
+ rm dreadtestL1${EXEEXT}
+
+dreadtestW1: dreadtest.c \
+ naututilW1.o nautyW1.o nautilW1.o nautinvW1.o naugraphW1.o rng.o
+ ${CC} -o dreadtestW1 ${TESTCFLAGS} ${SAFECFLAGS} ${W1} dreadtest.c naututilW1.o \
+ nautyW1.o nautilW1.o nautinvW1.o naugraphW1.o rng.o ${LDFLAGS}
+ ./dreadtestW1 <testS.dre
+ ./dreadtestW1 <testW.dre
+ rm dreadtestW1${EXEEXT}
+
+dreadtestS1: dreadtest.c \
+ naututilS1.o nautyS1.o nautilS1.o nautinvS1.o naugraphS1.o rng.o
+ ${CC} -o dreadtestS1 ${TESTCFLAGS} ${SAFECFLAGS} ${S1} dreadtest.c naututilS1.o \
+ nautyS1.o nautilS1.o nautinvS1.o naugraphS1.o rng.o ${LDFLAGS}
+ ./dreadtestS1 <testS.dre
+
+checks: ${TESTPROGS}
+
+checks6: checks6.c gtools.h gtools.o
++=======
+ ${CCOBJ} naugroup.c
+ naugroupW.o : nauty.h naugroup.h naugroup.c
+ ${CCOBJ} ${W} naugroup.c
+ naugroupL.o : nauty.h naugroup.h naugroup.c
+ ${CCOBJ} ${L} naugroup.c
+
+ nautyex1 : nauty.h nautyex1.c nauty.a
+ ${CC} -o nautyex1 ${CFLAGS} nautyex1.c nauty.a ${LDFLAGS}
+ nautyex2 : nauty.h nautyex2.c ${NAUTYO}
+ ${CC} -o nautyex2 ${CFLAGS} nautyex2.c nauty.a ${LDFLAGS}
+ nautyex3 : nauty.h nautyex3.c nauty.a
+ ${CC} -o nautyex3 ${CFLAGS} nautyex3.c nauty.a ${LDFLAGS}
+ nautyex4 : nauty.h nausparse.h nautyex4.c nauty.a
+ ${CC} -o nautyex4 ${CFLAGS} nautyex4.c nauty.a ${LDFLAGS}
+ nautyex5 : nauty.h nausparse.h nautyex5.c nauty.a
+ ${CC} -o nautyex5 ${CFLAGS} nautyex5.c nauty.a ${LDFLAGS}
+ nautyex6 : nauty.h nautyex6.c nauty.a
+ ${CC} -o nautyex6 ${CFLAGS} nautyex6.c nauty.a ${LDFLAGS}
+ nautyex7 : nauty.h nautyex7.c traces.h nauty.a
+ ${CC} -o nautyex7 ${CFLAGS} nautyex7.c nauty.a ${LDFLAGS}
+ nautyex8 : nauty.h nausparse.h nautyex8.c nauty.a
+ ${CC} -o nautyex8 ${CFLAGS} nautyex8.c nauty.a ${LDFLAGS}
+ nautyex9 : nauty.h nautyex9.c nauty.a
+ ${CC} -o nautyex9 ${CFLAGS} nautyex9.c nauty.a ${LDFLAGS}
+ nautyex10 : nauty.h nautyex10.c nauty.a
+ ${CC} -o nautyex10 ${CFLAGS} nautyex10.c nauty.a ${LDFLAGS}
+
+ checks: naucompare ${TESTPROGS} ;
+
+ naucompare : naucompare.c
+ ${CC} -o naucompare ${CFLAGS} naucompare.c ${LDFLAGS}
+
+ dreadtest: dreadnaut.c nautinv.o ${NAUTYO} naututil.o traces.o gtools.o
+ ${CC} -o dreadtest ${SAFECFLAGS} -DDREADTEST dreadnaut.c \
+ nautinv.o naututil.o traces.o gtools.o ${NAUTYO} ${LDFLAGS}
+ dreadtest1: dreadnaut.c nautinv1.o ${NAUTY1O} naututil1.o traces.o gtools.o
+ ${CC} -o dreadtest1 ${SAFECFLAGS} ${SMALL} -DDREADTEST dreadnaut.c \
+ nautinv1.o naututil1.o traces.o gtools.o ${NAUTY1O} ${LDFLAGS}
+ dreadtestS: dreadnaut.c nautinvS.o ${NAUTYSO} naututilS.o tracesS.o gtoolsS.o
+ ${CC} -o dreadtestS ${SAFECFLAGS} ${S} -DDREADTEST dreadnaut.c \
+ nautinvS.o naututilS.o tracesS.o gtoolsS.o ${NAUTYSO} ${LDFLAGS}
+ dreadtestS1: dreadnaut.c nautinvS1.o ${NAUTYS1O} naututilS1.o \
+ tracesS.o gtoolsS.o
+ ${CC} -o dreadtestS1 ${SAFECFLAGS} ${S1} -DDREADTEST dreadnaut.c \
+ nautinvS1.o naututilS1.o tracesS.o gtoolsS.o ${NAUTYS1O} ${LDFLAGS}
+ dreadtestW: dreadnaut.c nautinvW.o ${NAUTYWO} naututilW.o tracesW.o gtoolsW.o
+ ${CC} -o dreadtestW ${SAFECFLAGS} ${W} -DDREADTEST dreadnaut.c \
+ nautinvW.o naututilW.o tracesW.o gtoolsW.o ${NAUTYWO} ${LDFLAGS}
+ dreadtestW1: dreadnaut.c nautinvW1.o ${NAUTYW1O} naututilW1.o \
+ tracesW.o gtoolsW.o
+ ${CC} -o dreadtestW1 ${SAFECFLAGS} ${W1} -DDREADTEST dreadnaut.c \
+ nautinvW1.o naututilW1.o tracesW.o gtoolsW.o ${NAUTYW1O} ${LDFLAGS}
+ dreadtestL: dreadnaut.c nautinvL.o ${NAUTYLO} naututilL.o tracesL.o gtoolsL.o
+ ${CC} -o dreadtestL ${SAFECFLAGS} ${L} -DDREADTEST dreadnaut.c \
+ nautinvL.o naututilL.o tracesL.o gtoolsL.o ${NAUTYLO} ${LDFLAGS}
+ dreadtestL1: dreadnaut.c nautinvL1.o ${NAUTYL1O} naututilL1.o \
+ tracesL.o gtoolsL.o
+ ${CC} -o dreadtestL1 ${SAFECFLAGS} ${L1} -DDREADTEST dreadnaut.c \
+ nautinvL1.o naututilL1.o tracesL.o gtoolsL.o ${NAUTYL1O} ${LDFLAGS}
+ dreadtest4K: dreadnaut.c nausparse.c schreier.c naututil.c nauty.c \
+ nautil.c nautinv.c naugraph.c naurng.o gtools.c traces.c
+ ${CC} -o dreadtest4K ${SAFECFLAGS} -DMAXN=4096 -DDREADTEST \
+ dreadnaut.c naututil.c nauty.c nautil.c nautinv.c \
+ naugraph.c nausparse.c naurng.o schreier.c gtools.c \
+ traces.c ${LDFLAGS}
+
+ checks6: checks6.c ${GTOOLSH} gtools.o
++>>>>>>> upstream/2.5r6
${CC} -o checks6 ${SAFECFLAGS} checks6.c gtools.o
bigs: gtnauty.o gutil2.o nausparse.o nautil.o naututil.o gtools.o \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/nauty.git
More information about the debian-science-commits
mailing list