From 2ea3d46f1341716daa1370f0f19d1fc571c3e63a Mon Sep 17 00:00:00 2001 From: Quentin Rameau Date: Mon, 30 Apr 2018 16:13:12 +0200 Subject: [PATCH] Makefile: move OS-specific libs to configure script --- Makefile | 2 +- config.mk | 3 --- configure | 9 ++++++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index a2c49c8..e046597 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ COM =\ SLSCFLAGS = -I$(X11INC) -D_DEFAULT_SOURCE $(CFLAGS) SLSLDFLAGS = -L$(X11LIB) $(LDFLAGS) -SLSLIBS = -lX11 $(OSSLIBS) $(LIBS) +SLSLIBS = -lX11 $(OSLIBS) $(LIBS) all: slstatus diff --git a/config.mk b/config.mk index bb2324f..6fbf696 100644 --- a/config.mk +++ b/config.mk @@ -10,9 +10,6 @@ MANPREFIX = ${PREFIX}/share/man X11INC = /usr/X11R6/include X11LIB = /usr/X11R6/lib -# OpenBSD (uncomment) -#OSSLIBS = -lossaudio - # flags CFLAGS = -std=c99 -pedantic -Wall -Wextra -Os LDFLAGS = -s diff --git a/configure b/configure index ee57a7f..2a510c7 100755 --- a/configure +++ b/configure @@ -1,3 +1,10 @@ #!/bin/sh -printf 'OS = %s\n' "$(uname)" > os.mk +os="$(uname)" + +printf 'OS = %s\n' "$os" > os.mk + +if [ "$os" = "OpenBSD" ] +then + printf 'OSLIBS = -lossaudio\n' >> os.mk +fi