Add string copy and match functions

[lackey] / makefile

diff --git a/makefile b/makefile
index 1306505b43cff45698ee673f689dc820dd872154..495115dc6202f6cb689d8c4e36f2eeab329a0612 100644 (file)
--- a/makefile
+++ b/makefile
@@ -9,24 +9,27 @@ PREFIX    ?= /usr/local
 MANPREFIX ?= $(PREFIX)/share/man
 
 # Compiler
-CC        ?= gcc
+GCC       ?= gcc
 CFLAGS    ?= -Wall --std=c99
 CPPFLAGS  ?= -Isrc
 LDFLAGS   ?= -lncursesw -lical
 
 # Sources
 PROG      ?= lackey
-PROG_SRC  ?= main view date cal util 
+PROG_SRC  ?= main view date cal util
 TEST      ?= test
 TEST_SRC  ?= test date util
 VIEWS     ?= day week month year events todo settings help
 CALS      ?= dummy ical
 
+# For ncursesw
+CPPFLAGS  += $(strip $(shell pkg-config --cflags ncursesw))
+
 # Targets
 all: $(PROG)
 
 clean:
-       rm -f src/*.o views/*.o cals/*.o $(PROG) $(TEST) 
+       rm -f src/*.o views/*.o cals/*.o $(PROG) $(TEST)
 
 dist:
        tar -czf $(PROG)-$(VERSION).tar.gz --transform s::$(PROG)-$(VERSION)/: \
@@ -42,12 +45,12 @@ uninstall:
 
 # Rules
 $(PROG): $(PROG_SRC:%=src/%.o) $(VIEWS:%=views/%.o) $(CALS:%=cals/%.o)
-       $(CC) $(CFLAGS) -o $@ $+ $(LDFLAGS)
+       $(GCC) $(CFLAGS) -o $@ $+ $(LDFLAGS)
 
 $(TEST): $(TEST_SRC:%=src/%.o) $(CALS:%=cals/%.o)
-       $(CC) $(CFLAGS) -o $@ $+ $(LDFLAGS)
+       $(GCC) $(CFLAGS) -o $@ $+ $(LDFLAGS)
 
 %.o: %.c $(wildcard src/*.h) makefile
-       $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+       $(GCC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
 
 .PHONY: all clean dist install uninstall