From a36cf13e52f0b4fffeed147171fc7e2937d0271d Mon Sep 17 00:00:00 2001
From: Colin Dean <git@cad.cx>
Date: Sun, 8 Apr 2018 12:27:39 -0400
Subject: [PATCH] Moves some vars in the Makefile

---
 Makefile | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index cd6b04c..1336f62 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,15 @@ CFLAGS=-O3 -Wall -Wuninitialized \
 			 $(SPECIFIC_CFLAGS) \
 	     -DNODEBUG `libpng-config --I_opts`
 
+LIBPNG_PATH ?= /usr/local/include/libpng
+INCLUDES = $(LIBPNG_PATH)
+INCLUDES_CMD = $(foreach d, $(INCLUDES), -I$d)
+
+VERSION=$(shell git describe)
+ARCHIVE_PATH=optar-$(VERSION).tar.gz
+BINARIES=optar unoptar
+EXECUTABLES=$(BINARIES) pgm2ps
+
 all: optar unoptar
 
 install:
@@ -23,7 +32,7 @@ uninstall:
 	rm /usr/local/bin/pgm2ps
 
 clean:
-	rm -f optar unoptar golay golay_codes.c *.o
+	rm -f $(BINARIES) optar-*.tar.gz golay_codes.c *.o
 
 common.o: common.c optar.h
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
@@ -41,7 +50,7 @@ golay.o: golay.c parity.h
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
 
 unoptar.o: unoptar.c optar.h parity.h
-	$(CC) -c -I/usr/local/include/libpng $(CPPFLAGS) $(CFLAGS) -o $@ $<
+	$(CC) -c $(INCLUDES_CMD) $(CPPFLAGS) $(CFLAGS) -o $@ $<
 
 optar: optar.o common.o golay_codes.o parity.o
 	$(CC) $(LDFLAGS) -o $@ $^