automatic commit

[folded-ctf.git] / Makefile

diff --git a/Makefile b/Makefile
index 7fc3339..9b6f5da 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,21 +2,23 @@
 #########################################################################
 # This program is free software: you can redistribute it and/or modify  #
 # it under the terms of the version 3 of the GNU General Public License #
-# as published by the Free Software Foundation.                                #
-#                                                                      #
+# as published by the Free Software Foundation.                         #
+#                                                                       #
 # This program is distributed in the hope that it will be useful, but   #
-# WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# WITHOUT ANY WARRANTY; without even the implied warranty of            #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      #
-# General Public License for more details.                             #
-#                                                                      #
+# General Public License for more details.                              #
+#                                                                       #
 # You should have received a copy of the GNU General Public License     #
 # along with this program. If not, see <http://www.gnu.org/licenses/>.  #
-#                                                                      #
-# Written by Francois Fleuret, (C) IDIAP                               #
+#                                                                       #
+# Written by Francois Fleuret                                           #
+# (C) Idiap Research Institute                                          #
+#                                                                       #
 # Contact <francois.fleuret@idiap.ch> for comments & bug reports        #
 #########################################################################
 
-CXX=g++-4.1
+# CXX=g++-4.1
 
 ifeq ($(STATIC),yes)
   LDFLAGS=-static -lm -ljpeg -lpng -lz
@@ -36,18 +38,13 @@ endif
 
 CXXFLAGS = -Wall $(OPTIMIZE_FLAG) $(PROFILE_FLAG)
 
-# ifeq ($(CURSES),yes)
-#   LDFLAGS=$(LDFLAGS) -lncurses
-#   CXXFLAGS = $(CXXFLAGS) -DWITH_CURSES
-# endif
-
 all: folding list_to_pool TAGS
 
 TAGS: *.cc *.h
        etags --members -l c++ *.cc *.h
 
 folding: misc.o interval.o gaussian.o fusion_sort.o global.o tools.o \
-        progress_bar.o chrono.o \
+        progress_bar.o \
          jpeg_misc.o rgb_image.o rgb_image_subpixel.o param_parser.o \
          shared.o \
          storable.o \