X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=folded-ctf.git;a=blobdiff_plain;f=Makefile;h=1b72d1ea5b6d337d9138b5bf44a4490de82506ab;hp=7fc33392393a82474f7cbec128f5d7ea2152a8c4;hb=HEAD;hpb=d922ad61d35e9a6996730bec24b16f8bf7bc426c

diff --git a/Makefile b/Makefile
index 7fc3339..1b72d1e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,28 @@
 
-#########################################################################
-# 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.			        #
-# 								        #
-# This program is distributed in the hope that it will be useful, but   #
-# 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.			        #
-# 								        #
-# 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			        #
-# Contact <francois.fleuret@idiap.ch> for comments & bug reports        #
-#########################################################################
-
-CXX=g++-4.1
+########################################################################
+#                                                                      #
+#  folded-ctf is an implementation of the folded hierarchy of	       #
+#  classifiers for object detection, developed by Francois Fleuret     #
+#  and Donald Geman.						       #
+#								       #
+#  Copyright (c) 2008 Idiap Research Institute, http://www.idiap.ch/   #
+#  Written by Francois Fleuret <francois.fleuret@idiap.ch>	       #
+#								       #
+#  This file is part of folded-ctf.				       #
+#								       #
+#  folded-ctf is free software: you can redistribute it and/or modify  #
+#  it under the terms of the GNU General Public License version 3 as   #
+#  published by the Free Software Foundation.                          #
+#								       #
+#  folded-ctf is distributed in the hope that it will be useful, but   #
+#  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.			       #
+#								       #
+#  You should have received a copy of the GNU General Public License   #
+#  along with folded-ctf.  If not, see <http://www.gnu.org/licenses/>. #
+#								       #
+########################################################################
 
 ifeq ($(STATIC),yes)
   LDFLAGS=-static -lm -ljpeg -lpng -lz
@@ -36,18 +42,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 \
@@ -81,7 +82,7 @@ Makefile.depend: *.h *.cc Makefile
 	$(CC) -M *.cc > Makefile.depend
 
 archive:
-	cd .. && tar zcvf folding-gpl.tgz folding/*.{cc,h,sh,txt} folding/Makefile folding/gpl-3.0.txt
+	cd .. && tar zcvf folding-gpl.tgz folding/{*.{cc,h,sh,txt},Makefile}
 
 clean:
 	\rm -f folding list_to_pool *.o Makefile.depend TAGS