diff --git a/Fltk/MacRes.r b/Fltk/MacRes.r
deleted file mode 100644
index 3d71f2ebbf6d90817e31cf4bc663eaa42f231a12..0000000000000000000000000000000000000000
--- a/Fltk/MacRes.r
+++ /dev/null
@@ -1,13 +0,0 @@
-data 'MBAR' (128) {
-	$"0001 0080"                                          /* ...€ */
-};
-
-data 'MENU' (128, "Apple") {
-	$"0080 0000 0000 0000 0000 FFFF FFFB 0114"            /* .€........ÿÿÿû.. */
-	$"0A41 626F 7574 2046 4C54 4B00 0000 0001"            /* ÂAbout FLTK..... */
-	$"2D00 0000 0000"                                     /* -..... */
-};
-
-data 'carb' (0) {
-};
-
diff --git a/Fltk/Makefile b/Fltk/Makefile
index de33c969f93a561b4467f29ba53b46a325df8922..4e279c1ad625e65e09513b5ff356398bea28a3e5 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.156 2008-01-18 20:13:12 geuzaine Exp $
+# $Id: Makefile,v 1.157 2008-01-19 01:08:15 geuzaine Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -21,11 +21,12 @@
 
 include ../variables
 
-LIB     = ../lib/libGmshFltk.a
-INCLUDE = -I../Common -I../DataStr -I../Graphics -I../Geo -I../Mesh -I../Post\
-          -I../Numeric -I../Parser -I../Fltk -I../Plugin -I../utils/solvers\
-          -I../contrib/ANN/include -I../contrib/NativeFileChooser
-CFLAGS  = ${OPTIM} ${FLAGS} ${INCLUDE}
+LIB     = ../lib/libGmshFltk${LIBEXT}
+INCLUDE = ${DASH}I../Common ${DASH}I../DataStr ${DASH}I../Graphics\
+          ${DASH}I../Geo ${DASH}I../Mesh ${DASH}I../Post ${DASH}I../Numeric\
+          ${DASH}I../Parser ${DASH}I../Fltk ${DASH}I../Plugin ${DASH}I../utils/solvers\
+          ${DASH}I../contrib/ANN/include ${DASH}I../contrib/NativeFileChooser
+CFLAGS  = ${OPTIM} ${FLAGS} ${INCLUDE} ${SYSINCLUDE}
 
 SRC = Main.cpp \
       Message.cpp \
@@ -39,23 +40,22 @@ SRC = Main.cpp \
       Colorbar_Window.cpp\
       Solvers.cpp
 
+OBJ = ${SRC:.cpp=${OBJEXT}}
 
-OBJ = ${SRC:.cpp=.o}
-
-.SUFFIXES: .o .cpp
+.SUFFIXES: ${OBJEXT} .cpp
 
 ${LIB}: ${OBJ} 
-	${AR} ${LIB} ${OBJ} 
+	${AR} ${ARFLAGS}${LIB} ${OBJ} 
 	${RANLIB} ${LIB}
 
 .cpp.o:
-	${CXX} ${CFLAGS} -c $<
+	${CXX} ${CFLAGS} ${DASH}c $<
 
 res:
 	windres Win32Icon.rc -O coff Win32Icon.res
 
 clean:
-	rm -f *.o
+	rm -f *${OBJEXT}
 
 depend:
 	(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/Graphics/Makefile b/Graphics/Makefile
index 3e41c23e6b245a021bc3aec71268e37263500822..3784ad1174f9f412e216d7ba246f919080214630 100644
--- a/Graphics/Makefile
+++ b/Graphics/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.130 2007-09-22 20:35:18 geuzaine Exp $
+# $Id: Makefile,v 1.131 2008-01-19 01:08:15 geuzaine Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -21,11 +21,12 @@
 
 include ../variables
 
-LIB     = ../lib/libGmshGraphics.a
-INCLUDE = -I../Common -I../DataStr -I../Geo -I../Mesh -I../Post\
-          -I../Graphics -I../Fltk -I../Numeric -I../Parser -I../Plugin\
-          -I../contrib/MathEval -I../contrib/ANN/include
-CFLAGS  = ${OPTIM} ${FLAGS} ${INCLUDE}
+LIB     = ../lib/libGmshGraphics${LIBEXT}
+INCLUDE = ${DASH}I../Common ${DASH}I../DataStr ${DASH}I../Geo ${DASH}I../Mesh\
+          ${DASH}I../Post ${DASH}I../Graphics ${DASH}I../Fltk ${DASH}I../Numeric\
+          ${DASH}I../Parser ${DASH}I../Plugin ${DASH}I../contrib/MathEval\
+          ${DASH}I../contrib/ANN/include
+CFLAGS  = ${OPTIM} ${FLAGS} ${INCLUDE} ${SYSINCLUDE}
 
 SRC = Draw.cpp \
       Mesh.cpp \
@@ -44,19 +45,19 @@ SRC = Draw.cpp \
       gl2ppm.cpp\
       gl2yuv.cpp
 
-OBJ = ${SRC:.cpp=.o}
+OBJ = ${SRC:.cpp=${OBJEXT}}
 
-.SUFFIXES: .o .cpp
+.SUFFIXES: ${OBJEXT} .cpp
 
 ${LIB}: ${OBJ} 
-	${AR} ${LIB} ${OBJ} 
+	${AR} ${ARFLAGS}${LIB} ${OBJ} 
 	${RANLIB} ${LIB}
 
 .cpp.o:
-	${CXX} ${CFLAGS} -c $<
+	${CXX} ${CFLAGS} ${DASH}c $<
 
 clean:
-	rm -f *.o
+	rm -f *${OBJEXT}
 
 depend:
 	(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/contrib/NativeFileChooser/Makefile b/contrib/NativeFileChooser/Makefile
index 4ba070e5b06d6fc6898896156a44d9600703c074..515965067841508d604b13538b0560516fbb4dd2 100644
--- a/contrib/NativeFileChooser/Makefile
+++ b/contrib/NativeFileChooser/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 2008-01-18 20:13:13 geuzaine Exp $
+# $Id: Makefile,v 1.3 2008-01-19 01:08:15 geuzaine Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -21,24 +21,24 @@
 
 include ../../variables
 
-LIB     = ../../lib/libGmshNativeFileChooser.a
-INCLUDE = -I.
-CFLAGS  = ${OPTIM} ${FLAGS} ${INCLUDE} -DFLTK1
+LIB     = ../../lib/libGmshNativeFileChooser${LIBEXT}
+INCLUDE = ${DASH}I.
+CFLAGS  = ${OPTIM} ${FLAGS} ${INCLUDE} ${SYSINCLUDE} ${DASH}DFLTK1
 
 SRC = Fl_Native_File_Chooser.cxx
-OBJ = ${SRC:.cxx=.o}
+OBJ = ${SRC:.cxx=${OBJEXT}}
 
-.SUFFIXES: .o .cxx
+.SUFFIXES: ${OBJEXT} .cxx
 
 ${LIB}: ${OBJ} 
-	${AR} ${LIB} ${OBJ} 
+	${AR} ${ARFLAGS}${LIB} ${OBJ} 
 	${RANLIB} ${LIB}
 
 .cxx.o:
-	${CXX} ${CFLAGS} -c $<
+	${CXX} ${CFLAGS} ${DASH}c $<
 
 clean:
-	rm -f *.o
+	rm -f *${OBJEXT}
 
 depend:
 	(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \