nsxive46b1fa
Simplify config.mk
+21 −16
2 files changed
| @@ -1,10 +1,22 @@ | |||
| 1 | − | VERSION := git-20170906 | |
| 1 | + | VERSION := git-20170908 | |
| 2 | 2 | ||
| 3 | − | .PHONY: clean install uninstall | |
| 3 | + | .PHONY: all clean install uninstall | |
| 4 | 4 | .SUFFIXES: | |
| 5 | 5 | ||
| 6 | 6 | include config.mk | |
| 7 | 7 | ||
| 8 | + | CPPFLAGS += -DVERSION=\"$(VERSION)\" -DHAVE_GIFLIB=$(HAVE_GIFLIB) -DHAVE_LIBEXIF=$(HAVE_LIBEXIF) | |
| 9 | + | DEPFLAGS := -MMD -MP | |
| 10 | + | ||
| 11 | + | LDLIBS := -lImlib2 -lX11 -lXft | |
| 12 | + | ||
| 13 | + | ifneq ($(HAVE_GIFLIB),0) | |
| 14 | + | LDLIBS += -lgif | |
| 15 | + | endif | |
| 16 | + | ifneq ($(HAVE_LIBEXIF),0) | |
| 17 | + | LDLIBS += -lexif | |
| 18 | + | endif | |
| 19 | + | ||
| 8 | 20 | SRC := autoreload_$(AUTORELOAD).c commands.c image.c main.c options.c thumbs.c util.c window.c | |
| 9 | 21 | DEP := $(SRC:.c=.d) | |
| 10 | 22 | OBJ := $(SRC:.c=.o) | |
| @@ -16,13 +28,13 @@ $(OBJ): Makefile | |||
| 16 | 28 | -include $(DEP) | |
| 17 | 29 | ||
| 18 | 30 | %.o: %.c | |
| 19 | − | $(CC) $(CFLAGS) $(CPPFLAGS) -DVERSION=\"$(VERSION)\" -MMD -MP -c -o $@ $< | |
| 31 | + | $(CC) $(CFLAGS) $(CPPFLAGS) $(DEPFLAGS) -c -o $@ $< | |
| 20 | 32 | ||
| 21 | 33 | config.h: | |
| 22 | 34 | cp config.def.h $@ | |
| 23 | 35 | ||
| 24 | 36 | sxiv: $(OBJ) | |
| 25 | − | $(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) | |
| 37 | + | $(CC) $(LDFLAGS) -o $@ $(OBJ) $(LDLIBS) | |
| 26 | 38 | ||
| 27 | 39 | clean: | |
| 28 | 40 | rm -f $(OBJ) $(DEP) sxiv | |
| @@ -5,20 +5,13 @@ CC ?= gcc | |||
| 5 | 5 | CFLAGS += -std=c99 -Wall -pedantic | |
| 6 | 6 | CPPFLAGS += -I/usr/include/freetype2 -D_XOPEN_SOURCE=700 | |
| 7 | 7 | LDFLAGS += | |
| 8 | − | LIBS := -lImlib2 -lX11 -lXft | |
| 9 | 8 | ||
| 10 | 9 | # autoreload backend: inotify/nop | |
| 11 | 10 | AUTORELOAD := inotify | |
| 12 | 11 | ||
| 13 | − | # optional dependencies: | |
| 14 | − | # giflib: gif animations | |
| 15 | − | ifndef NO_GIFLIB | |
| 16 | − | CPPFLAGS += -DHAVE_GIFLIB | |
| 17 | − | LIBS += -lgif | |
| 18 | − | endif | |
| 19 | − | # libexif: jpeg auto-orientation, exif thumbnails | |
| 20 | − | ifndef NO_LIBEXIF | |
| 21 | − | CPPFLAGS += -DHAVE_LIBEXIF | |
| 22 | − | LIBS += -lexif | |
| 23 | − | endif | |
| 12 | + | # enable features requiring giflib (-lgif) | |
| 13 | + | HAVE_GIFLIB := 1 | |
| 14 | + | ||
| 15 | + | # enable features requiring libexif (-lexif) | |
| 16 | + | HAVE_LIBEXIF := 1 | |
| 24 | 17 | ||