Memory manager fixes and assorted other fixes

[palacios.git] / linux_usr / Makefile

diff --git a/linux_usr/Makefile b/linux_usr/Makefile
index 4f03c2a..f586bb7 100644 (file)
--- a/linux_usr/Makefile
+++ b/linux_usr/Makefile
@@ -49,7 +49,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 +79,7 @@ endif
 
 CFLAGS += -I../linux_module
 
-CC = gcc
+CC = gcc -g
 AR = ar
 
 all: $(BUILD_EXECS) $(BUILD_LIBS) $(COPIED_EXECS)
@@ -90,6 +91,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 +140,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