Switch from using GLEW to epoxy.

[movit] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 7f1bfb42844af1805a90f3141dcad0df3d32d757..4936ccfd9e325b7e0801191d2b2b2c650eab9e74 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -11,10 +11,11 @@ with_demo_app = @with_demo_app@
 
 CC=@CC@
 CXX=@CXX@
-CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @Eigen3_CFLAGS@ @GLEW_CFLAGS@
-LDFLAGS=@GLEW_LIBS@ @SDL_LIBS@ -lpthread
-DEMO_LDFLAGS=@SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@
-LIBTOOL=@LIBTOOL@
+CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @Eigen3_CFLAGS@ @epoxy_CFLAGS@
+LDFLAGS=@epoxy_LIBS@ @SDL_LIBS@ -lpthread
+DEMO_LDLIBS=@SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@
+SHELL=@SHELL@
+LIBTOOL=@LIBTOOL@ --tag=CXX
 RANLIB=ranlib
 INSTALL=install
 MKDIR=mkdir
@@ -53,11 +54,11 @@ TESTED_EFFECTS += resample_effect
 TESTED_EFFECTS += dither_effect
 TESTED_EFFECTS += deconvolution_sharpen_effect
 TESTED_EFFECTS += fft_pass_effect
+TESTED_EFFECTS += vignette_effect
 
 UNTESTED_EFFECTS = sandbox_effect
 UNTESTED_EFFECTS += mirror_effect
 UNTESTED_EFFECTS += resize_effect
-UNTESTED_EFFECTS += vignette_effect
 UNTESTED_EFFECTS += multiply_effect
 
 EFFECTS = $(TESTED_EFFECTS) $(UNTESTED_EFFECTS)
@@ -125,7 +126,7 @@ check: $(TESTS)
 # You need to build with COVERAGE=1 to use this target.
 coverage: check
        lcov -d . -c -o movit.info
-       lcov --remove movit.info '*_test.cpp' '*/test_util.{cpp,h}' -o movit.info
+       lcov --remove movit.info '*_test.cpp' 'test_util.*' 'sandbox_effect.*' widgets.cpp -o movit.info
        genhtml -o coverage movit.info
 
 HDRS = effect_chain.h effect_util.h effect.h input.h image_format.h init.h util.h defs.h resource_pool.h