sam
/
nsxiv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get rid of SRCDIR macro, VPATH on make cmd line suffices

This commit is contained in:
Bert Münnich 2017-10-08 20:23:16 +02:00
parent 2bf8f2ac42
commit 171633de32
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -4,8 +4,6 @@ all: sxiv
include config.mk include config.mk
VPATH := $(SRCDIR)
CPPFLAGS += -I. -DVERSION=\"$(VERSION)\" -DHAVE_GIFLIB=$(HAVE_GIFLIB) -DHAVE_LIBEXIF=$(HAVE_LIBEXIF) CPPFLAGS += -I. -DVERSION=\"$(VERSION)\" -DHAVE_GIFLIB=$(HAVE_GIFLIB) -DHAVE_LIBEXIF=$(HAVE_LIBEXIF)
DEPFLAGS := -MMD -MP DEPFLAGS := -MMD -MP
@ -28,9 +26,9 @@ $(OBJ): config.h Makefile
@echo "CC $@" @echo "CC $@"
$(CC) $(CFLAGS) $(CPPFLAGS) $(DEPFLAGS) -c -o $@ $< $(CC) $(CFLAGS) $(CPPFLAGS) $(DEPFLAGS) -c -o $@ $<
config.h: config.h: | config.def.h
@echo "GEN $@" @echo "GEN $@"
cp $(SRCDIR)/config.def.h $@ cp $| $@
sxiv: $(OBJ) sxiv: $(OBJ)
@echo "LINK $@" @echo "LINK $@"

2
config.mk
View File

@ -1,5 +1,3 @@
SRCDIR := .
PREFIX := /usr/local PREFIX := /usr/local
MANPREFIX := $(PREFIX)/share/man MANPREFIX := $(PREFIX)/share/man