X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=makefile;h=e8bd692a458ac43933e03c9b346b56ece658dff1;hb=b9a8d20bc5dba484a6ab23ac715dc02a3ae86f7d;hp=90401859f9a326a2baa9d2450551c3306a38813f;hpb=011e995ee05e3fd9a990a39c85d4b279e16fd86e;p=lackey

diff --git a/makefile b/makefile
index 9040185..e8bd692 100644
--- a/makefile
+++ b/makefile
@@ -8,30 +8,31 @@ LDFLAGS  ?= -lncursesw
 
 # Sources
 PROG      = lackey
+PROG_SRC  = main screen date event util 
 TEST      = test
-SOURCES   = main screen util
-TESTS     = test util
+TEST_SRC  = test date
 VIEWS     = day week month year todo notes settings help
+CALS      = dummy
 
 # Targets
 all: $(PROG) $(TEST)
 
 run-$(PROG): $(PROG)
 	@urxvt -e ./$<
-	@cat lackey.log
+	@cat /tmp/lackey.log
 
 run-$(TEST): $(TEST)
 	./$<
 
 clean:
-	rm -f src/*.o view/*.o $(PROG) $(TEST) 
+	rm -f src/*.o view/*.o cal/*.o $(PROG) $(TEST) 
 
 # Rules
-$(PROG): $(SOURCES:%=src/%.o) $(VIEWS:%=view/%.o)
-	$(CC) $(CLFAGS) -o $@ $+ $(LDFLAGS)
+$(PROG): $(PROG_SRC:%=src/%.o) $(VIEWS:%=view/%.o) $(CALS:%=cal/%.o)
+	$(CC) $(CFLAGS) -o $@ $+ $(LDFLAGS)
 
-$(TEST): $(TESTS:%=src/%.o) $(VIEWS:%=view/%.o)
-	$(CC) $(CLFAGS) -o $@ $+ $(LDFLAGS)
+$(TEST): $(TEST_SRC:%=src/%.o) $(CALS:%=cal/%.o)
+	$(CC) $(CFLAGS) -o $@ $+ $(LDFLAGS)
 
-%.o: %.c $(SOURCES:%=%.h) makefile
+%.o: %.c $(wildcard src/*.h) makefile
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<