X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_usr%2FMakefile;h=e3142094c1e1ccb07a153622d412d8faecbfc967;hb=a47bf8387bc195230e95edb4b0c9ffb81e50ac9f;hp=4f2aa2c38ac5d4fee6f3733e67f4d07ea74af49b;hpb=569796250aabb415e296cb2b71afbb9cda512f69;p=palacios.git

diff --git a/linux_usr/Makefile b/linux_usr/Makefile
index 4f2aa2c..e314209 100644
--- a/linux_usr/Makefile
+++ b/linux_usr/Makefile
@@ -5,13 +5,15 @@
 
 # define this at the command-line or here
 # to get dynamically linked versions
-STATIC = 1
+STATIC = 0
 
 #
 # 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,12 @@ BASE_EXECS = 	v3_mem \
 		v3_cons_sc \
 		v3_stream \
 		v3_monitor \
+                v3_hypercall \
+		v3_debug \
+		v3_send \
+		v3_receive \
+		v3_pci
+
 
 #
 # Examples
@@ -31,25 +39,31 @@ 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 v3_x0gui
 
 #
 # Libraries that we need to build
 #
-LIBS = libv3_user_host_dev.a libv3_user_keyed_stream.a
+LIBS = libv3_user_host_dev.a libv3_user_keyed_stream.a libv3_ctrl.a
 
 BUILD_EXECS = $(BASE_EXECS) $(EXAMPLE_EXECS) $(EXPERIMENTAL_EXECS) 
 BUILD_LIBS = $(LIBS)
@@ -61,17 +75,24 @@ ifeq ($(STATIC),1)
   CFLAGS += -static 
 endif
 
+CFLAGS += -I../linux_module
+
 CC = gcc
 AR = ar
 
 all: $(BUILD_EXECS) $(BUILD_LIBS) $(COPIED_EXECS)
 
 
+libv3_ctrl.a : v3_ctrl.c v3_ctrl.h
+	$(CC) $(CFLAGS) -I../linux_module -c v3_ctrl.c
+	$(AR) ruv libv3_ctrl.a v3_ctrl.o
+	rm -rf v3_ctrl.o 
+
 #
 # Most tools compile in a straightforward way
 #
-% :: %.c v3_ctrl.h
-	$(CC) $(CFLAGS) $< -o $@
+% :: %.c v3_ctrl.h libv3_ctrl.a
+	$(CC) $(CFLAGS) $< -lv3_ctrl -L. -o $@
 
 
 #
@@ -79,13 +100,20 @@ all: $(BUILD_EXECS) $(BUILD_LIBS) $(COPIED_EXECS)
 #
 ifeq ($(STATIC),1)
   CURSES_CFLAGS = -DNCURSES_STATIC
+  CURSES_LIBS = -lcurses                           
+else
+  CURSES_CFLAGS = 
+  CURSES_LIBS = -lcurses 
 endif
 
 v3_cons: v3_cons.c
-	$(CC) $(CFLAGS) $(CURSES_CFLAGS) $< -lcurses -o $@
+	$(CC) $(CFLAGS) $(CURSES_CFLAGS) $< $(CURSES_LIBS) -o $@
 
 v3_cons_sc: v3_cons_sc.c
-	$(CC) $(CFLAGS) $(CURSES_CFLAGS) $< -lcurses -o $@
+	$(CC) $(CFLAGS) $(CURSES_CFLAGS) $< $(CURSES_LIBS) -o $@
+
+v3_create: v3_create.c ezxml.c libv3_ctrl.a 
+	$(CC) $(CFLAGS) $^ -lv3_ctrl -L. -o $@
 
 
 
@@ -125,9 +153,27 @@ 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 : 
+	@if [ -a x0vncserver ] ; \
+	then \
+		cp x0vncserver v3_x0vncserver ; \
+	else \
+		echo "In order to use v3_vncclient/server you must have" ; \
+		echo "previously built or received palacios/linux_usr/x0vncserver" ; \
+	fi;
 
+#
+# GUI is compiled separately
+#
+v3_x0gui : 
+	@if [ -a gui/Palacios ] ; \
+	then \
+		cp gui/Palacios v3_x0gui ; \
+	else \
+		echo "In order to use v3_gui (the graphical interface)" ;\
+		echo "you must first cd to palacios/linux_usr/gui" ;\
+		echo "and compile it according to the README given there";\
+	fi;
 
 #
 # Cleanup and dependency builds are automated
@@ -138,4 +184,3 @@ clean:
 depend:
 	$(CC) -MM $(CFILES) -I../linux_module > .dependencies
 
-include .dependencies