Take LDFLAGS properly from configure, and distinguish better between LDFLAGS and...

diff --git a/Makefile.in b/Makefile.in
index 5d0cb8ad3a98e3927f9c8e8b5768ab43f6f2267a..b0c9889808ce9deba4ced7df42cad6bd15e829c6 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -22,8 +22,9 @@ with_coverage = @with_coverage@
 CC=@CC@
 CXX=@CXX@
 CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @Eigen3_CFLAGS@ @GLEW_CFLAGS@ @FFTW3_CFLAGS@
 CC=@CC@
 CXX=@CXX@
 CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @Eigen3_CFLAGS@ @GLEW_CFLAGS@ @FFTW3_CFLAGS@

-LDFLAGS=@GLEW_LIBS@ @FFTW3_LIBS@ -lpthread
-TEST_LDLIBS=@SDL_LIBS@
+LDFLAGS=@LDFLAGS@
+LDLIBS=@GLEW_LIBS@ @FFTW3_LIBS@ -lpthread
+TEST_LDLIBS=@GLEW_LIBS@ @SDL_LIBS@ -lpthread

 DEMO_LDLIBS=@SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@
 SHELL=@SHELL@
 LIBTOOL=@LIBTOOL@ --tag=CXX
 DEMO_LDLIBS=@SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@
 SHELL=@SHELL@
 LIBTOOL=@LIBTOOL@ --tag=CXX


@@ -102,7 +103,7 @@ gtest_sdl_main.o: gtest_sdl_main.cpp
 
 # Unit tests.
 $(TESTS): %: %.o $(TEST_OBJS) libmovit.la
 
 # Unit tests.
 $(TESTS): %: %.o $(TEST_OBJS) libmovit.la

-       $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS) $(TEST_LDLIBS)
+       $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $^ $(TEST_LDLIBS)

 
 OWN_OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(OWN_TEST_OBJS) $(TESTS:=.o)
 OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(TEST_OBJS) $(TESTS:=.o)
 
 OWN_OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(OWN_TEST_OBJS) $(TESTS:=.o)
 OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(TEST_OBJS) $(TESTS:=.o)