Use autoconf defaults for CXX and CXXFLAGS.

[movit] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index ce216f5b82556e5399a196f0547f9b0c919d930f..13fb6f9c28ef8cc685d75b094fbe05ca854f79cd 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,9 +7,9 @@ libdir = @libdir@
 datarootdir = @datarootdir@
 datadir = @datadir@
 
 datarootdir = @datarootdir@
 datadir = @datadir@
 

-CC=gcc
-CXX=g++
-CXXFLAGS=-Wall -g -I$(GTEST_DIR)/include @Eigen3_CFLAGS@ @GLEW_CFLAGS@
+CC=@CC@
+CXX=@CXX@
+CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @Eigen3_CFLAGS@ @GLEW_CFLAGS@

 LDFLAGS=@GLEW_LIBS@ @SDL_LIBS@
 DEMO_LDFLAGS=@SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@
 RANLIB=ranlib
 LDFLAGS=@GLEW_LIBS@ @SDL_LIBS@
 DEMO_LDFLAGS=@SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@
 RANLIB=ranlib


@@ -94,9 +94,12 @@ DEPS=$(OBJS:.o=.d)
 -include $(DEPS)
 
 clean:
 -include $(DEPS)
 
 clean:

-       $(RM) demo $(TESTS) libmovit.a $(OBJS) $(OBJS:.o=.gcno) $(OBJS:.o=.gcda) $(DEPS) step-*.dot
+       $(RM) demo $(TESTS) libmovit.a $(OBJS) $(OBJS:.o=.gcno) $(OBJS:.o=.gcda) $(DEPS) step*.dot chain*.frag

        $(RM) -r movit.info coverage/
 
        $(RM) -r movit.info coverage/
 

+distclean: clean
+       $(RM) Makefile movit.pc config.status config.log
+

 check: $(TESTS)
        FAILED_TESTS=""; \
        for TEST in $(TESTS); do \
 check: $(TESTS)
        FAILED_TESTS=""; \
        for TEST in $(TESTS); do \


@@ -133,5 +136,7 @@ install: libmovit.a
        $(INSTALL) -m 0644 $(HDRS) $(includedir)/movit/
        $(MKDIR) -p $(datadir)/movit/
        $(INSTALL) -m 0644 $(SHADERS) $(datadir)/movit/
        $(INSTALL) -m 0644 $(HDRS) $(includedir)/movit/
        $(MKDIR) -p $(datadir)/movit/
        $(INSTALL) -m 0644 $(SHADERS) $(datadir)/movit/

+       $(MKDIR) -p $(libdir)/pkgconfig/
+       $(INSTALL) -m 644 movit.pc $(libdir)/pkgconfig/

 
 

-.PHONY: coverage clean check all install
+.PHONY: coverage clean distclean check all install