--- Makefile.orig Fri Oct 24 20:08:49 2003 +++ Makefile Mon Jun 5 22:52:13 2006 @@ -95,7 +95,7 @@ PLATFORM_LIBS := -L${QTROOT}/lib -lqt CPP := g++ WARN := -W -Wall - LINK := ${CPP} -o ${EXE} + LINK := ${CPP} -ltiff -o ${EXE} OUT1 := -o OUT2 := ${shell echo " "} RM := rm @@ -110,20 +110,18 @@ ############################################################################### LIBFRACTAL := lib/fractal/libfractal_${MODE}.a -LIBTIFF := lib/tiff/libtiff_${MODE}.a LIBPERSIST := lib/persist/libpersist_${MODE}.a FRACT_LIBS := ${LIBFRACTAL} ${LIBTIFF} ${LIBPERSIST} LIBS := ${FRACT_LIBS} ${PLATFORM_LIBS} -BUILD_LIBS := build_libfractal build_libtiff build_libpersist +BUILD_LIBS := build_libfractal build_libpersist OUT := ${OUT1}${OUT2} MOC := ${QTROOT}/bin/moc INCLUDE := -I${QTROOT}/include \ -Ilib/fractal \ - -Ilib/tiff \ -Ilib/persist \ -Iicons \ ${PLATFORM_INCLUDE} @@ -142,7 +140,8 @@ fractalsplitter_${MODE}.o \ map_${MODE}.o \ qinfiniteloopcallback_${MODE}.o \ - findreplacedialog_${MODE}.o + findreplacedialog_${MODE}.o \ + TiffWriter.o OBJECTS_MOC := moc_application_${MODE}.o \ moc_help_${MODE}.o \ @@ -163,9 +162,6 @@ build_libfractal: ${MAKE} -C lib/fractal "RELEASE=${RELEASE}" -build_libtiff: - ${MAKE} -C lib/tiff "RELEASE=${RELEASE}" - build_libpersist: ${MAKE} -C lib/persist "RELEASE=${RELEASE}" @@ -184,7 +180,6 @@ realclean: ${MAKE} clean ${MAKE} -C lib/fractal clean - ${MAKE} -C lib/tiff clean ${MAKE} -C lib/persist clean ############################################################################### @@ -228,7 +223,7 @@ lib/fractal/ColorEnvironment.h lib/fractal/ComplexVariables.h \ lib/fractal/dcomplex.h lib/fractal/DoubleVariables.h \ lib/fractal/ColorTable.h lib/fractal/rowsupplier.h \ - lib/tiff/TiffWriter.h lib/fractal/fractal_parse.h state.h \ + lib/fractal/fractal_parse.h state.h \ zoomoutdialog.h zoomindialog.h zoominsettings.h antialiasdialog.h \ fractalsplitter.h map.h qinfiniteloopcallback.h \ lib/fractal/InfiniteLoopCallback.h findreplacedialog.h help.h version.h \