--- Makefile.unvedit.old	2010-10-08 11:39:09.000000000 +0200
+++ Makefile.unvedit	2010-10-08 11:42:48.000000000 +0200
@@ -1,5 +1,5 @@
 ALL_SRC_DIRS=unvedit
 all install clean:
 	@for subdir in $(ALL_SRC_DIRS); do				\
-	  make -C $$subdir -f Makefile $@; 				\
+	  $(MAKE) -C $$subdir -f Makefile $@; 				\
 	done
--- unvedit/makefile_append.ini.old	2010-10-08 11:53:21.000000000 +0200
+++ unvedit/makefile_append.ini	2010-10-08 11:54:43.000000000 +0200
@@ -14,7 +14,7 @@
 OBJ_CPP = $(SRC_CPP:.cpp=.o)
 .cpp.o:
 	@echo "Compiling module $*.o"
-	@+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
+	+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
 
 # Programs
 LS      = ls
@@ -29,8 +29,8 @@
 	@echo "Compiling resources"
 
 modules: $(OBJ_C) $(OBJ_CPP)
-	@echo -n "Linking modules..."
-	@$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS)
+	@echo "Linking modules..."
+	$(CPP) $(LDFLAGS) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS)
 	@echo -n "   "
 	@-$(LS) $(LSFLAGS) $(BIN)
 
--- Makefile.monitor.old	2010-10-08 12:25:11.000000000 +0200
+++ Makefile.monitor	2010-10-08 12:25:25.000000000 +0200
@@ -1,5 +1,5 @@
 ALL_SRC_DIRS=monitor
 all install clean:
 	@for subdir in $(ALL_SRC_DIRS); do				\
-	  make -C $$subdir -f Makefile $@; 				\
+	  $(MAKE) -C $$subdir -f Makefile $@; 				\
 	done
--- monitor/makefile_append.ini.old	2010-10-08 12:26:24.000000000 +0200
+++ monitor/makefile_append.ini	2010-10-08 12:26:56.000000000 +0200
@@ -14,7 +14,7 @@
 OBJ_CPP = $(SRC_CPP:.cpp=.o)
 .cpp.o:
 	@echo "Compiling module $*.o"
-	@+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
+	+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
 
 # Programs
 LS      = ls
@@ -29,8 +29,8 @@
 	@echo "Compiling resources"
 
 modules: $(OBJ_C) $(OBJ_CPP)
-	@echo -n "Linking modules..."
-	@$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS)
+	@echo "Linking modules..."
+	$(CPP) $(LDFLAGS) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS)
 	@echo -n "   "
 	@-$(LS) $(LSFLAGS) $(BIN)
 
--- client/makefile_append.ini.old	2010-10-08 12:37:44.000000000 +0200
+++ client/makefile_append.ini	2010-10-08 12:38:08.000000000 +0200
@@ -14,7 +14,7 @@
 OBJ_CPP = $(SRC_CPP:.cpp=.o)
 .cpp.o:
 	@echo "Compiling module $*.o"
-	@+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
+	+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
 
 # Programs
 LS      = ls
@@ -29,8 +29,8 @@
 	@echo "Compiling resources"
 
 modules: $(OBJ_C) $(OBJ_CPP)
-	@echo -n "Linking modules..."
-	@$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS)
+	@echo n "Linking modules..."
+	$(CPP) $(LDFLAGS) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS)
 	@echo -n "   "
 	@-$(LS) $(LSFLAGS) $(BIN)
 
--- Makefile.client.old	2010-10-08 12:37:19.000000000 +0200
+++ Makefile.client	2010-10-08 12:37:31.000000000 +0200
@@ -1,5 +1,5 @@
 ALL_SRC_DIRS=client
 all install clean:
 	@for subdir in $(ALL_SRC_DIRS); do				\
-	  make -C $$subdir -f Makefile $@; 				\
+	  $(MAKE) -C $$subdir -f Makefile $@; 				\
 	done