Makefile: move OS-specific libs to configure script

diff --git a/Makefile b/Makefile
index a2c49c82732ac1cab8cdcdf707ea01153711cf3c..e046597689fdb44ebabce2e9c84534eb30494a72 100644 (file)
--- 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 bb2324f8a2683d32d0fb9469679b28b17a841270..6fbf696c342a8ccaa4d69947c728dbbbc92049cb 100644 (file)
--- 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 ee57a7f7d2d471264b19a1ab08e1ab27f4931027..2a510c75ca8ffd97ad788c71574de515f751048e 100755 (executable)
--- 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