nsxiv971f5d6
Revise Makefile
Use uppercase for externally defined macros and lowercase for macros defined in the makefile. Also simplify generation of version.h.
+18 −24
1 file changed
- M Makefile +18 −24
| @@ -1,4 +1,4 @@ | |||
| 1 | − | VERSION = 24+ | |
| 1 | + | version = 24+ | |
| 2 | 2 | ||
| 3 | 3 | srcdir = . | |
| 4 | 4 | VPATH = $(srcdir) | |
| @@ -6,10 +6,6 @@ VPATH = $(srcdir) | |||
| 6 | 6 | PREFIX = /usr/local | |
| 7 | 7 | MANPREFIX = $(PREFIX)/share/man | |
| 8 | 8 | ||
| 9 | − | CC = cc | |
| 10 | − | DEF_CFLAGS = -std=c99 -Wall -pedantic | |
| 11 | − | DEF_CPPFLAGS = -I/usr/include/freetype2 | |
| 12 | − | ||
| 13 | 9 | # autoreload backend: inotify/nop | |
| 14 | 10 | AUTORELOAD = inotify | |
| 15 | 11 | ||
| @@ -19,19 +15,18 @@ HAVE_GIFLIB = 1 | |||
| 19 | 15 | # enable features requiring libexif (-lexif) | |
| 20 | 16 | HAVE_LIBEXIF = 1 | |
| 21 | 17 | ||
| 22 | − | ALL_CFLAGS = $(DEF_CFLAGS) $(CFLAGS) | |
| 23 | − | REQ_CPPFLAGS = -I. -D_XOPEN_SOURCE=700 \ | |
| 24 | − | -DHAVE_GIFLIB=$(HAVE_GIFLIB) -DHAVE_LIBEXIF=$(HAVE_LIBEXIF) | |
| 25 | − | ALL_CPPFLAGS = $(REQ_CPPFLAGS) $(DEF_CPPFLAGS) $(CPPFLAGS) | |
| 18 | + | cflags = -std=c99 -Wall -pedantic $(CFLAGS) | |
| 19 | + | cppflags = -I. $(CPPFLAGS) -D_XOPEN_SOURCE=700 -DHAVE_GIFLIB=$(HAVE_GIFLIB) \ | |
| 20 | + | -DHAVE_LIBEXIF=$(HAVE_LIBEXIF) -I/usr/include/freetype2 | |
| 26 | 21 | ||
| 27 | − | LIB_EXIF_0 = | |
| 28 | − | LIB_EXIF_1 = -lexif | |
| 29 | − | LIB_GIF_0 = | |
| 30 | − | LIB_GIF_1 = -lgif | |
| 31 | − | LDLIBS = -lImlib2 -lX11 -lXft -lfontconfig \ | |
| 32 | − | $(LIB_EXIF_$(HAVE_LIBEXIF)) $(LIB_GIF_$(HAVE_GIFLIB)) | |
| 22 | + | lib_exif_0 = | |
| 23 | + | lib_exif_1 = -lexif | |
| 24 | + | lib_gif_0 = | |
| 25 | + | lib_gif_1 = -lgif | |
| 26 | + | ldlibs = $(LDLIBS) -lImlib2 -lX11 -lXft -lfontconfig \ | |
| 27 | + | $(lib_exif_$(HAVE_LIBEXIF)) $(lib_gif_$(HAVE_GIFLIB)) | |
| 33 | 28 | ||
| 34 | − | OBJS = autoreload_$(AUTORELOAD).o commands.o image.o main.o options.o \ | |
| 29 | + | objs = autoreload_$(AUTORELOAD).o commands.o image.o main.o options.o \ | |
| 35 | 30 | thumbs.o util.o window.o | |
| 36 | 31 | ||
| 37 | 32 | all: sxiv | |
| @@ -41,17 +36,17 @@ all: sxiv | |||
| 41 | 36 | .SUFFIXES: .c .o | |
| 42 | 37 | $(V).SILENT: | |
| 43 | 38 | ||
| 44 | − | sxiv: $(OBJS) | |
| 39 | + | sxiv: $(objs) | |
| 45 | 40 | @echo "LINK $@" | |
| 46 | − | $(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $(OBJS) $(LDLIBS) | |
| 41 | + | $(CC) $(LDFLAGS) -o $@ $(objs) $(ldlibs) | |
| 47 | 42 | ||
| 48 | − | $(OBJS): Makefile sxiv.h commands.lst config.h | |
| 43 | + | $(objs): Makefile sxiv.h commands.lst config.h | |
| 49 | 44 | options.o: version.h | |
| 50 | 45 | window.o: icon/data.h | |
| 51 | 46 | ||
| 52 | 47 | .c.o: | |
| 53 | 48 | @echo "CC $@" | |
| 54 | − | $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -c -o $@ $< | |
| 49 | + | $(CC) $(cflags) $(cppflags) -c -o $@ $< | |
| 55 | 50 | ||
| 56 | 51 | config.h: | |
| 57 | 52 | @echo "GEN $@" | |
| @@ -59,9 +54,8 @@ config.h: | |||
| 59 | 54 | ||
| 60 | 55 | version.h: Makefile .git/index | |
| 61 | 56 | @echo "GEN $@" | |
| 62 | − | VERSION="$$(cd $(srcdir); git describe 2>/dev/null)"; \ | |
| 63 | − | [ -z "$$VERSION" ] && VERSION="$(VERSION)"; \ | |
| 64 | − | echo "#define VERSION \"$$VERSION\"" >$@ | |
| 57 | + | v="$$(cd $(srcdir); git describe 2>/dev/null)"; \ | |
| 58 | + | echo "#define VERSION \"$${v:-$(version)}\"" >$@ | |
| 65 | 59 | ||
| 66 | 60 | .git/index: | |
| 67 | 61 | ||
| @@ -75,7 +69,7 @@ install: all | |||
| 75 | 69 | chmod 755 $(DESTDIR)$(PREFIX)/bin/sxiv | |
| 76 | 70 | @echo "INSTALL sxiv.1" | |
| 77 | 71 | mkdir -p $(DESTDIR)$(MANPREFIX)/man1 | |
| 78 | − | sed "s!PREFIX!$(PREFIX)!g; s!VERSION!$(VERSION)!g" sxiv.1 \ | |
| 72 | + | sed "s!PREFIX!$(PREFIX)!g; s!VERSION!$(version)!g" sxiv.1 \ | |
| 79 | 73 | >$(DESTDIR)$(MANPREFIX)/man1/sxiv.1 | |
| 80 | 74 | chmod 644 $(DESTDIR)$(MANPREFIX)/man1/sxiv.1 | |
| 81 | 75 | @echo "INSTALL share/sxiv/" | |