From 95665e437b8f556db4d5499e189e224e3c6e6a12 Mon Sep 17 00:00:00 2001 From: Quentin Rameau Date: Mon, 30 Apr 2018 16:11:45 +0200 Subject: [PATCH] Makefile: separate default flags from user flags --- Makefile | 8 ++++++-- config.mk | 10 +++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 7d80893..a2c49c8 100644 --- a/Makefile +++ b/Makefile @@ -27,6 +27,10 @@ COM =\ components/volume\ components/$(OS)/wifi +SLSCFLAGS = -I$(X11INC) -D_DEFAULT_SOURCE $(CFLAGS) +SLSLDFLAGS = -L$(X11LIB) $(LDFLAGS) +SLSLIBS = -lX11 $(OSSLIBS) $(LIBS) + all: slstatus slstatus: slstatus.o $(COM:=.o) $(REQ:=.o) @@ -37,10 +41,10 @@ config.h: cp config.def.h $@ .o: - $(CC) -o $@ $(LDFLAGS) $< $(COM:=.o) $(REQ:=.o) $(LDLIBS) + $(CC) -o $@ $(SLSLDFLAGS) $< $(COM:=.o) $(REQ:=.o) $(SLSLIBS) .c.o: - $(CC) -o $@ -c $(CPPFLAGS) $(CFLAGS) $< + $(CC) -o $@ -c $(SLSCFLAGS) $< clean: rm -f slstatus slstatus.o $(COM:=.o) $(REQ:=.o) diff --git a/config.mk b/config.mk index a148da4..bb2324f 100644 --- a/config.mk +++ b/config.mk @@ -4,7 +4,7 @@ VERSION = 0 # customize below to fit your system # paths -PREFIX = /usr/local +PREFIX = /usr/local MANPREFIX = ${PREFIX}/share/man X11INC = /usr/X11R6/include @@ -14,10 +14,6 @@ X11LIB = /usr/X11R6/lib #OSSLIBS = -lossaudio # flags -CPPFLAGS = -I$(X11INC) -D_DEFAULT_SOURCE CFLAGS = -std=c99 -pedantic -Wall -Wextra -Os -LDFLAGS = -L$(X11LIB) -s -LDLIBS = -lX11 ${OSSLIBS} - -# compiler and linker -CC = cc +LDFLAGS = -s +LIBS =