Browse Source

Makefile: move OS-specific libs to configure script

master
Quentin Rameau 6 years ago
committed by Aaron Marcher
parent
commit
2ea3d46f13
3 changed files with 9 additions and 5 deletions
  1. +1
    -1
      Makefile
  2. +0
    -3
      config.mk
  3. +8
    -1
      configure

+ 1
- 1
Makefile View File

@@ -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



+ 0
- 3
config.mk View File

@@ -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


+ 8
- 1
configure View File

@@ -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

Loading…
Cancel
Save