X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2FMakefile;h=5adb178ee6b95c31692f857c4d424bc09bb396e3;hp=311e361d9f28f94ac0350ee74f8738394ff2afbc;hb=ef5d7a44cfe435c24e5f104e320b1a81835626e7;hpb=db18e268cc989852265ced5bef57f2acd13caafd

diff --git a/src/Makefile b/src/Makefile
index 311e361..5adb178 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,13 +4,16 @@ PHONY += directories
 MKDIR_P = mkdir -p
 OBJ_DIR = bin
 
-C_SOURCES := $(wildcard *.c) $(wildcard AST/*.c) $(wildcard Collections/*.c) $(wildcard Backend/*.c) $(wildcard Encoders/*.c)
+CPP_SOURCES := $(wildcard *.cc) $(wildcard AST/*.cc) $(wildcard ASTTransform/*.cc) $(wildcard ASTAnalyses/*.cc) $(wildcard Tuner/*.cc) $(wildcard Collections/*.cc) $(wildcard Backend/*.cc) $(wildcard Encoders/*.cc)
 
-HEADERS := $(wildcard *.h) $(wildcard AST/*.h) $(wildcard Collections/*.h) $(wildcard Backend/*.h) $(wildcard Encoders/*.h)
+C_SOURCES := $(wildcard *.c) $(wildcard AST/*.c) $(wildcard ASTTransform/*.c) $(wildcard ASTAnalyses/*.c) $(wildcard Tuner/*.c) $(wildcard Collections/*.c) $(wildcard Backend/*.c) $(wildcard Encoders/*.c)
+
+HEADERS := $(wildcard *.h) $(wildcard AST/*.h) $(wildcard ASTTransform/*.h) $(wildcard ASTAnalyses/*.h) $(wildcard Tuner/*.h) $(wildcard Collections/*.h) $(wildcard Backend/*.h) $(wildcard Encoders/*.h)
 
 OBJECTS := $(CPP_SOURCES:%.cc=$(OBJ_DIR)/%.o) $(C_SOURCES:%.c=$(OBJ_DIR)/%.o)
 
-CFLAGS += -IAST -ICollections -IBackend -I. -IEncoders
+CFLAGS := -Wall -g -O0
+CFLAGS += -IAST -IASTTransform -IASTAnalyses -ICollections -IBackend -I. -IEncoders -ITuner
 LDFLAGS := -ldl -lrt -rdynamic
 SHARED := -shared
 
@@ -22,13 +25,16 @@ endif
 
 MARKDOWN := ../docs/Markdown/Markdown.pl
 
-all: directories $(LIB_SO)
+all: directories ${OBJ_DIR}/$(LIB_SO)
 
 directories: ${OBJ_DIR}
 
 ${OBJ_DIR}:
 	${MKDIR_P} ${OBJ_DIR}
 	${MKDIR_P} ${OBJ_DIR}/AST
+	${MKDIR_P} ${OBJ_DIR}/ASTAnalyses
+	${MKDIR_P} ${OBJ_DIR}/ASTTransform
+	${MKDIR_P} ${OBJ_DIR}/Tuner
 	${MKDIR_P} ${OBJ_DIR}/Collections
 	${MKDIR_P} ${OBJ_DIR}/Backend
 	${MKDIR_P} ${OBJ_DIR}/Encoders
@@ -36,12 +42,18 @@ ${OBJ_DIR}:
 debug: CFLAGS += -DCONFIG_DEBUG
 debug: all
 
+test: all
+	make -C Test
+
 PHONY += docs
 docs: $(C_SOURCES) $(HEADERS)
 	doxygen
 
-$(LIB_SO): $(OBJECTS)
-	$(CC) -g $(SHARED) -o ${OBJ_DIR}/$(LIB_SO) $+ $(LDFLAGS)
+${OBJ_DIR}/$(LIB_SO): $(OBJECTS)
+	$(CXX) -g $(SHARED) -o ${OBJ_DIR}/$(LIB_SO) $+ $(LDFLAGS)
+
+${OBJ_DIR}/%.o: %.cc
+	$(CXX) -fPIC -c $< -o $@ $(CFLAGS) -Wno-unused-variable
 
 ${OBJ_DIR}/%.o: %.c
 	$(CC) -fPIC -c $< -o $@ $(CFLAGS) -Wno-unused-variable
@@ -55,21 +67,17 @@ clean:
 
 PHONY += mrclean
 mrclean: clean
-	rm -rf docs
+	rm -rf ../docs
 
 PHONY += tags
 tags:
 	ctags -R
 
 tabbing:
-	uncrustify -c C.cfg --no-backup *.c
+	uncrustify -c C.cfg --no-backup *.cc */*.cc
 	uncrustify -c C.cfg --no-backup *.h */*.h
 
 wc:
-	wc */*.c */*.h *.c *.h
+	wc */*.cc */*.h *.cc *.h
 
 .PHONY: $(PHONY)
-
-# A 1-inch margin PDF generated by 'pandoc'
-%.pdf: %.md
-	pandoc -o $@ $< -V header-includes='\usepackage[margin=1in]{geometry}'