merge changes from trunk

git-svn-id: https://nocs.stanford.edu/cgi-bin/svn.cgi/booksim2.0/branches/classes@5519 ce7aba0d-9f81-40a6-a495-cecae84b0515

doc/Makefile

@@ -0,0 +1,11 @@
+all:
+	pdflatex manual.tex
+	pdflatex manual.tex
+	pdflatex manual.tex
+clean:
+	rm -f manual.pdf
+	rm -f manual.aux
+	rm -f manual.dvi
+	rm -f manual.log
+	rm -f manual.toc
+	rm -f *~

src/Makefile

@@ -27,15 +27,14 @@
 #
 # Makefile
 #
-MOC = /usr/lib/qt4/bin/moc
+LEX = flex
 YACC   = bison -y
 DEFINE = 
-DEFINE_TEST = -DUSE_GUI
 INCPATH = -I. -Iarbiters -Iallocators -Irouters -Inetworks -Ipower
 CPPFLAGS += -Wall $(INCPATH) $(DEFINE)
-#CPPFLAGS += -O3
+CPPFLAGS += -O3
 CPPFLAGS += -g
-LFLAGS +=  
+LFLAGS +=
 
 
 OBJDIR := obj
@@ -70,14 +69,7 @@ CPP_SRCS = main.cpp \
    buffer_monitor.cpp \
    workload.cpp
 
-ifeq ($(DEFINE) , $(DEFINE_TEST))
-	CPP_SRCS += \
-	bgui.cpp\
-   moc_bgui.cpp
-	LFLAGS +=  -lQtGui -lQtCore -lpthread 
-	INCPATH += -I/usr/include/QtCore -I/usr/include/QtGui
-else 
-endif
+
 
 LEX_OBJS  = ${OBJDIR}/lex.yy.o
 YACC_OBJS = ${OBJDIR}/y.tab.o
@@ -108,10 +100,6 @@ $(PROG): $(OBJS)
 
 # rules to compile simulator
 
-moc_bgui.cpp: booksim_config.hpp \
-		config_utils.hpp \
-		bgui.hpp
-	$(MOC) $(INCPATH) bgui.hpp -o moc_bgui.cpp
 
 ${LEX_OBJS}: lex.yy.c y.tab.h
 	$(CC) $(CPPFLAGS) -c $< -o $@