Introduced ZEROORMORE arity, something appears to be broken so another change is...

[IRC.git] / Robust / src / Makefile

diff --git a/Robust/src/Makefile b/Robust/src/Makefile
index 2cfeb8f663f9412fd0e22f3167ad100c01469a32..91de7309f3ac3ecb0954ecde4859ce8f04ad6f2a 100644 (file)
--- a/Robust/src/Makefile
+++ b/Robust/src/Makefile
@@ -78,8 +78,14 @@ Analysis/OwnershipAnalysis/OwnershipGraph.class                         \
 Analysis/OwnershipAnalysis/OwnershipNode.class                          \
 Analysis/OwnershipAnalysis/LabelNode.class                              \
 Analysis/OwnershipAnalysis/HeapRegionNode.class                         \
-Analysis/OwnershipAnalysis/ReferenceEdgeProperties.class                \
+Analysis/OwnershipAnalysis/ReferenceEdge.class                          \
 Analysis/OwnershipAnalysis/AllocationSite.class                         \
+Analysis/OwnershipAnalysis/TokenTuple.class                             \
+Analysis/OwnershipAnalysis/TokenTupleSet.class                          \
+Analysis/OwnershipAnalysis/ReachabilitySet.class                        \
+Analysis/OwnershipAnalysis/ChangeTuple.class                            \
+Analysis/OwnershipAnalysis/ChangeTupleSet.class                         \
+Analysis/OwnershipAnalysis/Canonical.class                              \
 Util/GraphNode.class Util/Namer.class Util/Relation.class              \
 Interface/HTTPHeader.class Interface/HTTPResponse.class                        \
 Interface/HTTPServices.class Interface/HashStrings.class               \
@@ -98,13 +104,35 @@ Analysis/Scheduling/ObjectSimulator.class                               \
 Analysis/Scheduling/RuntimeSchedule.class                               \
 Analysis/Scheduling/Schedule.class                                      \
 Analysis/Scheduling/ScheduleSimulator.class                             \
-Analysis/Scheduling/ScheudlingUtil.class                                \
+Analysis/Scheduling/SchedulingUtil.class                                \
 Analysis/Scheduling/TaskSimulator.class                                 \
 Analysis/Scheduling/TransTaskSimulator.class
 
+JAVAFILES=IR/*.java \
+       IR/Flat/*.java \
+       IR/Tree/*.java \
+       Main/*.java \
+       Analysis/CallGraph/*.java \
+       Analysis/FlatIRGraph/*.java \
+       Analysis/Locality/*.java \
+       Analysis/OwnershipAnalysis/*.java \
+       Analysis/Prefetch/*.java \
+       Analysis/Scheduling/*.java \
+       Analysis/TaskStateAnalysis/*.java \
+       Util/*.java \
+       ClassLibrary/*.java \
+       ClassLibrary/gnu/*.java \
+       Interface/*.java \
+       Lex/*.java
 
+CFILES=Runtime/*.c \
+       Runtime/*.h \
+       Runtime/DSTM/interface/*.c \
+       Runtime/DSTM/interface/*.h
 
-all: Parse/Sym.class Parse/Parser.class $(CLASSFILES) javadoc
+all: compiler javadoc
+
+compiler: Parse/Sym.class Parse/Parser.class $(CLASSFILES)
 
 wc:
        wc Interface/*.java Analysis/*/*.java IR/*.java IR/*/*.java Lex/*.java Util/*.java ClassLibrary/*.java
@@ -119,6 +147,20 @@ Parse/Parser.java Parse/Sym.java: Parse/java14.cup
 %.class: %.java
        javac -cp ../cup:.:$(CLASSPATH) $<
 
+tabbing: 
+       uncrustify -c java.cfg --no-backup $(JAVAFILES)
+       uncrustify -c c.cfg --no-backup $(CFILES)
+
+commit: tabbing
+       cvs commit .
+
+update:        tabbing
+       cvs update -d .
+
+mytabbing:
+       uncrustify -c myjava.cfg --no-backup $(JAVAFILES)
+       uncrustify -c myc.cfg --no-backup $(CFILES)
+
 javadoc:
        mkdir javadoc
        javadoc -classpath ../cup:.:$(CLASSPATH) -sourcepath . -private -d javadoc Lex Util IR IR.Tree IR.Flat Analysis Analysis.CallGraph Analysis.Flag Analysis.TaskStateAnalysis Analysis.Locality Analysis.Prefetch Main Analysis.OwnershipAnalysis Analysis.Scheduling