diff -urN src/Makefile src-new/Makefile
--- src/Makefile	2007-03-30 07:06:54.000000000 -0500
+++ src-new/Makefile	2007-06-23 23:53:28.000000000 -0500
@@ -8,7 +8,7 @@
 
 # Define the CImg files to be compiled (name of the source file without the .cpp extension)
 CIMG_FILES = greycstoration \
-	     greycstoration4integration \
+	     #greycstoration4integration \
 
 # Set correct variables and paths
 CC       = g++
@@ -36,19 +36,19 @@
 CIMG_XRANDR_FLAGS = -Dcimg_use_xrandr -lXrandr
 
 # Uncomment to enable native support for PNG image files, using the PNG library.
-#CIMG_PNG_FLAGS = -Dcimg_use_png -lpng -lz
+CIMG_PNG_FLAGS = -Dcimg_use_png -lpng -lz
 
 # Uncomment to enable native support for JPEG image files, using the JPEG library.
-#CIMG_JPEG_FLAGS = -Dcimg_use_jpeg -ljpeg
+CIMG_JPEG_FLAGS = -Dcimg_use_jpeg -ljpeg
 
 # Uncomment to enable native support for TIFF image files, using the TIFF library.
-#CIMG_TIFF_FLAGS = -Dcimg_use_tiff -ltiff
+CIMG_TIFF_FLAGS = -Dcimg_use_tiff -ltiff
 
 # Uncomment to enable native support of most classical image file formats, using the Magick++ library.
 #CIMG_MAGICK_FLAGS = -Dcimg_use_magick `Magick++-config --cppflags` `Magick++-config --cxxflags` `Magick++-config --ldflags` `Magick++-config --libs`
 
 # Uncomment to enable faster Discrete Fourier Transform computation, using the FFTW3 library
-#CIMG_FFTW3_FLAGS = -Dcimg_use_fftw3 -lfftw3
+CIMG_FFTW3_FLAGS = -Dcimg_use_fftw3 -lfftw3 -I$(FFTW3_I) -L$(FFTW3_L)
 
 EXTRA_FLAGS = $(CIMG_X11_FLAGS) $(CIMG_STRICT_FLAGS) $(CIMG_XSHM_FLAGS) $(CIMG_XRANDR_FLAGS) $(CIMG_PNG_FLAGS) $(CIMG_JPEG_FLAGS) $(CIMG_TIFF_FLAGS) $(CIMG_MAGICK_FLAGS) $(CIMG_FFTW3_FLAGS)
 
@@ -82,7 +82,7 @@
 	@echo "Choose your option :"
 	@read CHOICE; echo; make $$CHOICE; echo; echo "> Next time, you can bypass the menu by typing directly 'make $$CHOICE'"; echo;
 
-all: $(CIMG_FILES) gimp
+all: $(CIMG_FILES) #gimp
 
 clean:
 	rm -f greycstoration4gimp *.exe *~ $(CIMG_FILES)
@@ -92,7 +92,7 @@
 	@echo
 	@echo "** Compiling 'greycstoration4gimp ($(CIMG_VERSION))' with '`$(CC) -v 2>&1 | grep version`'"
 	@echo
-	$(CC) -o greycstoration4gimp greycstoration4gimp.cpp `gimptool-2.0 --cflags` `gimptool-2.0 --libs` -lpthread -O3
+	$(CC) -o greycstoration4gimp greycstoration4gimp.cpp `gimptool-2.0 --cflags` `gimptool-2.0 --libs` -lpthread -Os
 	strip greycstoration4gimp
 # Linux/Mac OSX targets
 linux:
@@ -100,7 +100,7 @@
 dlinux:
 	make "ARCHFLAGS=-Dcimg_debug=2 -g $(EXTRA_FLAGS)" all
 olinux:
-	make "ARCHFLAGS=-O3 $(EXTRA_FLAGS)" all
+	make "ARCHFLAGS=-Os $(EXTRA_FLAGS)" all
 
 # Sun Solaris targets
 solaris:
@@ -108,7 +108,7 @@
 dsolaris:
 	make "ARCHFLAGS=-Dcimg_debug=2 -g -R$(X11PATH)/lib -lrt -lnsl -lsocket $(EXTRA_FLAGS)" all
 osolaris:
-	make "ARCHFLAGS=-O3 -R$(X11PATH)/lib -lrt -lnsl -lsocket $(EXTRA_FLAGS)" all
+	make "ARCHFLAGS=-Os -R$(X11PATH)/lib -lrt -lnsl -lsocket $(EXTRA_FLAGS)" all
 
 # targets with minimal dependancies
 minimal:
@@ -116,4 +116,4 @@
 dminimal:
 	make "ARCHFLAGS=-Dcimg_display_type=0 -Dcimg_debug=2 -g" all
 ominimal:
-	make "ARCHFLAGS=-Dcimg_display_type=0 -O3" all
+	make "ARCHFLAGS=-Dcimg_display_type=0 -Os" all