Add day and week view

[lackey] / src / makefile

diff --git a/src/makefile b/src/makefile
index 2024cc8c86798a760c82b9ed7e327233ecb85754..0b6c98f615dbda9cbca4a87113e13bbf3a473f09 100644 (file)
--- a/src/makefile
+++ b/src/makefile
@@ -1,27 +1,36 @@
-# Settings
-CC       = gcc
-CFLAGS   = -Wall --std=c99
-CPPFLAGS =
-LDFLAGS  = -lncursesw
-PROG     = acal
+-include config.mk
 
-# Views
-SOURCES  = main screen
-VIEWS    = day week month year todo notes settings help
+# Settings
+CC       ?= gcc
+CFLAGS   ?= -Wall --std=c99
+CPPFLAGS ?= -Isrc
+LDFLAGS  ?= -lncursesw
 
-default: test
+# Sources
+PROG      = acal
+TEST      = test
+SOURCES   = main screen util
+TESTS     = test util
+VIEWS     = day week month year todo notes settings help
 
 # Targets
-all: $(PROG)
+all: $(PROG) $(TEST)
+
+run-$(PROG): $(PROG)
+       @urxvt -e ./$<
+       @cat acal.log
 
-test: $(PROG)
+run-$(TEST): $(TEST)
        ./$<
 
 clean:
-       rm -f *.o view/*.o $(PROG)
+       rm -f src/*.o view/*.o $(PROG) $(TEST) 
 
 # Rules
-$(PROG): $(SOURCES:%=%.o) $(VIEWS:%=view/%.o)
+$(PROG): $(SOURCES:%=src/%.o) $(VIEWS:%=view/%.o)
+       $(CC) $(CLFAGS) -o $@ $+ $(LDFLAGS)
+
+$(TEST): $(TESTS:%=src/%.o) $(VIEWS:%=view/%.o)
        $(CC) $(CLFAGS) -o $@ $+ $(LDFLAGS)
 
 %.o: %.c $(SOURCES:%=%.h) makefile