Cleanup and gcc44 patch added, thanks Joel Berendzen

(Portage version: 2.2_rc98/git/Linux x86_64, signed Manifest commit with key 70EB7916)

8 files changed, 243 insertions, 77 deletions

diff --git a/sci-chemistry/drawxtl/ChangeLog b/sci-chemistry/drawxtl/ChangeLog
index a121b1b20..add22d96d 100644
--- a/sci-chemistry/drawxtl/ChangeLog
+++ b/sci-chemistry/drawxtl/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Oct 2010; Justin Lecher <jlec@gentoo.org> +files/44-gentoo.patch,
+  drawxtl-44.ebuild, -files/44-ldflags.patch, drawxtl-54.ebuild,
+  +files/54-gcc44.patch, +files/54-gentoo.patch:
+  Cleanup and gcc44 patch added, thanks Joel Berendzen 
+
   19 Sep 2010; Justin Lecher <jlec@gentoo.org> drawxtl-44.ebuild,
   drawxtl-54.ebuild:
   virtual/glut -> media-libs/freeglut & virtual/glu -> virtual/opengl
diff --git a/sci-chemistry/drawxtl/Manifest b/sci-chemistry/drawxtl/Manifest
index 11ae4d473..22f956b02 100644
--- a/sci-chemistry/drawxtl/Manifest
+++ b/sci-chemistry/drawxtl/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 44-ldflags.patch 350 RMD160 67c404091e090aff9e797a1116d03885b42e2acf SHA1 eae05bc3a195dcf6692724ece2df2d474f35ca1c SHA256 46c60b3caa98092e3c0e4e83eaf62dfcac6665f2041e35154a94b0c04993b223
+AUX 44-gentoo.patch 3695 RMD160 2459a3a857fbff6f06788acb998c4323652602e3 SHA1 8428317685837fe2c7bcee5422de3251c24b4b26 SHA256 56da6f7c5eda19f6bcd44bafbd96732a8c9d07f8bb759eaf4b7c7cbeda34277f
+AUX 54-gcc44.patch 629 RMD160 b664fb4d07159ee2cee76e16000ee7179d5e39c3 SHA1 8c4ffd3497cc88777ab08e8790563445c0e70ddd SHA256 5003aa8709153e558f13919ce7e8ab13e6c6e52fda4bd91b30815e761b01fcd8
+AUX 54-gentoo.patch 2152 RMD160 44c0765007f49fa6f55aaec7e3c384432f63a905 SHA1 3a3e554fb39f393901ccb539769b9fce76389cd5 SHA256 e521fe335315167ea0e1052097c18faa3e03332933ea22393879ac03180e7975
 AUX 54-ldflags.patch 371 RMD160 554457b44f872d95e0d1378b46d3473ccae76ba2 SHA1 2c53ee48e6bcebad97cc00ef284d752af2f521ca SHA256 53cadce7b423b77e348123d1229a693402b8b84d10f0120e4c0b73e620514cab
 DIST DRAWxtl44.tar.gz 4214313 RMD160 c4a4dbc14eb67b9f28768715eadd62b96d7e494d SHA1 f9e235ff044f01fed8146321f562eb833b78c824 SHA256 6fc92098290bcf319f8b3002d017d83d052e276693d012d84c75e3c0ff319c92
 DIST DRAWxtl54.tar.gz 4284006 RMD160 78b8b0241a492964355c808959eb6e4a8b03339c SHA1 476c7950ca901d13b20058c71bb86fa5d7be8fa2 SHA256 6bf11e7a0aff0a32daef54b9d90f6ffe88ba3b1a61ff2f9f8aa1dfc85b2660d6
-EBUILD drawxtl-44.ebuild 2356 RMD160 a486c3fcf8acd7521bd8181d0c1f7506c4d5b9dd SHA1 6ea69293b78ec292cba3684e155905115d10cd57 SHA256 d726adbd08919e50b9395fb88de3bc2761efb7bb631314774d0f1b8db1b53214
-EBUILD drawxtl-54.ebuild 2326 RMD160 fad2e11be62fc304797fdebe21643dbaf66f488e SHA1 ec6f8ae7c9b2d35d2fc3675bb41188014bc61fd3 SHA256 9dee8ea3c815569d3747c0419dc3ee88a3ced2818c1f4ea0491c6719bccc557c
-MISC ChangeLog 1047 RMD160 a2cba8e46e02c75816da89c068b56a10e9338a96 SHA1 851f62692f8c9f4bd8aad94bf4d83a948eef5568 SHA256 6ebdd107b20f61900631bdbf0cf8410df7f1373b38d3d65d7c0f2eaed53f4d16
+EBUILD drawxtl-44.ebuild 1808 RMD160 79bc3cadad31fa415534ad595eabcac136e8e630 SHA1 e966ce7c6f735deb2e1701e49a01090e40e2e0f2 SHA256 8189cbbae66696ca8ce477dd27f239b988fe26ea80d50e3236f96deb256b7acd
+EBUILD drawxtl-54.ebuild 1334 RMD160 c4b320dfbd46f598630bb01cc0346a4391f52f68 SHA1 73d000c67826929df4bb704fd85579fef63a81c0 SHA256 f7cf732e427f75c8094796eda1cd5f179311441637e820788915e9ab92d4ef01
+MISC ChangeLog 1289 RMD160 f286fa5f09cd5a4bca631e56a096bbb1d97b3a42 SHA1 5ef9c47ba999db45099ae626bbc7f05d462aaa65 SHA256 82ceb14687d4d96dd43917d6583105b09197e830afba4633e4a28b46655344f2
 MISC metadata.xml 291 RMD160 eb898254774c5f27ec3b0f0df56cb7508a31b7ab SHA1 e6420a9b34a51c05fb1de16eb1bd6a9a1ae0b11d SHA256 1d90c251ab305064c4e065c2e1d38f4e5e565a6a33dc3dcaa9540704f862a764
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyV4r0ACgkQgAnW8HDreRbz6wCgqebenzR7dobB9pisbNxwJ8bL
-c/0AnRR53iJS8HAIKSQCcqYY4Gg91DmP
-=M6vT
+iEYEARECAAYFAky9QfwACgkQgAnW8HDreRaXrQCfdMuAfWzkLHyrSVhjMRqdK6Y6
+QUsAoLQ075brRFAMaK2wy9egobHByJKr
+=HyRx
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/drawxtl/drawxtl-44.ebuild b/sci-chemistry/drawxtl/drawxtl-44.ebuild
index 456661ffa..e02bbcea3 100644
--- a/sci-chemistry/drawxtl/drawxtl-44.ebuild
+++ b/sci-chemistry/drawxtl/drawxtl-44.ebuild
@@ -9,7 +9,7 @@ inherit toolchain-funcs base
 MY_PN="DRAWxtl"
 MY_P=${MY_PN}${PV}
 
-DESCRIPTION="This software can be used to produce crystal structure drawings from structural data"
+DESCRIPTION="Crystal structure drawings from structural data"
 HOMEPAGE="http://www.lwfinger.net/drawxtl/"
 SRC_URI="http://www.lwfinger.com/drawxtl/${MY_P}.tar.gz"
 
@@ -28,50 +28,31 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${MY_PN}"
 
 PATCHES=(
-	"${FILESDIR}"/${PV}-ldflags.patch
+	"${FILESDIR}"/${PV}-gentoo.patch
 	)
 
 src_prepare() {
 	base_src_prepare
 	cd "${S}"/source
-	sed \
-		-e 's:-g::g' \
-		-e 's:-O2:${CFLAGS} `fltk-config --cxxflags`:g' \
-		-e 's:-lfltk\b:`fltk-config --ldflags`:g' \
-		-e 's:-lXinerama::g' \
-		-e 's:^.SILENT::' \
-		-i DRAWshell${PV}/Makefile || die "sed failed"
-	sed \
-		-e 's:-g -O :${CFLAGS} :g' \
-		-e 's:/usr/local/include:/usr/include:g' \
-		-e 's:/usr/local/lib:/usr/lib:g' \
-		-e 's:^.SILENT::' \
-		-i ${MY_P}/Makefile || die "sed failed"
-
 	if ! use opengl; then
 		sed -i -e 's:define OPENGL 1:undef OPENGL:' ${MY_P}/drawxtl.h || die "sed failed"
 		sed -i -e 's:$(GLUTlopt)::g' ${MY_P}/Makefile || die "sed failed"
 	fi
+
+	tc-export CC
+	tc-export CXX
 }
 
 src_compile() {
 	# that missing exe dir is required by the Makefile
 	mkdir exe || die "mkdir failed"
 	cd source/${MY_P}
-	make clean || die
-	emake \
-		CXX=$(tc-getCXX) \
-		CC=$(tc-getCC) \
-		LINKopt="${LDFLAGS}" \
-		|| die "Build of ${MY_PN} failed"
+	emake clean || die
+	emake || die "Build of ${MY_PN} failed"
 
 	if use fltk; then
 		cd "${S}"/source/DRAWshell${PV}
-		emake \
-		CXX=$(tc-getCXX) \
-		CC=$(tc-getCC) \
-		LINKopt="${LDFLAGS}" \
-		|| die "Build of DRAWshell failed"
+		emake || die "Build of DRAWshell failed"
 	fi
 }
 
diff --git a/sci-chemistry/drawxtl/drawxtl-54.ebuild b/sci-chemistry/drawxtl/drawxtl-54.ebuild
index 3b7086c36..56e2854b8 100644
--- a/sci-chemistry/drawxtl/drawxtl-54.ebuild
+++ b/sci-chemistry/drawxtl/drawxtl-54.ebuild
@@ -9,7 +9,7 @@ inherit toolchain-funcs base
 MY_PN="DRAWxtl"
 MY_P=${MY_PN}${PV}
 
-DESCRIPTION="This software can be used to produce crystal structure drawings from structural data"
+DESCRIPTION="Crystal structure drawings from structural data"
 HOMEPAGE="http://www.lwfinger.net/drawxtl/"
 SRC_URI="http://www.lwfinger.com/drawxtl/${MY_P}.tar.gz"
 
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
 DEPEND="virtual/opengl
-	media-libs/freeglut
+	>=media-libs/freeglut-2.6
 	virtual/opengl
 	x11-libs/fltk:1.1[opengl]"
 RDEPEND="${DEPEND}"
@@ -27,28 +27,14 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${MY_PN}"
 
 PATCHES=(
-	"${FILESDIR}"/${PV}-ldflags.patch
+	"${FILESDIR}"/${PV}-gentoo.patch
+	"${FILESDIR}"/${PV}-gcc44.patch
 	)
-
-src_prepare() {
-	base_src_prepare
-	sed  \
-		-e 's:-g:${CFLAGS} `fltk-config --cxxflags`:' \
-		-e 's:-lXinerama::g' \
-		-e '52c\LINKFLTKGL=`fltk-config --ldflags` -lfltk_gl' \
-		-e 's:^.SILENT::' \
-		-i source/${MY_P}/Makefile || die "sed failed"
-	# the build system uses -DFREEGLUT24 if freeglut-2.4 is present. We will warn about that in pgk_postinst
-	# see comment there
-	if ! has_version "=media-libs/freeglut-2.4*"; then
-		sed -i -e "s:-DFREEGLUT24::g"  source/${MY_P}/Makefile || die "sed failed"
-	fi
-}
-
 src_compile() {
 	cd source/${MY_P}
 	emake \
 		CXX=$(tc-getCXX) \
+		CXXFLAGS="${CXXFLAGS}" \
 		|| die "Build of ${MY_PN} failed"
 }
 
@@ -66,17 +52,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	# DRAWxtl works around some bug in freeglut-2.4. Unless we have more information, which versions are
-	# affected, I would like to keep it like this.
-	# A patch for DRAWxtl to add a runtime-check could be considered later.
-	if has_version "=media-libs/freeglut-2.4*"; then
-		elog "${MY_P} was build for beeing used with freeglut-2.4"
-		elog "If you change to a different glut, you should rebuild ${MY_P}"
-	else
-		elog "If you change your glut library to freeglut-2.4, you will have to rebuild ${MY_P}"
-	fi
-		einfo "If you use DRAWxtl for your publications you can cite it as:"
-		einfo " Larry W. Finger, Martin Kroeker, and Brian H. Toby (2007):"
-		einfo " DRAWxtl, an open-source computer program to produce crystal-structure drawings"
-		einfo " J. Appl. Crystallogr. 40, 188-192"
+	einfo "If you use DRAWxtl for your publications you can cite it as:"
+	einfo " Larry W. Finger, Martin Kroeker, and Brian H. Toby (2007):"
+	einfo " DRAWxtl, an open-source computer program to produce crystal-structure drawings"
+	einfo " J. Appl. Crystallogr. 40, 188-192"
 }
diff --git a/sci-chemistry/drawxtl/files/44-gentoo.patch b/sci-chemistry/drawxtl/files/44-gentoo.patch
new file mode 100644
index 000000000..ca9801309
--- /dev/null
+++ b/sci-chemistry/drawxtl/files/44-gentoo.patch
@@ -0,0 +1,128 @@
+diff --git a/source/DRAWshell44/Makefile b/source/DRAWshell44/Makefile
+index 2ab54d1..4e4e4ed 100644
+--- a/source/DRAWshell44/Makefile
++++ b/source/DRAWshell44/Makefile
+@@ -31,15 +31,15 @@ ifeq ($(OS),Linux)
+   libdir          = /lib
+ 
+ # compiler name:
+-  CXX             = g++
++  CXX             ?= g++
+ 
+ # flags for C++ compiler:
+-  OPTIM           = -g -O2 -Wall -Wunused  -fno-exceptions
+-  CXXFLAGS        = $(OPTIM)  -I/usr/X11R6/include
++  OPTIM  = $(CFLAGS) `fltk-config --cxxflags`
++  CXXOPT = $(CXXFLAGS)  -I/usr/X11R6/include
+ 
+ # libraries to link with:
+-  GLDLIBS  =  -L/usr/X11R6/lib  -lglut -lGLU -lGL -lXinerama -lXft -lpthread -lm  -lXext -lX11 -lXpm
+-  LINKFLTKGL  = -L$(libdir) -lfltk_gl -lfltk
++  GLDLIBS  =  -L/usr/X11R6/lib  -lglut -lGLU -lGL -lXft -lpthread -lm  -lXext -lX11 -lXpm
++  LINKFLTKGL  = -L$(libdir) `fltk-config --ldflags`
+ 
+ # The extension to use for executables...
+   EXEEXT          =
+@@ -142,8 +142,6 @@ ifeq ($(OPTIM),error)
+   GLDLIBS=-lfltk_gl -lfltk -lglut -lGLU -lGL
+ endif
+ 
+-# Be quiet when building...
+-.SILENT:
+ 
+ # Build commands and filename extensions...
+ .SUFFIXES:	.rc .cxx .h .o $(EXEEXT)
+@@ -172,7 +170,7 @@ draw_shell.o: draw_shell.cxx draw_shell.h DRAWxtl.xpm
+ 
+ $(TARGET) : $(OBJFILES) 
+ 	echo Linking $@...
+-	$(CXX) $(CXXFLAGS) -o $@ $(OBJFILES) \
++	$(CXX) $(LDFLAGS) $(CXXFLAGS) -o $@ $(OBJFILES) \
+ 		$(LINKFLTKGL) $(GLDLIBS) 
+ 	$(POSTLINK) $@
+ 
+diff --git a/source/DRAWxtl44/Makefile b/source/DRAWxtl44/Makefile
+index 02a6f73..51721a3 100644
+--- a/source/DRAWxtl44/Makefile
++++ b/source/DRAWxtl44/Makefile
+@@ -23,21 +23,21 @@ EXEEXT =
+ ifeq ($(OS),Linux)
+ 
+   # compiler name
+-  CC  = gcc
+-  CXX = g++
++  CC  ?= gcc
++  CXX ?= g++
+ 
+ # flags for C++ compiler:
+-  OPTIM  = -g -O  -Wunused  -fno-exceptions -Wall
+-  CXXOPT = $(OPTIM)  -I/usr/X11R6/include
++  OPTIM  = $(CFLAGS)
++  CXXOPT = $(CXXFLAGS)  -I/usr/X11R6/include
+ 
+   GLUTlib2 =
+ 
+   # multiplatform gcc options
+-  CCOPT = $(OPTIM) -c -Wuninitialized -Wreturn-type -Wmissing-prototypes -Wstrict-prototypes $(GLUTcopt)
++  CCOPT = $(OPTIM) -c $(GLUTcopt)
+ 
+   # standard Linux GLut locations:
+ 
+-  GLUTinclude = /usr/local/include
++  GLUTinclude = /usr/include
+   GLUTlib = /usr/local/lib
+   GLUTcopt = -I$(GLUTinclude)
+   GLUTlib1 = -L$(GLUTlib) -lglut -lGLU -lGL -ldl -lm -L/usr/X11R6/lib -lX11 -lm -lXi
+@@ -53,7 +53,7 @@ ifeq ($(OS),CYGWIN)
+ # section to define the various symbols needed to build DRAWxtl for cygwin running on Windows
+ 
+   prefix          = /usr/
+-  includedir      = 
++  includedir      = /usr/include
+   libdir          = 
+ 
+ # compiler name:
+@@ -156,8 +156,6 @@ ifeq ($(OPTIM),error)
+   GLDLIBS = -lglut -lGLU -lGL
+ endif
+ 
+-# Be quiet when building...
+-.SILENT:
+ 
+ # Build commands and filename extensions...
+ .SUFFIXES:	.rc .cxx .c .h .o $(EXEEXT)
+@@ -168,7 +166,7 @@ endif
+ 
+ .cxx.o:
+ 	echo Compiling $<...
+-	$(CXX) -I$(includedir) $(CXXOPT) -c $<
++	$(CXX) $(CXXOPT) -c $<
+ 
+ .c.o:
+ 	echo Compiling $<...
+@@ -207,8 +205,8 @@ clean:
+ .deps:  $(CXXFILES) $(CCFILES)
+ 	echo "Building dependencies..."
+ 	echo >.deps
+-	for i in $(CXXFILES); do gcc -MM $$i >>.deps; done
+-	for i in $(CCFILES); do gcc -MM $$i >>.deps; done
++	for i in $(CXXFILES); do $(CXX) -MM $$i >>.deps; done
++	for i in $(CCFILES); do $(CC) -MM $$i >>.deps; done
+ 
+ -include .deps
+ 
+@@ -216,12 +214,12 @@ clean:
+ 
+ $(TARGET) : $(OBJFILES) .deps
+ 	echo Linking $@...
+-	$(CXX) $(LINKopt) -o $@ $(OBJFILES) $(GLUTlopt) 
++	$(CXX) $(LDFLAGS) -o $@ $(OBJFILES) $(GLUTlopt) 
+ 	$(POSTLINK) $@
+ 
+ static: $(OBJFILES) .deps
+ 	echo Linking $@_s ...
+-	$(CXX) $(LINKopt) -static -o $@_s $(OBJFILES) \
++	$(CXX) $(LDFLAGS) -static -o $@_s $(OBJFILES) \
+ 		$(GLUTsopt) -lXxf86vm -ldl
+ 	strip $@_s
+ 
diff --git a/sci-chemistry/drawxtl/files/44-ldflags.patch b/sci-chemistry/drawxtl/files/44-ldflags.patch
deleted file mode 100644
index 8b25c6696..000000000
--- a/sci-chemistry/drawxtl/files/44-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/DRAWshell44/Makefile	2009-07-08 22:04:07.000000000 +0200
-+++ source/DRAWshell44/Makefile.new	2009-07-08 22:05:10.000000000 +0200
-@@ -172,7 +172,7 @@
- 
- $(TARGET) : $(OBJFILES) 
- 	echo Linking $@...
--	$(CXX) $(CXXFLAGS) -o $@ $(OBJFILES) \
-+	$(CXX) $(LDFLAGS) $(CXXFLAGS) -o $@ $(OBJFILES) \
- 		$(LINKFLTKGL) $(GLDLIBS) 
- 	$(POSTLINK) $@
- 
diff --git a/sci-chemistry/drawxtl/files/54-gcc44.patch b/sci-chemistry/drawxtl/files/54-gcc44.patch
new file mode 100644
index 000000000..d5f428282
--- /dev/null
+++ b/sci-chemistry/drawxtl/files/54-gcc44.patch
@@ -0,0 +1,11 @@
+-- source/DRAWxtl54/CrystalView.cxx.orig	2010-01-05 11:10:54.000000000 -0700
++++ source/DRAWxtl54/CrystalView.cxx	2010-01-05 11:11:07.000000000 -0700
+@@ -995,7 +995,7 @@
+             if (strlen(newfile) > 80) {
+ // remove path component from filename if the full name plus import instruction 
+ // would exceed our maximum input line length of 100 bytes
+-                char *start = strrchr(newfile,'/');
++                const char *start = strrchr(newfile,'/');
+                 if (!start) {
+                     start = strrchr(newfile,'\\');   // look for the other Windows folder marker
+                     if (!start) {
diff --git a/sci-chemistry/drawxtl/files/54-gentoo.patch b/sci-chemistry/drawxtl/files/54-gentoo.patch
new file mode 100644
index 000000000..144bd6ace
--- /dev/null
+++ b/sci-chemistry/drawxtl/files/54-gentoo.patch
@@ -0,0 +1,73 @@
+diff --git a/source/DRAWxtl54/Makefile b/source/DRAWxtl54/Makefile
+index c6eea1e..d541630 100644
+--- a/source/DRAWxtl54/Makefile
++++ b/source/DRAWxtl54/Makefile
+@@ -37,19 +37,18 @@ ifeq ($(OS),Linux)
+   endif
+ 
+ # compiler name:
+-  CXX             = g++
++  CXX             ?= g++
+ 
+ # flags for C++ compiler:
+-  OPTIM           = -g -Wall -Wunused  -fno-exceptions
+ # work around a bug in freeglut 2.4 - comment this line if using a different GLut
+-  GLUT		  = -DFREEGLUT24
+-  CXXFLAGS        = $(OPTIM)  -I/usr/X11R6/include $(GLUT)
++  GLUT		  = -DFREEGLUT26
++ FLTKFLAGS        = -I/usr/X11R6/include $(GLUT) `fltk-config --cxxflags`
+ 
+ # libraries to link with:
+-  GLDLIBS  =  -L/usr/X11R6/lib  -lglut -lGLU -lGL -lXinerama -lXft -lpthread -lm  -lXext -lX11  -lXpm \
++  GLDLIBS  =  -L/usr/X11R6/lib  -lglut -lGLU -lGL -lXft -lpthread -lm  -lXext -lX11  -lXpm
+ 
+ #       -lXi -lgdkglext-x11-1.0a  # Fedora Core 2 needs these libraries
+-  LINKFLTKGL  = $(libdir)libfltk.a $(libdir)libfltk_gl.a
++  LINKFLTKGL  = `fltk-config --ldflags` -lfltk_gl
+ 
+ # The extension to use for executables...
+   EXEEXT          =
+@@ -148,16 +147,6 @@ endif
+ #
+ ##################################################################################
+ 
+-ifeq ($(OPTIM),error)
+-  OPTIM=-O
+-  CXX=cc
+-  CXXFLAGS=$(OPTIM)
+-  GLDLIBS=-lfltk_gl -lfltk -lglut -lGLU -lGL
+-endif
+-
+-# Be quiet when building...
+-.SILENT:
+-
+ # Build commands and filename extensions...
+ .SUFFIXES:	.rc .cxx .h .o $(EXEEXT)
+ 
+@@ -167,7 +156,7 @@ endif
+ 
+ .cxx.o:
+ 	echo Compiling $< ...
+-	$(CXX) -I$(includedir) $(CXXFLAGS) -c $<
++	$(CXX) $(CXXFLAGS) $(FLTKFLAGS) -c $<
+ 
+ CPPFILES =\
+ 	CrystalView.cxx \
+@@ -208,7 +197,7 @@ clean:
+ .deps:  $(CPPFILES)
+ 	echo "Building dependencies..."
+ 	echo >.deps
+-	for i in $(CPPFILES); do gcc -MM $(PREINC) $$i >>.deps; done
++	for i in $(CPPFILES); do $(CXX) -MM $(PREINC) $$i >>.deps; done
+ 
+ -include .deps
+ 
+@@ -217,7 +206,7 @@ clean:
+ $(TARGET) : .deps $(OBJFILES) 
+ 	echo Linking $@...
+ 	mkdir -p ../../exe
+-	$(CXX) $(CXXFLAGS) -o $@ $(OBJFILES) \
++	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(FLTKFLAGS) -o $@ $(OBJFILES) \
+ 		$(LINKFLTKGL) $(GLDLIBS) 
+ 	$(POSTLINK) $@
+