nsxiv171633d
Get rid of SRCDIR macro, VPATH on make cmd line suffices
+2 −6
2 files changed
| @@ -4,8 +4,6 @@ all: sxiv | |||
| 4 | 4 | ||
| 5 | 5 | include config.mk | |
| 6 | 6 | ||
| 7 | − | VPATH := $(SRCDIR) | |
| 8 | − | ||
| 9 | 7 | CPPFLAGS += -I. -DVERSION=\"$(VERSION)\" -DHAVE_GIFLIB=$(HAVE_GIFLIB) -DHAVE_LIBEXIF=$(HAVE_LIBEXIF) | |
| 10 | 8 | DEPFLAGS := -MMD -MP | |
| 11 | 9 | ||
| @@ -28,9 +26,9 @@ $(OBJ): config.h Makefile | |||
| 28 | 26 | @echo "CC $@" | |
| 29 | 27 | $(CC) $(CFLAGS) $(CPPFLAGS) $(DEPFLAGS) -c -o $@ $< | |
| 30 | 28 | ||
| 31 | − | config.h: | |
| 29 | + | config.h: | config.def.h | |
| 32 | 30 | @echo "GEN $@" | |
| 33 | − | cp $(SRCDIR)/config.def.h $@ | |
| 31 | + | cp $| $@ | |
| 34 | 32 | ||
| 35 | 33 | sxiv: $(OBJ) | |
| 36 | 34 | @echo "LINK $@" | |
| @@ -1,5 +1,3 @@ | |||
| 1 | − | SRCDIR := . | |
| 2 | − | ||
| 3 | 1 | PREFIX := /usr/local | |
| 4 | 2 | MANPREFIX := $(PREFIX)/share/man | |
| 5 | 3 | ||