From 90a1fb49c77db0c8234d9a3fb6372a8612ac426a Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sat, 8 Aug 2015 20:23:51 +0200 Subject: [PATCH] Allow use of system-wide iniparser using "make SYSTEM_INIPARSER=1" --- cava.c | 2 +- makefile | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/cava.c b/cava.c index 39a3f39..3358da9 100644 --- a/cava.c +++ b/cava.c @@ -31,7 +31,7 @@ #include "input/alsa.c" #include "input/fifo.h" #include "input/fifo.c" -#include "iniparser/src/iniparser.h" +#include #ifdef __GNUC__ diff --git a/makefile b/makefile index 4039822..7324d02 100644 --- a/makefile +++ b/makefile @@ -1,11 +1,21 @@ PACKAGE ?= cava VERSION ?= $(shell git describe --always --tags --dirty) +ifeq ($(SYSTEM_INIPARSER),1) +CPPFLAGS_INIPARSER = -I/usr/include/iniparser4 +LDLIBS_INIPARSER = -liniparser4 +DEP_INIPARSER = +else +CPPFLAGS_INIPARSER = -Iiniparser/src +LDLIBS_INIPARSER = iniparser/libiniparser.a +DEP_INIPARSER = iniparser/libiniparser.a +endif + CC = gcc CFLAGS += -std=c99 -Wall -Wextra CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\" \ - -D_POSIX_SOURCE -D _POSIX_C_SOURCE=200809L -LDLIBS = ./iniparser/libiniparser.a -lasound -lm -lfftw3 -lpthread $(shell ncursesw5-config --cflags --libs) + -D_POSIX_SOURCE -D _POSIX_C_SOURCE=200809L $(CPPFLAGS_INIPARSER) +LDLIBS = $(LDLIBS_INIPARSER) -lasound -lm -lfftw3 -lpthread $(shell ncursesw5-config --cflags --libs) INSTALL = install INSTALL_BIN = $(INSTALL) -D -m 755 @@ -23,7 +33,7 @@ endif all: cava check-env copyconf -cava: cava.c ./iniparser/libiniparser.a +cava: cava.c $(DEP_INIPARSER) iniparser/libiniparser.a: cd iniparser && $(MAKE)