X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2FMakefile;h=838a47802ed595177b02e8eead9613f1cf3716c8;hp=7a455130a8a8ef11ccc4082d31baa3529720415a;hb=18d917b3ac3afcf893fe7b04ab35ad6e00c6a8ab;hpb=71b1f3df40acb5b54bbb06c2c55c97af1a62521b

diff --git a/src/Makefile b/src/Makefile
index 7a45513..838a478 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,15 +4,18 @@ PHONY += directories
 MKDIR_P = mkdir -p
 OBJ_DIR = bin
 
-CPP_SOURCES := $(wildcard *.cc) $(wildcard AST/*.cc) $(wildcard Tuner/*.cc) $(wildcard Collections/*.cc) $(wildcard Backend/*.cc) $(wildcard Encoders/*.cc)
+CPP_SOURCES := $(wildcard *.cc) $(wildcard AST/*.cc) $(wildcard ASTTransform/*.cc) $(wildcard Translator/*.cc) $(wildcard ASTAnalyses/*.cc) $(wildcard ASTAnalyses/Order/*.cc) $(wildcard ASTAnalyses/Encoding/*.cc) $(wildcard ASTAnalyses/Polarity/*.cc) $(wildcard Tuner/*.cc) $(wildcard Collections/*.cc) $(wildcard Backend/*.cc) $(wildcard Encoders/*.cc) $(wildcard Serialize/*.cc)
 
-HEADERS := $(wildcard *.h) $(wildcard AST/*.h) $(wildcard Tuner/*.h) $(wildcard Collections/*.h) $(wildcard Backend/*.h) $(wildcard Encoders/*.h)
+C_SOURCES := $(wildcard *.c) $(wildcard AST/*.c) $(wildcard ASTTransform/*.c) $(wildcard Translator/*.c) $(wildcard ASTAnalyses/*.c) $(wildcard ASTAnalyses/Order/*.c) $(wildcard ASTAnalyses/Encoding/*.c) $(wildcard ASTAnalyses/Polarity/*.c) $(wildcard Tuner/*.c) $(wildcard Collections/*.c) $(wildcard Backend/*.c) $(wildcard Encoders/*.c) $(wildcard Serialize/*.c)
 
-OBJECTS := $(CPP_SOURCES:%.cc=$(OBJ_DIR)/%.o)
+HEADERS := $(wildcard *.h) $(wildcard AST/*.h) $(wildcard ASTTransform/*.h) $(wildcard Translator/*.h) $(wildcard ASTAnalyses/*.h) $(wildcard ASTAnalyses/Order/*.h) $(wildcard ASTAnalyses/Encoding/*.h) $(wildcard ASTAnalyses/Polarity/*.h) $(wildcard Tuner/*.h) $(wildcard Collections/*.h) $(wildcard Backend/*.h) $(wildcard Encoders/*.h) $(wildcard Serialize/*.h)
 
-CFLAGS := -Wall -g -O0
-CFLAGS += -IAST -ICollections -IBackend -I. -IEncoders -ITuner
-LDFLAGS := -ldl -lrt -rdynamic
+OBJECTS := $(CPP_SOURCES:%.cc=$(OBJ_DIR)/%.o) $(C_SOURCES:%.c=$(OBJ_DIR)/%.o)
+
+CFLAGS := -Wall -O0 -g
+CXXFLAGS := -std=c++1y -pthread
+CFLAGS += -IAST -IASTTransform -IASTAnalyses -IASTAnalyses/Polarity -IASTAnalyses/Order -IASTAnalyses/Encoding -ITranslator -ICollections -IBackend -I. -IEncoders -ITuner -ISerialize
+LDFLAGS := -ldl -lrt -rdynamic -g
 SHARED := -shared
 
 # Mac OSX options
@@ -30,10 +33,17 @@ directories: ${OBJ_DIR}
 ${OBJ_DIR}:
 	${MKDIR_P} ${OBJ_DIR}
 	${MKDIR_P} ${OBJ_DIR}/AST
+	${MKDIR_P} ${OBJ_DIR}/ASTAnalyses
+	${MKDIR_P} ${OBJ_DIR}/ASTAnalyses/Order
+	${MKDIR_P} ${OBJ_DIR}/ASTAnalyses/Encoding
+	${MKDIR_P} ${OBJ_DIR}/ASTAnalyses/Polarity
+	${MKDIR_P} ${OBJ_DIR}/ASTTransform
+	${MKDIR_P} ${OBJ_DIR}/Translator
 	${MKDIR_P} ${OBJ_DIR}/Tuner
 	${MKDIR_P} ${OBJ_DIR}/Collections
 	${MKDIR_P} ${OBJ_DIR}/Backend
 	${MKDIR_P} ${OBJ_DIR}/Encoders
+	${MKDIR_P} ${OBJ_DIR}/Serialize
 
 debug: CFLAGS += -DCONFIG_DEBUG
 debug: all
@@ -46,9 +56,12 @@ docs: $(C_SOURCES) $(HEADERS)
 	doxygen
 
 ${OBJ_DIR}/$(LIB_SO): $(OBJECTS)
-	$(CC) -g $(SHARED) -o ${OBJ_DIR}/$(LIB_SO) $+ $(LDFLAGS)
+	$(CXX) -g $(SHARED) -o ${OBJ_DIR}/$(LIB_SO) $+ $(LDFLAGS)
 
 ${OBJ_DIR}/%.o: %.cc
+	$(CXX) -fPIC -c $< -o $@ $(CFLAGS) -Wno-unused-variable $(CXXFLAGS)
+
+${OBJ_DIR}/%.o: %.c
 	$(CC) -fPIC -c $< -o $@ $(CFLAGS) -Wno-unused-variable
 
 -include $(OBJECTS:%=$OBJ_DIR/.%.d)
@@ -67,10 +80,10 @@ tags:
 	ctags -R
 
 tabbing:
-	uncrustify -c C.cfg --no-backup *.cc */*.cc
-	uncrustify -c C.cfg --no-backup *.h */*.h
+	uncrustify -c C.cfg --no-backup *.cc */*.cc */*/*.cc
+	uncrustify -c C.cfg --no-backup *.h */*.h */*/*.h
 
 wc:
-	wc */*.cc */*.h *.cc *.h
+	wc */*.cc */*.h *.cc *.h */*/*.cc */*/*.h
 
 .PHONY: $(PHONY)