X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2FMakefile;h=341a5dfa08f411c5e3fff7c5bbf777cfa70dbccb;hp=6ca77fcb1283293e8c062360825d089b231dc693;hb=aa6bbd899ac65d2d7106f611a22abd2312d00ca2;hpb=8b7232fa4c6557fa03211353d37824c3ad1010e0

diff --git a/src/Makefile b/src/Makefile
index 6ca77fc..341a5df 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,11 +4,14 @@ PHONY += directories
 MKDIR_P = mkdir -p
 OBJ_DIR = bin
 
-CPP_SOURCES := constraint.cc inc_solver.cc set.cc mutableset.cc element.cc function.cc order.cc table.cc predicate.cc
+C_SOURCES := $(wildcard *.c) $(wildcard AST/*.c) $(wildcard Collections/*.c) $(wildcard Backend/*.c) $(wildcard Encoders/*.c)
+
+HEADERS := $(wildcard *.h) $(wildcard AST/*.h) $(wildcard Collections/*.h) $(wildcard Backend/*.h) $(wildcard Encoders/*.h)
 
 OBJECTS := $(CPP_SOURCES:%.cc=$(OBJ_DIR)/%.o) $(C_SOURCES:%.c=$(OBJ_DIR)/%.o)
 
-CPPFLAGS += -Iinclude -I.
+CFLAGS := -Wall -g -O0
+CFLAGS += -IAST -ICollections -IBackend -I. -IEncoders
 LDFLAGS := -ldl -lrt -rdynamic
 SHARED := -shared
 
@@ -20,31 +23,29 @@ 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}/Collections
+	${MKDIR_P} ${OBJ_DIR}/Backend
+	${MKDIR_P} ${OBJ_DIR}/Encoders
 
-debug: CPPFLAGS += -DCONFIG_DEBUG
+debug: CFLAGS += -DCONFIG_DEBUG
 debug: all
 
 PHONY += docs
-docs: *.cc *.h
+docs: $(C_SOURCES) $(HEADERS)
 	doxygen
 
-$(LIB_SO): $(OBJECTS)
-	$(CXX) -g $(SHARED) -o $(LIB_SO) $+ $(LDFLAGS)
+${OBJ_DIR}/$(LIB_SO): $(OBJECTS)
+	$(CC) -g $(SHARED) -o ${OBJ_DIR}/$(LIB_SO) $+ $(LDFLAGS)
 
 ${OBJ_DIR}/%.o: %.c
-	$(CC) -fPIC -c $< -o $@ $(CPPFLAGS) -Wno-unused-variable
-
-${OBJ_DIR}/%.o: %.cc
-	$(CXX) -MMD -MF $@.d -o $@ -fPIC -c $< $(CPPFLAGS)
-
-%.pdf: %.dot
-	dot -Tpdf $< -o $@
+	$(CC) -fPIC -c $< -o $@ $(CFLAGS) -Wno-unused-variable
 
 -include $(OBJECTS:%=$OBJ_DIR/.%.d)
 
@@ -55,18 +56,17 @@ clean:
 
 PHONY += mrclean
 mrclean: clean
-	rm -rf docs
+	rm -rf ../docs
 
 PHONY += tags
 tags:
 	ctags -R
 
 tabbing:
-	uncrustify -c C.cfg --no-backup *.cc
-	uncrustify -c C.cfg --no-backup *.h
+	uncrustify -c C.cfg --no-backup *.c
+	uncrustify -c C.cfg --no-backup *.h */*.h
 
-.PHONY: $(PHONY)
+wc:
+	wc */*.c */*.h *.c *.h
 
-# A 1-inch margin PDF generated by 'pandoc'
-%.pdf: %.md
-	pandoc -o $@ $< -V header-includes='\usepackage[margin=1in]{geometry}'
+.PHONY: $(PHONY)