Don't override GTEST_DIR if it already is set.

[movit] / Makefile

diff --git a/Makefile b/Makefile
index 8bfaf9fa6c5bac3796388c16cf3ed68d852ec3bb..83e6852a578d91203cc476017c700d8b83f1b92c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-GTEST_DIR = /usr/src/gtest
+GTEST_DIR ?= /usr/src/gtest
 
 EIGEN_CXXFLAGS := $(shell pkg-config --cflags eigen3)
 ifeq ($(EIGEN_CXXFLAGS),)
@@ -18,7 +18,7 @@ endif
 CC=gcc
 CXX=g++
 CXXFLAGS=-Wall -g -I$(GTEST_DIR)/include $(EIGEN_CXXFLAGS) $(GLEW_CXXFLAGS)
-LDFLAGS=-lSDL -lSDL_image -lGL -lrt -lpthread $(GLEW_LIBS)
+LDFLAGS=-lSDL -lSDL_image -lGL -lrt -lpthread -lpng $(GLEW_LIBS)
 RANLIB=ranlib
 
 ifeq ($(COVERAGE),1)