X-Git-Url: http://pileus.org/git/?p=lackey;a=blobdiff_plain;f=makefile;h=b249a27fc2da746d3495efa0fe81c0e5b21d74e4;hp=5dde712bc6c3a0af533208cf76b0356f56e421b2;hb=7edd7d3a9f0bdaaa8df9f68a73f7c84e2b514ce6;hpb=128ce297a901284690dfb4f5d74b9a19ce9d3294

diff --git a/makefile b/makefile
index 5dde712..b249a27 100644
--- a/makefile
+++ b/makefile
@@ -11,19 +11,19 @@ MANPREFIX ?= $(PREFIX)/share/man
 # Compiler
 GCC       ?= gcc
 CFLAGS    ?= -Wall --std=c99
-CPPFLAGS  ?= -Isrc
 LDFLAGS   ?= -lncursesw -lical
 
 # Sources
 PROG      ?= lackey
-PROG_SRC  ?= main view date cal conf util
+PROG_SRC  ?= main util args conf date cal view print
 TEST      ?= test
-TEST_SRC  ?= test date cal conf util
+TEST_SRC  ?= test util conf date cal
 VIEWS     ?= day week month year events todo settings help edit
 CALS      ?= dummy ical
 
-# For ncursesw
-CPPFLAGS  += $(strip $(shell pkg-config --cflags ncursesw))
+# Objects
+views/%.o  cals/%.o:  CFLAGS += -Isrc
+src/view.o views/%.o: CFLAGS += $(strip $(shell pkg-config --cflags ncursesw))
 
 # Targets
 all: $(PROG)
@@ -58,6 +58,6 @@ $(TEST): $(TEST_SRC:%=src/%.o) $(CALS:%=cals/%.o)
 	$(GCC) $(CFLAGS) -o $@ $+ $(LDFLAGS)
 
 %.o: %.c $(wildcard src/*.h makefile config.mk)
-	$(GCC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+	$(GCC) $(CFLAGS) -c -o $@ $<
 
 .PHONY: all clean dist install uninstall