You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
37 lines
961 B
37 lines
961 B
--- a/config.mk
|
|
+++ b/config.mk
|
|
@@ -10,12 +10,12 @@
|
|
TERMINFO := ${DESTDIR}${PREFIX}/share/terminfo
|
|
|
|
INCS = -I.
|
|
-LIBS = -lc -lutil -lncursesw
|
|
-CPPFLAGS = -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED
|
|
+LIBS = -lc -lutil $(shell $(PKG_CONFIG) --libs ncursesw)
|
|
+CPPFLAGS += -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED
|
|
CFLAGS += -std=c99 ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG ${CPPFLAGS}
|
|
LDFLAGS += ${LIBS}
|
|
|
|
-DEBUG_CFLAGS = ${CFLAGS} -UNDEBUG -O0 -g -ggdb -Wall -Wextra -Wno-unused-parameter
|
|
+DEBUG_CFLAGS += ${CFLAGS} -UNDEBUG -O0 -g -ggdb -Wall -Wextra -Wno-unused-parameter
|
|
|
|
CC ?= cc
|
|
STRIP ?= strip
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -16,13 +16,13 @@
|
|
|
|
.c.o:
|
|
@echo CC $<
|
|
- @${CC} -c ${CFLAGS} $<
|
|
+ ${CC} -c ${CFLAGS} $<
|
|
|
|
${OBJ}: config.h config.mk
|
|
|
|
dvtm: ${OBJ}
|
|
@echo CC -o $@
|
|
- @${CC} -o $@ ${OBJ} ${LDFLAGS}
|
|
+ ${CC} -o $@ ${OBJ} ${LDFLAGS}
|
|
|
|
debug: clean
|
|
@make CFLAGS='${DEBUG_CFLAGS}'
|