projects
/
open-adventure.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3d3cd4b
)
Make include of dependency platform-generic
author
NHOrus
<jy6x2b32pie9@yahoo.com>
Sun, 2 Jul 2017 06:28:18 +0000
(09:28 +0300)
committer
Eric S. Raymond
<esr@thyrsus.com>
Sun, 2 Jul 2017 14:16:13 +0000
(10:16 -0400)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index 8be6564988b16ed4a7af7d3e204103df5356f509..906698a6b8f0cdf4e6e835c8f792b74f23b3f91e 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-8,8
+8,10
@@
VERS=$(shell sed -n <NEWS '/^[0-9]/s/:.*//p' | head -1)
.PHONY: check coverage
CC?=gcc
.PHONY: check coverage
CC?=gcc
-CCFLAGS+=-std=c99 -D_DEFAULT_SOURCE -DVERSION=\"$(VERS)\" -Wpedantic -O2
-LIBS=-ledit
+CCFLAGS+=-std=c99 -D_DEFAULT_SOURCE -DVERSION=\"$(VERS)\" -O2
+LIBS=$(shell pkg-config --libs libedit)
+INC+=$(shell pkg-config --cflags libedit)
+
UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Linux)
LIBS+=-lrt
UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Linux)
LIBS+=-lrt
@@
-20,7
+22,7
@@
CHEAT_OBJS=cheat.o init.o actions.o score.o misc.o saveresume.o
SOURCES=$(OBJS:.o=.c) advent.h adventure.yaml Makefile control make_dungeon.py
.c.o:
SOURCES=$(OBJS:.o=.c) advent.h adventure.yaml Makefile control make_dungeon.py
.c.o:
- $(CC) $(CCFLAGS) $(DBX) -c $<
+ $(CC) $(CCFLAGS) $(
INC) $(
DBX) -c $<
advent: $(OBJS) dungeon.o
$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) dungeon.o $(LDFLAGS) $(LIBS)
advent: $(OBJS) dungeon.o
$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) dungeon.o $(LDFLAGS) $(LIBS)
@@
-102,6
+104,7
@@
dist: advent-$(VERS).tar.gz
linty: CCFLAGS += -W
linty: CCFLAGS += -Wall
linty: CCFLAGS += -Wextra
linty: CCFLAGS += -W
linty: CCFLAGS += -Wall
linty: CCFLAGS += -Wextra
+linty: CCGLAGS += -Wpedantic
linty: CCFLAGS += -Wundef
linty: CCFLAGS += -Wstrict-prototypes
linty: CCFLAGS += -Wmissing-prototypes
linty: CCFLAGS += -Wundef
linty: CCFLAGS += -Wstrict-prototypes
linty: CCFLAGS += -Wmissing-prototypes