Merge pull request #10 from colindean/matrix

Uses a build matrix to get binaries for Linux and macOS

.gitignore

@@ -0,0 +1,5 @@
+*.o
+golay
+golay_codes.c
+optar
+unoptar

.travis.yml

@@ -1,5 +1,21 @@
 language: c
-compiler:
+
-    - clang
+matrix:
-    - gcc
+  include:
-script: "make"
+    - os: linux
+      compiler: gcc
+    - os: osx
+      compiler: clang
+
+script: make -j
+before_deploy: make -j archive
+deploy:
+  provider: releases
+  api_key:
+    secure: mz4/p8VB7qn6F3M8uPT2/mJmU/nEWRGgsxN+KM/Gg1isSVrRpWP0xYfPTOdU6o9f0IVBRIW7SjHuq1H9kqGhmWx+Aycs8gE905ORYidLRjbkPN/fiS2jL6CcRzolkprvK7btIRhxfFGB/y3L0MELh+kXo1A6oIm+2a+OwNpdi4c=
+  file: optar-*.tar.gz
+  file_glob: true
+  skip_cleanup: true
+  on:
+    repo: colindean/optar
+    tags: true

Makefile

@@ -5,10 +5,22 @@ ifeq ($(CC), gcc)
 else
   SPECIFIC_CFLAGS=
 endif
+INCLUDE_PATHS=$(shell libpng-config --I_opts)
 CFLAGS=-O3 -Wall -Wuninitialized \
        -fomit-frame-pointer -funroll-loops \
 			 $(SPECIFIC_CFLAGS) \
-	     -DNODEBUG `libpng-config --I_opts`
+	     -DNODEBUG $(INCLUDE_PATHS)
+
+VERSION=$(shell git describe)
+ifdef TRAVIS_OS_NAME
+  OS=$(TRAVIS_OS_NAME)
+else
+  OS=$(shell uname -s)
+endif
+ARCH=$(shell uname -m)
+ARCHIVE_PATH=optar-$(VERSION)-$(OS)-$(ARCH).tar.gz
+BINARIES=optar unoptar
+EXECUTABLES=$(BINARIES) pgm2ps
 
 all: optar unoptar
 
@@ -23,7 +35,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 +53,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 $(CPPFLAGS) $(CFLAGS) -o $@ $<
 
 optar: optar.o common.o golay_codes.o parity.o
 	$(CC) $(LDFLAGS) -o $@ $^
@@ -54,3 +66,8 @@ golay: golay.o parity.o
 
 unoptar: unoptar.o common.o golay_codes.o parity.o
 	$(CC) -o $@ -L/usr/local/lib $^ -lm -lpng -lz
+
+archive: $(ARCHIVE_PATH)
+
+$(ARCHIVE_PATH): $(EXECUTABLES)
+	tar czvf $@ $^