X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Robust%2Fsrc%2FMakefile;h=51b7b93da2d9cad532b61ac049b8b654d705489f;hb=9e0601a3c2495436fa391815bab140087a0eda84;hp=5797ec1445cfa81096dc86eed817b66790e2a7f7;hpb=e2fa483f97d7459cf91a8e30445f4a14eb3d82ff;p=IRC.git

diff --git a/Robust/src/Makefile b/Robust/src/Makefile
index 5797ec14..51b7b93d 100644
--- a/Robust/src/Makefile
+++ b/Robust/src/Makefile
@@ -86,6 +86,11 @@ Analysis/OwnershipAnalysis/ReachabilitySet.class                        \
 Analysis/OwnershipAnalysis/ChangeTuple.class                            \
 Analysis/OwnershipAnalysis/ChangeTupleSet.class                         \
 Analysis/OwnershipAnalysis/Canonical.class                              \
+Analysis/OwnershipAnalysis/MethodContext.class                          \
+Analysis/MLP/MLPAnalysis.class 						\
+Analysis/MLP/VariableSourceToken.class 					\
+Analysis/MLP/SVKey.class 						\
+Analysis/MLP/VarSrcTokTable.class					\
 Util/GraphNode.class Util/Namer.class Util/Relation.class		\
 Interface/HTTPHeader.class Interface/HTTPResponse.class			\
 Interface/HTTPServices.class Interface/HashStrings.class		\
@@ -113,17 +118,19 @@ JAVAFILES=IR/*.java \
 	IR/Tree/*.java \
 	Main/*.java \
 	Analysis/CallGraph/*.java \
-	Analysis/Flag/*.java \
 	Analysis/FlatIRGraph/*.java \
+	Analysis/Loops/*.java \
 	Analysis/Locality/*.java \
 	Analysis/OwnershipAnalysis/*.java \
+	Analysis/MLP/*.java \
 	Analysis/Prefetch/*.java \
-	Anaysis/Scheduling/*.java \
+	Analysis/Scheduling/*.java \
 	Analysis/TaskStateAnalysis/*.java \
 	Util/*.java \
 	ClassLibrary/*.java \
 	ClassLibrary/gnu/*.java \
-	Interface/*.java
+	Interface/*.java \
+	Lex/*.java
 
 CFILES=Runtime/*.c \
 	Runtime/*.h \
@@ -132,31 +139,47 @@ CFILES=Runtime/*.c \
 
 all: compiler javadoc
 
-compiler: Parse/Sym.class Parse/Parser.class $(CLASSFILES)
+compiler: Parse/Sym.java Parse/Parser.java cleanclass classfiles
+
+classfiles:
+	./ourjavac -cp ../cup:.:$(CLASSPATH) Main/Main.java
 
 wc:
 	wc Interface/*.java Analysis/*/*.java IR/*.java IR/*/*.java Lex/*.java Util/*.java ClassLibrary/*.java
 
 wcrun:
-	wc Runtime/*.[c,h]
+	wc Runtime/*.[c,h] Runtime/DSTM/interface/*.[c,h]
 
 Parse/Parser.java Parse/Sym.java: Parse/java14.cup
 	cd Parse && \
         java -cp ../../cup:$(CLASSPATH) java_cup.Main -parser Parser -symbols Sym < java14.cup
 
 %.class: %.java
-	javac -cp ../cup:.:$(CLASSPATH) $<
+	./ourjavac -cp ../cup:.:$(CLASSPATH) $<
 
 tabbing: 
-	uncrustify -c standard.cfg --replace $(JAVAFILES)
-	uncrustify -c standard.cfg --replace $(CFILES)
+	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
+	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.MLP Analysis.Scheduling
 
 clean:
-	rm -f IR/*.class IR/Tree/*.class Main/*.class Lex/*.class Parse/*.class Parse/Sym.java Parse/Parser.java IR/Flat/*.class classdefs.h methodheaders.h methods.c structdefs.h virtualtable.h task.h taskdefs.c taskdefs.h Analysis/*.class Analysis/Flag/*.class Analysis/CallGraph/*.class  Analysis/TaskStateAnalysis/*.class Interface/*.class Util/*.class Analysis/Locality/*.class Analysis/Prefetch/*.class Analysis/FlatIRGraph/*.class Analysis/OwnershipAnalysis/*.class Analysis/Scheduling/*.class
+	rm -f IR/*.class IR/Tree/*.class Main/*.class Lex/*.class Parse/*.class Parse/Sym.java Parse/Parser.java IR/Flat/*.class classdefs.h methodheaders.h methods.c structdefs.h virtualtable.h task.h taskdefs.c taskdefs.h Analysis/*.class Analysis/Flag/*.class Analysis/CallGraph/*.class  Analysis/TaskStateAnalysis/*.class Interface/*.class Util/*.class Analysis/Locality/*.class Analysis/Prefetch/*.class Analysis/FlatIRGraph/*.class Analysis/OwnershipAnalysis/*.class Analysis/MLP/*.class Analysis/Scheduling/*.class Analysis/Loops/*.class
+
+cleanclass:
+	rm -f IR/*.class IR/Tree/*.class Main/*.class IR/Flat/*.class Analysis/*.class Analysis/Flag/*.class Analysis/CallGraph/*.class  Analysis/TaskStateAnalysis/*.class Interface/*.class Util/*.class Analysis/Locality/*.class Analysis/Prefetch/*.class Analysis/FlatIRGraph/*.class Analysis/OwnershipAnalysis/*.class Analysis/MLP/*.class Analysis/Scheduling/*.class Analysis/Loops/*.class
 
 cleandoc:
 	rm -rf javadoc