From 5da6ca0d3d6d08b8102b645a2fbc52f0b24b80c1 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Thu, 25 Oct 2012 13:30:20 +0000 Subject: switch to pkg-config --- Makefile | 19 +++++-------------- spectrogram.c | 4 ++-- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 1e77f0f..2bd7f16 100644 --- a/Makefile +++ b/Makefile @@ -3,21 +3,12 @@ PROG= spectrogram SRCS= spectrogram.c fifo.c fft.c hsv2rgb.c HEADERS=fifo.h fft.h hsv2rgb.h -CFLAGS+=-I/usr/local/include \ - -I/usr/local/include/SDL \ - -D_GNU_SOURCE=1 \ - -D_REENTRANT \ - -I/usr/X11R6/include \ - -DXTHREADS -LDADD+= -L/usr/local/lib \ - -lSDL \ - -pthread \ - -L/usr/X11R6/lib \ - -R/usr/X11R6/lib -LDADD+= -lsndio -lfftw3 -lm -#LDADD+= -liconv -lusbhid -lX11 -lxcb -lXau -lXdmcp +LIBS= sdl fftw3 +PCCF!= pkg-config --cflags ${LIBS} +PCLA!= pkg-config --libs ${LIBS} +CFLAGS+=${PCCF} +LDADD+= ${PCLA} -lsndio DEBUG+= -Wall -#DEBUG+=-ggdb -g -pg NOMAN= .include diff --git a/spectrogram.c b/spectrogram.c index 718c5d4..02eddaa 100644 --- a/spectrogram.c +++ b/spectrogram.c @@ -28,8 +28,8 @@ #include #include -#include -#include +#include +#include #include "fifo.h" #include "fft.h" -- cgit v1.2.3