X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_usr%2FMakefile;h=f1aaacaf13b96f7e1443d78becc8a886b9f58fa5;hb=fd288e4dc51177f037f4752861eb95971fb1d1a0;hp=cf5649c0f4183e7e3c9174d67ed6b9e5bca2801e;hpb=2377d33e71ba625a547b414916949181db2a49da;p=palacios.git

diff --git a/linux_usr/Makefile b/linux_usr/Makefile
index cf5649c..f1aaaca 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,9 @@ BASE_EXECS = 	v3_mem \
 		v3_debug \
 		v3_send \
 		v3_receive \
-		v3_pci
+		v3_pci \
+		v3_guest_mem_access \
+		v3_guest_mem_track
 
 
 #
@@ -40,7 +43,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
@@ -77,9 +79,9 @@ ifeq ($(STATIC),1)
   CFLAGS += -static 
 endif
 
-CFLAGS += -I../linux_module
+CFLAGS += -I../linux_module -I../palacios/include/
 
-CC = gcc
+CC = gcc -g
 AR = ar
 
 all: $(BUILD_EXECS) $(BUILD_LIBS) $(COPIED_EXECS)
@@ -163,15 +165,20 @@ v3_user_keyed_stream_file : v3_user_keyed_stream_file.c libv3_user_keyed_stream.
 	$(CC) $(CFLAGS) $< -I../linux_module -L. -lv3_user_keyed_stream -o $@
 
 
-# guest memory access by mmap and example
+# guest memory access by mmap 
+# guest memory reference tracking via mem_track interface
+# examples
 #
 libv3_guest_mem.a : v3_guest_mem.c v3_guest_mem.h v3_ctrl.h
 	$(CC) $(CFLAGS) -c v3_guest_mem.c 
 	$(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
-	$(CC) $(CFLAGS) $< -L. -lv3_guest_mem -o $@
+v3_guest_mem_access : v3_guest_mem_access.c libv3_guest_mem.a libv3_ctrl.a
+	$(CC) $(CFLAGS) $< -L. -lv3_guest_mem -lv3_ctrl -o $@
+
+v3_guest_mem_track : v3_guest_mem_track.c libv3_guest_mem.a libv3_ctrl.a
+	$(CC) $(CFLAGS) $< -L. -lv3_guest_mem -lv3_ctrl -o $@
 
 
 #
@@ -194,7 +201,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;
 
 #