Rename stuff

[lackey] / makefile

diff --git a/makefile b/makefile
index 8512942fd2a0d8edfae2e4e772d1720d9fb9ac9b..be2232c267e1397295971a5556cbbcd129b3b85a 100644 (file)
--- a/makefile
+++ b/makefile
@@ -4,34 +4,35 @@
 CC       ?= gcc
 CFLAGS   ?= -Wall --std=c99
 CPPFLAGS ?= -Isrc
-LDFLAGS  ?= -lncursesw
+LDFLAGS  ?= -lncursesw -lical
 
 # Sources
 PROG      = lackey
+PROG_SRC  = main view date cal util 
 TEST      = test
-SOURCES   = main screen util
-TESTS     = test util
-VIEWS     = day week month year todo notes settings help
+TEST_SRC  = test date util
+VIEWS     = day week month year events todo settings help
+CALS      = dummy ical
 
 # 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 views/*.o cals/*.o $(PROG) $(TEST) 
 
 # Rules
-$(PROG): $(SOURCES:%=src/%.o) $(VIEWS:%=view/%.o)
+$(PROG): $(PROG_SRC:%=src/%.o) $(VIEWS:%=views/%.o) $(CALS:%=cals/%.o)
        $(CC) $(CFLAGS) -o $@ $+ $(LDFLAGS)
 
-$(TEST): $(TESTS:%=src/%.o) $(VIEWS:%=view/%.o)
+$(TEST): $(TEST_SRC:%=src/%.o) $(CALS:%=cals/%.o)
        $(CC) $(CFLAGS) -o $@ $+ $(LDFLAGS)
 
-%.o: %.c $(SOURCES:%=src/%.h) makefile
+%.o: %.c $(wildcard src/*.h) makefile
        $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<