fallingsky04
/
slstatus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile: move OS-specific libs to configure script

This commit is contained in:
Quentin Rameau 2018-04-30 16:13:12 +02:00 committed by Aaron Marcher
parent 95665e437b
commit 2ea3d46f13
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -29,7 +29,7 @@ COM =\
SLSCFLAGS = -I$(X11INC) -D_DEFAULT_SOURCE $(CFLAGS) SLSCFLAGS = -I$(X11INC) -D_DEFAULT_SOURCE $(CFLAGS)
SLSLDFLAGS = -L$(X11LIB) $(LDFLAGS) SLSLDFLAGS = -L$(X11LIB) $(LDFLAGS)
SLSLIBS = -lX11 $(OSSLIBS) $(LIBS) SLSLIBS = -lX11 $(OSLIBS) $(LIBS)
all: slstatus all: slstatus

3
config.mk
View File

@ -10,9 +10,6 @@ MANPREFIX = ${PREFIX}/share/man
X11INC = /usr/X11R6/include X11INC = /usr/X11R6/include
X11LIB = /usr/X11R6/lib X11LIB = /usr/X11R6/lib
# OpenBSD (uncomment)
#OSSLIBS = -lossaudio
# flags # flags
CFLAGS = -std=c99 -pedantic -Wall -Wextra -Os CFLAGS = -std=c99 -pedantic -Wall -Wextra -Os
LDFLAGS = -s LDFLAGS = -s

9
configure vendored
View File

@ -1,3 +1,10 @@
#!/bin/sh #!/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