Fixes to deal with newer png lib and C++11, as suggested by Mark van Rossum.

[svrt.git] / Makefile

diff --git a/Makefile b/Makefile
index 2e37a79..0cf2320 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@
 #  You should have received a copy of the GNU General Public License
 #  along with selector.  If not, see <http://www.gnu.org/licenses/>.
 
-LDFLAGS=-lm -ljpeg -lpng
+LDFLAGS=-lm -ljpeg -lpng12
 
 ifeq ($(DEBUG),yes)
   OPTIMIZE_FLAG = -ggdb3 -DDEBUG -fno-omit-frame-pointer
@@ -39,7 +39,10 @@ all: vision_test TAGS
 TAGS: *.cc *.h
        etags --members -l c++ *.cc *.h
 
-vision_test: misc.o rgb_image.o jpeg_misc.o fusion_sort.o global.o param_parser.o progress_bar.o \
+vision_test: misc.o \
+       global.o param_parser.o progress_bar.o \
+       rgb_image.o jpeg_misc.o \
+       fusion_sort.o \
        discrete_density.o \
        tools.o \
        vignette.o \
@@ -49,16 +52,26 @@ vision_test: misc.o rgb_image.o jpeg_misc.o fusion_sort.o global.o param_parser.
        vision_problem_1.o \
        vision_problem_2.o \
        vision_problem_3.o \
+       vision_problem_4.o \
        vision_problem_5.o \
        vision_problem_6.o \
+       vision_problem_7.o \
        vision_problem_8.o \
+       vision_problem_9.o \
+       vision_problem_10.o \
        vision_problem_11.o \
        vision_problem_12.o \
        vision_problem_13.o \
+       vision_problem_14.o \
+       vision_problem_15.o \
+       vision_problem_16.o \
        vision_problem_17.o \
        vision_problem_18.o \
+       vision_problem_19.o \
        vision_problem_20.o \
        vision_problem_21.o \
+       vision_problem_22.o \
+       vision_problem_23.o \
        classifier_reader.o \
         classifier.o naive_bayesian_classifier.o \
        stump.o boosted_classifier.o \