From ed56ecc4d6754138d191a72e40f4b6e84287c4bc Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Wed, 10 Sep 2014 22:45:26 +0000 Subject: combine Makefiles --- Makefile | 24 ++++++++++++++++++------ Makefile.linux | 14 -------------- 2 files changed, 18 insertions(+), 20 deletions(-) delete mode 100644 Makefile.linux diff --git a/Makefile b/Makefile index 1380b09..73d88dd 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,27 @@ # $Id$ -VERSION=2.0 +VERSION=3.0 PROG= spectrogram -SRCS= spectrogram.c sio.c fft.c cms.c aux.c widget.c -BINDIR= /usr/local/bin -HEADERS=sio.h fft.h cms.h aux.h + +SRCS= spectrogram.c fft.c cms.c aux.c widget.c LIBS= fftw3 x11 +BINDIR= /usr/local/bin + +UNAME!= uname +.ifdef ${UNAME} == Linux +SRCS+= alsa.c +LIBS+= alsa +.else +SRCS+= sio.c +LDADD+= -lsndio +.endif + PCCF!= pkg-config --cflags ${LIBS} -PCLA!= pkg-config --libs ${LIBS} CFLAGS+=${PCCF} -LDADD+= ${PCLA} -lsndio + +PCLA!= pkg-config --libs ${LIBS} +LDADD+= ${PCLA} + DEBUG+= -Wall NOMAN= DIR= ${PROG}-${VERSION} diff --git a/Makefile.linux b/Makefile.linux deleted file mode 100644 index 76eed82..0000000 --- a/Makefile.linux +++ /dev/null @@ -1,14 +0,0 @@ -# $Id$ - -PROG= spectrogram -SRCS= spectrogram.c alsa.c fft.c cms.c aux.c -BINDIR= /usr/local/bin -LIBS= fftw3 x11 alsa -PCCF!= pkg-config --cflags ${LIBS} -PCLA!= pkg-config --libs ${LIBS} -CFLAGS+=${PCCF} -LDADD+= ${PCLA} -DEBUG+= -Wall -NOMAN= - -.include -- cgit v1.2.3