Merge branch 'hamed' into brian

[satune.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index cbf758b4a2abf7914ba8ad7444732e7f7cc56ed0..35468a08a24ab9c3dc1e1c3f3c1d32a3712f4653 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -10,6 +10,7 @@ HEADERS := $(wildcard *.h) $(wildcard AST/*.h) $(wildcard Collections/*.h) $(wil
 
 OBJECTS := $(CPP_SOURCES:%.cc=$(OBJ_DIR)/%.o) $(C_SOURCES:%.c=$(OBJ_DIR)/%.o)
 
+CFLAGS := -Wall -g -O0
 CFLAGS += -IAST -ICollections -IBackend -I. -IEncoders
 LDFLAGS := -ldl -lrt -rdynamic
 SHARED := -shared
@@ -22,7 +23,7 @@ endif
 
 MARKDOWN := ../docs/Markdown/Markdown.pl
 
-all: directories $(LIB_SO)
+all: directories ${OBJ_DIR}/$(LIB_SO)
 
 directories: ${OBJ_DIR}
 
@@ -36,11 +37,14 @@ ${OBJ_DIR}:
 debug: CFLAGS += -DCONFIG_DEBUG
 debug: all
 
+test: all
+       make -C Test
+
 PHONY += docs
 docs: $(C_SOURCES) $(HEADERS)
        doxygen
 
-$(LIB_SO): $(OBJECTS)
+${OBJ_DIR}/$(LIB_SO): $(OBJECTS)
        $(CC) -g $(SHARED) -o ${OBJ_DIR}/$(LIB_SO) $+ $(LDFLAGS)
 
 ${OBJ_DIR}/%.o: %.c
@@ -62,7 +66,7 @@ tags:
        ctags -R
 
 tabbing:
-       uncrustify -c C.cfg --no-backup *.c
+       uncrustify -c C.cfg --no-backup *.c */*.c
        uncrustify -c C.cfg --no-backup *.h */*.h
 
 wc: