X-Git-Url: http://pileus.org/git/?p=lackey;a=blobdiff_plain;f=makefile;h=b249a27fc2da746d3495efa0fe81c0e5b21d74e4;hp=3fefedb2868f52815d2a9f1d75b01c1407def9e9;hb=7edd7d3a9f0bdaaa8df9f68a73f7c84e2b514ce6;hpb=bfa1408d9189fa3255d3057340ee66786c3ee86b

diff --git a/makefile b/makefile
index 3fefedb..b249a27 100644
--- a/makefile
+++ b/makefile
@@ -1,5 +1,5 @@
 # lackey - curses calendar program
-# See COPYING file for copyright and license details.
+# See COPYING file for license details.
 
 -include config.mk
 
@@ -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)
@@ -57,7 +57,7 @@ $(PROG): $(PROG_SRC:%=src/%.o) $(VIEWS:%=views/%.o) $(CALS:%=cals/%.o)
 $(TEST): $(TEST_SRC:%=src/%.o) $(CALS:%=cals/%.o)
 	$(GCC) $(CFLAGS) -o $@ $+ $(LDFLAGS)
 
-%.o: %.c $(wildcard src/*.h) makefile
-	$(GCC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+%.o: %.c $(wildcard src/*.h makefile config.mk)
+	$(GCC) $(CFLAGS) -c -o $@ $<
 
 .PHONY: all clean dist install uninstall