X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_usr%2FMakefile;h=51fcc74ff7442d66f40321574b6c2dbef5f74958;hb=f2b335d52378f2df90738e450ceacca598e2178a;hp=4f03c2a71453a2312834557c218e015df1e56268;hpb=ed2f7f63a9563dcc28ccf3ca29cf4011fa67a343;p=palacios.git

diff --git a/linux_usr/Makefile b/linux_usr/Makefile
index 4f03c2a..51fcc74 100644
--- a/linux_usr/Makefile
+++ b/linux_usr/Makefile
@@ -11,7 +11,7 @@ STATIC = 0
 # Executables that implement core functionality
 #
 BASE_EXECS = 	v3_mem \
-                v3_mem_free \
+                v3_mem_reset \
 		v3_create \
                 v3_create_bind \
 		v3_free  \
@@ -20,6 +20,7 @@ BASE_EXECS = 	v3_mem \
 		v3_pause  \
 		v3_continue \
 		v3_core_move \
+                v3_mem_move \
 		v3_load \
 		v3_save \
 		v3_cons \
@@ -30,7 +31,8 @@ BASE_EXECS = 	v3_mem \
 		v3_debug \
 		v3_send \
 		v3_receive \
-		v3_pci
+		v3_pci \
+		v3_guest_mem_access
 
 
 #
@@ -40,7 +42,6 @@ EXAMPLE_EXECS = v3_user_host_dev_example \
 		v3_os_debug \
 		v3_user_keyed_stream_example \
 		v3_user_keyed_stream_file \
-		v3_guest_mem_example
 
 #
 # Currently experimental things
@@ -49,7 +50,8 @@ EXPERIMENTAL_EXECS = 	v3_simulate  \
 			v3_inject_ecc_scrubber_mce  \
                         v3_top_inject \
                         v3_env_inject \
-			v3_syscall
+			v3_syscall \
+			v3_register_gm
 
 
 
@@ -78,7 +80,7 @@ endif
 
 CFLAGS += -I../linux_module
 
-CC = gcc
+CC = gcc -g
 AR = ar
 
 all: $(BUILD_EXECS) $(BUILD_LIBS) $(COPIED_EXECS)
@@ -90,6 +92,13 @@ libv3_ctrl.a : v3_ctrl.c v3_ctrl.h
 	rm -rf v3_ctrl.o 
 
 #
+# JSON library for use in some tools
+#
+libjson.a : cJSON.c cJSON.h
+	$(CC) $(CFLAGS) -c cJSON.c
+	$(AR) ruv libjson.a cJSON.o
+	rm -rf cJSON.o
+#
 # Most tools compile in a straightforward way
 #
 % :: %.c v3_ctrl.h libv3_ctrl.a
@@ -132,6 +141,11 @@ v3_user_host_dev_example : v3_user_host_dev_example.c libv3_user_host_dev.a
 v3_os_debug : v3_os_debug.c libv3_user_host_dev.a
 	$(CC) $(CFLAGS) $< -I../linux_module -L. -lv3_user_host_dev -o $@
 
+#
+# Guarded module registration for GEARS
+#
+v3_register_gm: v3_register_gm.c libjson.a libv3_ctrl.a v3_ctrl.h
+	$(CC) $(CFLAGS) $< -L. -lm -lv3_ctrl -ljson -o $@
 
 #
 # User keyed stream support includes a library and examples
@@ -157,7 +171,7 @@ libv3_guest_mem.a : v3_guest_mem.c v3_guest_mem.h v3_ctrl.h
 	$(AR) ruv libv3_guest_mem.a v3_guest_mem.o
 	rm -f v3_guest_mem.o
 
-v3_guest_mem_example : v3_guest_mem_example.c libv3_guest_mem.a
+v3_guest_mem_access : v3_guest_mem_access.c libv3_guest_mem.a
 	$(CC) $(CFLAGS) $< -L. -lv3_guest_mem -o $@
 
 
@@ -181,7 +195,7 @@ v3_x0vncserver :
 	else \
 		echo "In order to use v3_vncclient/server you must have" ; \
 		echo "previously built or received palacios/linux_usr/x0vncserver" ; \
-    		echo "To learn more about this, look in palacios/linux_usr/vnc"; \
+		echo "To learn more about this, look in palacios/linux_usr/vnc"; \
 	fi;
 
 #