Merge pull request #10 from colindean/matrix

Uses a build matrix to get binaries for Linux and macOS

.travis.yml

@@ -1,7 +1,12 @@
 language: c
-compiler:
-- clang
-- gcc
+
+matrix:
+  include:
+    - os: linux
+      compiler: gcc
+    - os: osx
+      compiler: clang
+
 script: make -j
 before_deploy: make -j archive
 deploy:
@@ -10,6 +15,7 @@ deploy:
     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,13 +5,20 @@ 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)
-ARCHIVE_PATH=optar-$(VERSION).tar.gz
+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