Rename stuff

[lackey] / makefile

diff --git a/makefile b/makefile
index e3f36381118b90abac4990c83480b1d2456c5e66..be2232c267e1397295971a5556cbbcd129b3b85a 100644 (file)
--- a/makefile
+++ b/makefile
@@ -8,7 +8,7 @@ LDFLAGS  ?= -lncursesw -lical
 
 # Sources
 PROG      = lackey
-PROG_SRC  = main screen date event util 
+PROG_SRC  = main view date cal util 
 TEST      = test
 TEST_SRC  = test date util
 VIEWS     = day week month year events todo settings help
@@ -25,13 +25,13 @@ run-$(TEST): $(TEST)
        ./$<
 
 clean:
-       rm -f src/*.o view/*.o cal/*.o $(PROG) $(TEST) 
+       rm -f src/*.o views/*.o cals/*.o $(PROG) $(TEST) 
 
 # Rules
-$(PROG): $(PROG_SRC:%=src/%.o) $(VIEWS:%=view/%.o) $(CALS:%=cal/%.o)
+$(PROG): $(PROG_SRC:%=src/%.o) $(VIEWS:%=views/%.o) $(CALS:%=cals/%.o)
        $(CC) $(CFLAGS) -o $@ $+ $(LDFLAGS)
 
-$(TEST): $(TEST_SRC:%=src/%.o) $(CALS:%=cal/%.o)
+$(TEST): $(TEST_SRC:%=src/%.o) $(CALS:%=cals/%.o)
        $(CC) $(CFLAGS) -o $@ $+ $(LDFLAGS)
 
 %.o: %.c $(wildcard src/*.h) makefile