commit 24b663d6570563a2dc601363c26ebd4d0bb36611
Author:     Laslo Hunhold <[email protected]>
AuthorDate: Tue May 1 20:50:53 2018 +0200
Commit:     Aaron Marcher <[email protected]>
CommitDate: Tue May 1 20:53:27 2018 +0200

    Tweak build system a little bit
    
    Be consistent with brackets and add a comment for OpenBSD to make it
    clearer what the actual intent of the uncommented line is.
    
    In the Makefile, add a dependency of slstatus.o from config.mk.

diff --git a/Makefile b/Makefile
index 00c35c4..b9d7695 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ COM =\
 all: slstatus
 
 slstatus: slstatus.o $(COM:=.o) $(REQ:=.o)
-slstatus.o: slstatus.c slstatus.h arg.h config.h $(REQ:=.h)
+slstatus.o: slstatus.c slstatus.h arg.h config.h config.mk $(REQ:=.h)
 $(COM:=.o): config.mk $(REQ:=.h)
 
 config.h:
diff --git a/config.mk b/config.mk
index a148da4..9d26bc3 100644
--- a/config.mk
+++ b/config.mk
@@ -5,19 +5,17 @@ VERSION = 0
 
 # paths
 PREFIX = /usr/local
-MANPREFIX = ${PREFIX}/share/man
+MANPREFIX = $(PREFIX)/share/man
 
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 
-# OpenBSD (uncomment)
-#OSSLIBS = -lossaudio
-
 # flags
 CPPFLAGS = -I$(X11INC) -D_DEFAULT_SOURCE
 CFLAGS   = -std=c99 -pedantic -Wall -Wextra -Os
 LDFLAGS  = -L$(X11LIB) -s
-LDLIBS   = -lX11 ${OSSLIBS}
+# OpenBSD: add -lossaudio
+LDLIBS   = -lX11
 
 # compiler and linker
 CC = cc

Reply via email to