3 files changed, 16 insertions, 33 deletions

diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile
index 68815fe8d8..0c0c31183d 100644
--- a/uisimulator/x11/Makefile
+++ b/uisimulator/x11/Makefile
@@ -43,8 +43,7 @@ CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) $(GCCOPTS)
 OUTFILE = $(OBJDIR)/libsim.a
 
 all: $(OUTFILE)
-        @echo "MAKE in common sim"
-        $(MAKE) -C $(SIMCOMMON)
+        @$(MAKE) -C $(SIMCOMMON)
 
 include $(TOOLSDIR)/make.inc
 
diff --git a/uisimulator/x11/kernel.h b/uisimulator/x11/kernel.h
deleted file mode 100644
index f165d92eb3..0000000000
--- a/uisimulator/x11/kernel.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.                  
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___  
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /  
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <   
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \  
- *                     \/            \/     \/    \/            \/ 
- * $Id$
- *
- * Copyright (C) 2002 by Daniel Stenberg <daniel@haxx.se>
- *
- * All files in this archive are subject to the GNU General Public License.
- * See the file COPYING in the source tree root for full license agreement.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-
-#include "../../firmware/export/kernel.h"
-
-#ifndef NO_REDEFINES_PLEASE
-
-#define sleep(x) sim_sleep(x)
-#define mutex_init(x) (void)x
-#define mutex_lock(x) (void)x
-#define mutex_unlock(x) (void)x
-
-#endif
-
-void sim_sleep(int);
diff --git a/uisimulator/x11/thread.c b/uisimulator/x11/thread.c
index e37373dc54..25adf6a3c0 100644
--- a/uisimulator/x11/thread.c
+++ b/uisimulator/x11/thread.c
@@ -94,3 +94,18 @@ void sim_sleep(int ticks)
 
     pthread_mutex_lock(&mp); /* get it again */
 }
+
+void mutex_init(struct mutex *m)
+{
+    (void)m;
+}
+
+void mutex_lock(struct mutex *m)
+{
+    (void)m;
+}
+
+void mutex_unlock(struct mutex *m)
+{
+    (void)m;
+}