diff --git a/Box/Makefile b/Box/Makefile
index 6eb12432cd3a2012dee84aad833139913a6af4b9..edfaf8b4c41d7197e482936fd5e449051285b430 100644
--- a/Box/Makefile
+++ b/Box/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.43 2008-01-22 17:06:57 geuzaine Exp $
+# $Id: Makefile,v 1.44 2008-01-23 07:45:27 geuzaine Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -42,7 +42,7 @@ ${LIB}: ${OBJ} Main${OBJEXT}
 	${CXX} ${CFLAGS} ${DASH}c $<
 
 clean:
-	rm -f *${OBJEXT}
+	rm -f *.o *.obj
 
 depend:
 	(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/Common/Makefile b/Common/Makefile
index 929b9596749aa7cc2cd8697b3be3f09e74f7eeed..332a4a0e0a291ac423f1fdea0271c19e58b150af 100644
--- a/Common/Makefile
+++ b/Common/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.154 2008-01-22 17:06:57 geuzaine Exp $
+# $Id: Makefile,v 1.155 2008-01-23 07:45:27 geuzaine Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -51,7 +51,7 @@ ${LIB}: ${OBJ}
 	${CXX} ${CFLAGS} ${DASH}c $<
 
 clean:
-	rm -f *${OBJEXT}
+	rm -f *.o *.obj
 
 depend:
 	(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/DataStr/Makefile b/DataStr/Makefile
index 879ffed3574d7c03eb2e622cd20882e694f78c12..f66bec73d86fad63571e4653003dfd2d5d1d4c21 100644
--- a/DataStr/Makefile
+++ b/DataStr/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.42 2008-01-18 21:00:39 geuzaine Exp $
+# $Id: Makefile,v 1.43 2008-01-23 07:45:27 geuzaine Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -44,7 +44,7 @@ ${LIB}: ${OBJ}
 	${CXX} ${CFLAGS} ${DASH}c $<
 
 clean:
-	rm -f *${OBJEXT}
+	rm -f *.o *.obj
 
 depend:
 	(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/Fltk/Makefile b/Fltk/Makefile
index e3429946e8c9ee3327fa4b4828f9cea99c929dcc..1e8eb72ee24db86d77da18e2a1e65765f49c2500 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.166 2008-01-22 17:06:57 geuzaine Exp $
+# $Id: Makefile,v 1.167 2008-01-23 07:45:28 geuzaine Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -55,7 +55,7 @@ res:
 	windres Win32Icon.rc -O coff Win32Icon.res
 
 clean:
-	rm -f *${OBJEXT}
+	rm -f *.o *.obj
 
 depend:
 	(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/Geo/Makefile b/Geo/Makefile
index 76fd0efe47233e3ce4cedf165871c80cf13e484a..85b2654fcbf07368844ba7dafb1df9a10e33021e 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.179 2008-01-22 17:06:57 geuzaine Exp $
+# $Id: Makefile,v 1.180 2008-01-23 07:45:28 geuzaine Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -60,7 +60,7 @@ ${LIB}: ${OBJ}
 	${CXX} ${CFLAGS} ${DASH}c $<
 
 clean:
-	rm -f *${OBJEXT}
+	rm -f *.o *.obj
 
 depend:
 	(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/Graphics/Makefile b/Graphics/Makefile
index 93fda7f7f843947e4aacb95817cbf0b32d1ae9a4..67cf94aa99dc8be8fc6689f2d94bd1ff7752d03b 100644
--- a/Graphics/Makefile
+++ b/Graphics/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.136 2008-01-22 17:06:57 geuzaine Exp $
+# $Id: Makefile,v 1.137 2008-01-23 07:45:28 geuzaine Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -57,7 +57,7 @@ ${LIB}: ${OBJ}
 	${CXX} ${CFLAGS} ${DASH}c $<
 
 clean:
-	rm -f *${OBJEXT}
+	rm -f *.o *.obj
 
 depend:
 	(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/Mesh/Makefile b/Mesh/Makefile
index 4798c9726148246c3e97952e86e2b476da2aa1ff..8b01207b4c7175f2d6a427f8cc1443be7519c66d 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.197 2008-01-22 17:06:57 geuzaine Exp $
+# $Id: Makefile,v 1.198 2008-01-23 07:45:28 geuzaine Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -70,7 +70,7 @@ BDS.o:
 	${CXX} ${FLAGS} ${INCLUDE} ${SYSINCLUDE} ${DASH}c BDS.cpp
 
 clean:
-	rm -f *${OBJEXT}
+	rm -f *.o *.obj
 
 depend:
 	(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/Numeric/Makefile b/Numeric/Makefile
index 760187cfa0914683deba12361dea8f7455bd4cb8..a962d9817bab972480a608ff2edcb729b62c29e7 100644
--- a/Numeric/Makefile
+++ b/Numeric/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.44 2008-01-22 17:06:58 geuzaine Exp $
+# $Id: Makefile,v 1.45 2008-01-23 07:45:29 geuzaine Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -45,7 +45,7 @@ ${LIB}: ${OBJ}
 	${CXX} ${CFLAGS} ${DASH}c $<
 
 clean:
-	rm -f *${OBJEXT} 
+	rm -f *.o *.obj 
 
 depend:
 	(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/Parallel/Makefile b/Parallel/Makefile
index b84511a8ac0034bde066f76673c8be89b884d27d..6b7fc7d7019fd9cb059b878434c305f46f067e5a 100644
--- a/Parallel/Makefile
+++ b/Parallel/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.40 2008-01-19 22:06:04 geuzaine Exp $
+# $Id: Makefile,v 1.41 2008-01-23 07:45:29 geuzaine Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -39,7 +39,7 @@ ${LIB}: ${OBJ}
 	${CXX} ${CFLAGS} ${DASH}c $<
 
 clean:
-	rm -f *${OBJEXT}
+	rm -f *.o *.obj
 
 depend:
 	(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/Parser/Makefile b/Parser/Makefile
index 4d20ec2279c97e42c5066f2573b719432566888c..a5803fa209eae8b2b8913b357d7879adf10b511f 100644
--- a/Parser/Makefile
+++ b/Parser/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.137 2008-01-22 17:06:58 geuzaine Exp $
+# $Id: Makefile,v 1.138 2008-01-23 07:45:29 geuzaine Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -46,7 +46,7 @@ ${LIB}: ${OBJ}
 
 # Don't optimize Gmsh.tab.o: on many architectures, g++ -O2 generates
 # assembly code too large to be addressed correctly
-Gmsh.tab.o:
+Gmsh.tab${OBJEXT}:
 	${CXX} ${FLAGS} ${INCLUDE} ${SYSINCLUDE} ${DASH}c Gmsh.tab.cpp
 
 parser:
@@ -55,7 +55,7 @@ parser:
 	flex -P gmsh_yy -oGmsh.yy.cpp Gmsh.l
 
 clean:
-	rm -f *.o
+	rm -f *.o *.obj
 
 depend:
 	(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/Plugin/Makefile b/Plugin/Makefile
index e2da4399f1c285c623a1ca2b9c4373568ad6eac3..e54a91c423172b5c603c71fdd4ab355b2edeee37 100644
--- a/Plugin/Makefile
+++ b/Plugin/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.144 2008-01-22 20:45:27 geuzaine Exp $
+# $Id: Makefile,v 1.145 2008-01-23 07:45:29 geuzaine Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -60,7 +60,7 @@ ${LIB}: ${OBJ}
 	${CXX} ${CFLAGS} ${DASH}c $<
 
 clean:
-	rm -f *${OBJEXT} 
+	rm -f *.o *.obj 
 
 depend:
 	(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/Post/Makefile b/Post/Makefile
index 231f0d5df5ca5c1c2c671ced00e06739882e3a0f..29ea8e13c794307bb3b2e4a8396beae1715f2438 100644
--- a/Post/Makefile
+++ b/Post/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.25 2008-01-22 17:06:58 geuzaine Exp $
+# $Id: Makefile,v 1.26 2008-01-23 07:45:30 geuzaine Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -49,7 +49,7 @@ ${LIB}: ${OBJ}
 	${CXX} ${CFLAGS} ${DASH}c $<
 
 clean:
-	rm -f *${OBJEXT}
+	rm -f *.o *.obj
 
 depend:
 	(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/contrib/ANN/Makefile b/contrib/ANN/Makefile
index b1631606a60403113b228821b5049af351ef1499..9a27886948e51fae010aa901c9313564bdf47755 100644
--- a/contrib/ANN/Makefile
+++ b/contrib/ANN/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.18 2008-01-19 00:49:08 geuzaine Exp $
+# $Id: Makefile,v 1.19 2008-01-23 07:45:30 geuzaine Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -55,7 +55,7 @@ ${LIB}: ${OBJ}
         fi
 
 clean:
-	rm -f src/*${OBJEXT}
+	rm -f src/*.o src/*.obj
 
 depend:
 	(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/contrib/MathEval/Makefile b/contrib/MathEval/Makefile
index 72c3a57a6b1b53f1525b1f8d82ce769316480725..19ab30467cf709c3abbcd5e8db76897e68515e6f 100644
--- a/contrib/MathEval/Makefile
+++ b/contrib/MathEval/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.17 2008-01-19 00:12:38 geuzaine Exp $
+# $Id: Makefile,v 1.18 2008-01-23 07:45:30 geuzaine Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -50,7 +50,7 @@ parser:
 	flex -oscanner.yy.cpp -Pme scanner.l
 
 clean:
-	rm -f *${OBJEXT}
+	rm -f *.o *.obj
 
 depend:
 	(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/contrib/Metis/Makefile b/contrib/Metis/Makefile
index f228e0f886676eb84c7623b2bf67b31e8ec2d0cd..e0956844477a58b1d7fc095c46dc387d5b15724a 100644
--- a/contrib/Metis/Makefile
+++ b/contrib/Metis/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.13 2006-11-27 22:22:33 geuzaine Exp $
+# $Id: Makefile,v 1.14 2008-01-23 07:45:30 geuzaine Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -90,7 +90,7 @@ ${LIB}: ${OBJ}
 	${CC} ${CFLAGS} -c $< -o ${<:.c=.o}
 
 clean:
-	rm -f *.o
+	rm -f *.o *.obj
 
 depend:
 	(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/contrib/NR/Makefile b/contrib/NR/Makefile
index 515258aa1de45d63879597ce7f262dd58bb860ab..248d972600f8bf2d663e8d8b4446746300ed85e8 100644
--- a/contrib/NR/Makefile
+++ b/contrib/NR/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.8 2008-01-22 17:06:58 geuzaine Exp $
+# $Id: Makefile,v 1.9 2008-01-23 07:45:30 geuzaine Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -50,7 +50,7 @@ ${LIB}: ${OBJ}
 	${CXX} ${CFLAGS} ${DASH}c $<
 
 clean:
-	rm -f *${OBJEXT} 
+	rm -f *.o *.obj 
 
 depend:
 	(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/contrib/NativeFileChooser/Makefile b/contrib/NativeFileChooser/Makefile
index 515965067841508d604b13538b0560516fbb4dd2..e3bf4997a7277a82842f7684ef4320a4c4a41f5d 100644
--- a/contrib/NativeFileChooser/Makefile
+++ b/contrib/NativeFileChooser/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 2008-01-19 01:08:15 geuzaine Exp $
+# $Id: Makefile,v 1.4 2008-01-23 07:45:30 geuzaine Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -38,7 +38,7 @@ ${LIB}: ${OBJ}
 	${CXX} ${CFLAGS} ${DASH}c $<
 
 clean:
-	rm -f *${OBJEXT}
+	rm -f *.o *.obj
 
 depend:
 	(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/contrib/Netgen/Makefile b/contrib/Netgen/Makefile
index 6df1c5484ed62e15b872599f2cab3efb9d721f1d..a517f1aa800a5e7522565cdf077a9e1a10003a9a 100644
--- a/contrib/Netgen/Makefile
+++ b/contrib/Netgen/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.27 2008-01-22 20:44:36 geuzaine Exp $
+# $Id: Makefile,v 1.28 2008-01-23 07:45:30 geuzaine Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -145,7 +145,7 @@ nglib_addon${OBJEXT}:
 	${CXX} ${CFLAGS} ${DASH}c nglib_addon.cpp
 
 clean:
-	rm -f *${OBJEXT} libsrc/*/*${OBJEXT}
+	rm -f *.o *.obj libsrc/*/*.o libsrc/*/*.obj
 
 depend:
 	(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/contrib/Tetgen/Makefile b/contrib/Tetgen/Makefile
index fe0a24da5cc7b82f29bb53e1e9fadeded33fe4dd..2de7f1581e9ab2743e2c898996076687cb9d35ab 100644
--- a/contrib/Tetgen/Makefile
+++ b/contrib/Tetgen/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.8 2008-01-18 21:00:41 geuzaine Exp $
+# $Id: Makefile,v 1.9 2008-01-23 07:45:31 geuzaine Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -38,7 +38,7 @@ ${LIB}: ${OBJ}
 	${CXX} ${CFLAGS} ${DASH}c $<
 
 clean:
-	rm -f *${OBJEXT}
+	rm -f *.o *.obj
 
 depend:
 	(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/contrib/Triangle/Makefile b/contrib/Triangle/Makefile
index 6368135389744bb2aa239e9f08c4cf08b3e9e210..b32bb0dde1d338d65291ffb686313e23f541a4ba 100644
--- a/contrib/Triangle/Makefile
+++ b/contrib/Triangle/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.8 2008-01-19 00:14:19 geuzaine Exp $
+# $Id: Makefile,v 1.9 2008-01-23 07:45:31 geuzaine Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -41,7 +41,7 @@ ${LIB}: ${OBJ}
 	${CC} ${CFLAGS} ${DASH}c $<
 
 clean:
-	rm -f *${OBJEXT}
+	rm -f *.o *.obj
 
 depend:
 	(sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \
diff --git a/utils/embed/Makefile b/utils/embed/Makefile
index 77fc6019cb785744b3730833db2a3e5e6fdc4bfb..aac97eee7c4e9c0c29d1502444315171cde40d14 100644
--- a/utils/embed/Makefile
+++ b/utils/embed/Makefile
@@ -3,13 +3,9 @@ include ../../variables
 OBJEXT=.o
 LIBEXT=.a
 DASH=-
-OPTIM=-02
-FLAGS=
-SYSINCLUDE=
 
-
-LIB     = libGmsh${LIBEXT}
-INCLUDE = 
+LIB     = ../../lib/libGmshEmbedded${LIBEXT}
+INCLUDE = ${DASH}I.
 CFLAGS  = ${OPTIM} ${FLAGS} ${INCLUDE} ${SYSINCLUDE} ${DASH}DHAVE_GMSH_EMBEDDED
 
 SRC = GModel.cpp\
@@ -33,11 +29,11 @@ ${LIB}: ${OBJ}
 	${CXX} ${CFLAGS} ${DASH}c $<
 
 clean:
-	rm -f *${OBJEXT}
+	rm -f *.o *.obj
 
 distclean:
-	rm -f *${LIBEXT}
-	rm -f *${OBJEXT}
+	rm -f *.a *.lib
+	rm -f *.o *.obj
 	mkdir tmp
 	mv GmshEmbedded.* tmp
 	rm -f *.cpp *.h