nsxivdf71437
Always take {C,CPP,LD}FLAGS from environment
Our own default values go into accompanying macros prefixed with DEF_.
+9 −9
1 file changed
- M Makefile +9 −9
| @@ -1,4 +1,4 @@ | |||
| 1 | − | VERSION = git-20171019 | |
| 1 | + | VERSION = git-20171022 | |
| 2 | 2 | ||
| 3 | 3 | srcdir = . | |
| 4 | 4 | VPATH = $(srcdir) | |
| @@ -6,10 +6,9 @@ VPATH = $(srcdir) | |||
| 6 | 6 | PREFIX = /usr/local | |
| 7 | 7 | MANPREFIX = $(PREFIX)/share/man | |
| 8 | 8 | ||
| 9 | − | CC ?= cc | |
| 10 | − | CFLAGS += -std=c99 -Wall -pedantic | |
| 11 | − | CPPFLAGS += -I/usr/include/freetype2 | |
| 12 | − | LDFLAGS += | |
| 9 | + | CC = cc | |
| 10 | + | DEF_CFLAGS = -std=c99 -Wall -pedantic | |
| 11 | + | DEF_CPPFLAGS = -I/usr/include/freetype2 | |
| 13 | 12 | ||
| 14 | 13 | # autoreload backend: inotify/nop | |
| 15 | 14 | AUTORELOAD = inotify | |
| @@ -20,9 +19,10 @@ HAVE_GIFLIB = 1 | |||
| 20 | 19 | # enable features requiring libexif (-lexif) | |
| 21 | 20 | HAVE_LIBEXIF = 1 | |
| 22 | 21 | ||
| 22 | + | ALL_CFLAGS = $(DEF_CFLAGS) $(CFLAGS) | |
| 23 | 23 | REQ_CPPFLAGS = -I. -D_XOPEN_SOURCE=700 -DVERSION=\"$(VERSION)\" \ | |
| 24 | 24 | -DHAVE_GIFLIB=$(HAVE_GIFLIB) -DHAVE_LIBEXIF=$(HAVE_LIBEXIF) | |
| 25 | − | ALL_CPPFLAGS = $(REQ_CPPFLAGS) $(CPPFLAGS) | |
| 25 | + | ALL_CPPFLAGS = $(REQ_CPPFLAGS) $(DEF_CPPFLAGS) $(CPPFLAGS) | |
| 26 | 26 | ||
| 27 | 27 | LIB_EXIF_0 = | |
| 28 | 28 | LIB_EXIF_1 = -lexif | |
| @@ -42,16 +42,16 @@ all: sxiv | |||
| 42 | 42 | .SUFFIXES: .c .o | |
| 43 | 43 | $(V).SILENT: | |
| 44 | 44 | ||
| 45 | − | sxiv: $(OBJS) | |
| 45 | + | sxiv: $(OBJS) | |
| 46 | 46 | @echo "LINK $@" | |
| 47 | − | $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(LDLIBS) | |
| 47 | + | $(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $(OBJS) $(LDLIBS) | |
| 48 | 48 | ||
| 49 | 49 | $(OBJS): Makefile sxiv.h commands.lst config.h | |
| 50 | 50 | window.o: icon/data.h | |
| 51 | 51 | ||
| 52 | 52 | .c.o: | |
| 53 | 53 | @echo "CC $@" | |
| 54 | − | $(CC) $(ALL_CPPFLAGS) $(CFLAGS) -c -o $@ $< | |
| 54 | + | $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -c -o $@ $< | |
| 55 | 55 | ||
| 56 | 56 | config.h: | |
| 57 | 57 | @echo "GEN $@" | |