Makefile, config.mk: respect user {C,CPP,LD}FLAGS
This commit is contained in:
parent
f48b9a3781
commit
ca390636ed
2 changed files with 8 additions and 8 deletions
10
Makefile
10
Makefile
|
@ -10,12 +10,12 @@ all: options dmenu stest
|
||||||
|
|
||||||
options:
|
options:
|
||||||
@echo dmenu build options:
|
@echo dmenu build options:
|
||||||
@echo "CFLAGS = $(CFLAGS)"
|
@echo "CFLAGS = $(XCFLAGS)"
|
||||||
@echo "LDFLAGS = $(LDFLAGS)"
|
@echo "LDFLAGS = $(XLDFLAGS)"
|
||||||
@echo "CC = $(CC)"
|
@echo "CC = $(CC)"
|
||||||
|
|
||||||
.c.o:
|
.c.o:
|
||||||
$(CC) -c $(CFLAGS) $<
|
$(CC) -c $(XCFLAGS) $<
|
||||||
|
|
||||||
config.h:
|
config.h:
|
||||||
cp config.def.h $@
|
cp config.def.h $@
|
||||||
|
@ -23,10 +23,10 @@ config.h:
|
||||||
$(OBJ): arg.h config.h config.mk drw.h
|
$(OBJ): arg.h config.h config.mk drw.h
|
||||||
|
|
||||||
dmenu: dmenu.o drw.o util.o
|
dmenu: dmenu.o drw.o util.o
|
||||||
$(CC) -o $@ dmenu.o drw.o util.o $(LDFLAGS)
|
$(CC) -o $@ dmenu.o drw.o util.o $(XLDFLAGS)
|
||||||
|
|
||||||
stest: stest.o
|
stest: stest.o
|
||||||
$(CC) -o $@ stest.o $(LDFLAGS)
|
$(CC) -o $@ stest.o $(XLDFLAGS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f dmenu stest $(OBJ) dmenu-$(VERSION).tar.gz
|
rm -f dmenu stest $(OBJ) dmenu-$(VERSION).tar.gz
|
||||||
|
|
|
@ -24,9 +24,9 @@ INCS = -I$(X11INC) -I$(FREETYPEINC)
|
||||||
LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
|
LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
|
||||||
|
|
||||||
# flags
|
# flags
|
||||||
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
|
XCPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
|
||||||
CFLAGS = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS)
|
XCFLAGS = -std=c99 -pedantic -Wall $(INCS) $(XCPPFLAGS) $(CPPFLAGS) $(CFLAGS)
|
||||||
LDFLAGS = $(LIBS)
|
XLDFLAGS = $(LIBS) $(LDFLAGS)
|
||||||
|
|
||||||
# compiler and linker
|
# compiler and linker
|
||||||
CC = cc
|
CC = cc
|
||||||
|
|
Loading…
Reference in a new issue