Paranoid error checking in userspace utils

[palacios.git] / linux_usr / Makefile

diff --git a/linux_usr/Makefile b/linux_usr/Makefile
index 4f2aa2c..f459a1e 100644 (file)
--- a/linux_usr/Makefile
+++ b/linux_usr/Makefile
@@ -11,7 +11,9 @@ STATIC = 1
 # Executables that implement core functionality
 #
 BASE_EXECS =   v3_mem \
+                v3_mem_free \
                v3_create \
+                v3_create_bind \
                v3_free  \
                v3_launch \
                v3_stop   \
@@ -24,6 +26,8 @@ BASE_EXECS =  v3_mem \
                v3_cons_sc \
                v3_stream \
                v3_monitor \
+                v3_hypercall \
+               v3_debug
 
 #
 # Examples
@@ -31,20 +35,26 @@ BASE_EXECS =        v3_mem \
 EXAMPLE_EXECS = v3_user_host_dev_example \
                v3_os_debug \
                v3_user_keyed_stream_example \
-               v3_user_keyed_stream_file \
+               v3_user_keyed_stream_file 
 
 #
 # Currently experimental things
 #
 EXPERIMENTAL_EXECS =   v3_simulate  \
-                       v3_inject_ecc_scrubber_mce
+                       v3_inject_ecc_scrubber_mce  \
+                        v3_top_inject \
+                        v3_env_inject \
+                                               v3_syscall
+
+
+
 
 #
 # Things that have been built elsewhere - just for reference here
 #
 PRECOMPILED_EXECS = x0vncserver
 
-COPIED_EXECS = v3_vncserver
+COPIED_EXECS = v3_x0vncserver
 
 #
 # Libraries that we need to build
@@ -61,6 +71,8 @@ ifeq ($(STATIC),1)
   CFLAGS += -static 
 endif
 
+CFLAGS += -I../linux_module
+
 CC = gcc
 AR = ar
 
@@ -125,8 +137,8 @@ v3_user_keyed_stream_file : v3_user_keyed_stream_file.c libv3_user_keyed_stream.
 #
 # VNC support is compiled separately
 #
-v3_vncserver : x0vncserver
-       cp x0vncserver v3_vncserver
+v3_x0vncserver : x0vncserver
+       cp x0vncserver v3_x0vncserver
 
 
 #
@@ -138,4 +150,3 @@ clean:
 depend:
        $(CC) -MM $(CFILES) -I../linux_module > .dependencies
 
-include .dependencies