X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_usr%2FMakefile;h=c0d5034d859a1db63742ce4331baba94e295edcd;hb=68f8c4cd303c5da40c1083cbabdaf6395e4dbaa1;hp=5bdf9068820ce8c47282fa33cde8e036abf1f5f1;hpb=0b342d28c860e4b3911b529f5363d35faa86aa25;p=palacios.git

diff --git a/linux_usr/Makefile b/linux_usr/Makefile
index 5bdf906..c0d5034 100644
--- a/linux_usr/Makefile
+++ b/linux_usr/Makefile
@@ -1,52 +1,254 @@
-all: v3_ctrl v3_stop v3_cons v3_mem v3_monitor v3_stream v3_user_host_dev_example v3_os_debug v3_user_keyed_stream_example v3_user_keyed_stream_file v3_core_move v3_save v3_load
-
-
-
-v3_ctrl : v3_ctrl.c v3_pause.c v3_continue.c v3_launch.c v3_stop.c v3_create.c v3_free.c
-	gcc -static v3_launch.c -o v3_launch
-	gcc -static v3_stop.c -o v3_stop 
-	gcc -static v3_pause.c -o v3_pause
-	gcc -static v3_continue.c -o v3_continue
-	gcc -static v3_create.c -o v3_create
-	gcc -static v3_free.c -o v3_free
-
-
-v3_save : v3_save.c v3_ctrl.h
-	gcc -static v3_save.c -o v3_save 
-v3_load : v3_load.c v3_ctrl.h
-	gcc -static v3_load.c -o v3_load 
-
-v3_mem : v3_mem.c v3_ctrl.h
-	gcc -static v3_mem.c -o v3_mem 
-
-v3_cons : v3_cons.c v3_cons_sc.c v3_ctrl.h
-	gcc  -static v3_cons.c -o v3_cons -lcurses
-	gcc  -static v3_cons_sc.c -o v3_cons_sc -lcurses
-
-v3_stream : v3_stream.c v3_ctrl.h
-	gcc -static v3_stream.c -o v3_stream 
-
-v3_monitor : v3_cons.c v3_ctrl.h
-	gcc -static v3_monitor.c -o v3_monitor
-
-v3_user_host_dev_example: v3_user_host_dev_example.c v3_user_host_dev.h v3_user_host_dev.c
-	gcc -static -I../linux_module v3_user_host_dev_example.c v3_user_host_dev.c -o v3_user_host_dev_example
-
-v3_os_debug: v3_os_debug.c v3_user_host_dev.h v3_user_host_dev.c
-	gcc -static -I../linux_module v3_os_debug.c v3_user_host_dev.c -o v3_os_debug
-
-v3_user_keyed_stream_example: v3_user_keyed_stream_example.c v3_user_keyed_stream.h v3_user_keyed_stream.c
-	gcc -static -I../linux_module v3_user_keyed_stream_example.c v3_user_keyed_stream.c -o v3_user_keyed_stream_example
-
-
-v3_user_keyed_stream_file: v3_user_keyed_stream_file.c v3_user_keyed_stream.h v3_user_keyed_stream.c
-	gcc -static -I../linux_module v3_user_keyed_stream_file.c v3_user_keyed_stream.c -o v3_user_keyed_stream_file
-
-v3_core_move : v3_core_move.c v3_ctrl.h
-	gcc -static v3_core_move.c -o v3_core_move
+#
+# Build Static or Dynamic versions of the control utilities
+#
+#
+
+# define this at the command-line or here
+# to get dynamically linked versions
+STATIC = 0
+
+#
+# Executables that implement core functionality
+#
+BASE_EXECS = 	v3_mem \
+                v3_mem_reset \
+		v3_create \
+                v3_create_bind \
+		v3_free  \
+	  	v3_launch \
+	        v3_reset  \
+		v3_stop   \
+		v3_pause  \
+		v3_continue \
+		v3_core_move \
+                v3_mem_move \
+		v3_load \
+		v3_save \
+		v3_cons \
+		v3_cons_sc \
+		v3_stream \
+		v3_monitor \
+                v3_hypercall \
+		v3_debug \
+		v3_send \
+		v3_receive \
+		v3_pci \
+		v3_guest_mem_access \
+		v3_guest_mem_track \
+                v3_dvfs
+
+
+#
+# Examples
+#
+EXAMPLE_EXECS = v3_user_host_dev_example \
+		v3_os_debug \
+		v3_user_keyed_stream_example \
+		v3_user_keyed_stream_file \
+
+#
+# Currently experimental things
+#
+EXPERIMENTAL_EXECS = 	v3_simulate  \
+			v3_inject_ecc_scrubber_mce  \
+                        v3_top_inject \
+                        v3_env_inject \
+			v3_syscall \
+			v3_register_gm \
+			v3_devfile_shadow
+
+
+
+
+#
+# Things that have been built elsewhere - just for reference here
+#
+PRECOMPILED_EXECS = x0vncserver
+
+COPIED_EXECS = v3_x0vncserver v3_x0gui
+
+#
+# Libraries that we need to build
+#
+LIBS = libv3_user_host_dev.a libv3_user_keyed_stream.a libv3_ctrl.a libv3_guest_mem.a libv3_fb.a libv3_user_dvfs.a libv3_io_chan.so
+
+BUILD_EXECS = $(BASE_EXECS) $(EXAMPLE_EXECS) $(EXPERIMENTAL_EXECS) 
+BUILD_LIBS = $(LIBS)
+
+
+CFILES = $(BUILD_EXECS:%=%.c) $(BUILD_LIBS:lib%.a=%.c) 
+
+ifeq ($(STATIC),1)
+  CFLAGS += -static 
+endif
+
+CFLAGS += -I../linux_module -I../palacios/include/
+
+CC = gcc -g
+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 
+
+libv3_io_chan.so: v3_io_chan.c v3_io_chan.h v3_user_host_dev.c v3_user_host_dev.h ../linux_module/iface-host-dev.h 
+	$(CC) $(CFLAGS) -I../linux_module -fPIC -c v3_io_chan.c
+	$(CC) $(CFLAGS) -I../linux_module -fPIC -c v3_user_host_dev.c
+	$(CC) -shared -o $@ v3_io_chan.o v3_user_host_dev.o
+	-echo "Attempting install into system paths"
+	-cp $@ /usr/lib64/
+	-cp v3_io_chan.h /usr/include/
+#
+# 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
+	$(CC) $(CFLAGS) $< -lv3_ctrl -L. -o $@
+
+
+#
+# Console support requires curses
+#
+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) $< $(CURSES_LIBS) -o $@
+
+v3_cons_sc: v3_cons_sc.c
+	$(CC) $(CFLAGS) $(CURSES_CFLAGS) $< $(CURSES_LIBS) -o $@
+
+v3_create: v3_create.c ezxml.c libv3_ctrl.a 
+	$(CC) $(CFLAGS) $^ -lv3_ctrl -L. -o $@
+
+
+
+#
+# User host devices include a library and some examples
+#
+libv3_user_host_dev.a : v3_user_host_dev.c v3_user_host_dev.h v3_ctrl.h
+	$(CC) $(CFLAGS) -I../linux_module -c v3_user_host_dev.c 
+	$(AR) ruv libv3_user_host_dev.a v3_user_host_dev.o
+	rm -f v3_user_host_dev.o
+
+v3_user_host_dev_example : v3_user_host_dev_example.c libv3_user_host_dev.a
+	$(CC) $(CFLAGS) $< -I../linux_module -L. -lv3_user_host_dev -o $@
+
+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. -lv3_ctrl -ljson -lm -o $@
+
+#
+# User keyed stream support includes a library and examples
+#
+#
+libv3_user_keyed_stream.a :: v3_user_keyed_stream.c v3_user_keyed_stream.h v3_ctrl.h
+	$(CC) $(CFLAGS) -I../linux_module -c v3_user_keyed_stream.c 
+	$(AR) ruv libv3_user_keyed_stream.a v3_user_keyed_stream.o
+	rm -f v3_user_keyed_stream.o
+
+
+v3_user_keyed_stream_example : v3_user_keyed_stream_example.c libv3_user_keyed_stream.a
+	$(CC) $(CFLAGS) $< -I../linux_module -L. -lv3_user_keyed_stream -o $@
+
+v3_user_keyed_stream_file : v3_user_keyed_stream_file.c libv3_user_keyed_stream.a
+	$(CC) $(CFLAGS) $< -I../linux_module -L. -lv3_user_keyed_stream -o $@
+
+
+# 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_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 $@
+
+
+# Use this for shadow process
+v3_devfile_shadow : v3_devfile_shadow.c libv3_guest_mem.a libv3_ctrl.a
+	$(CC) $(CFLAGS) $< -L. -lv3_guest_mem -lv3_ctrl -o $@
+
+#
+# User DVFS control includse a library and a caller
+#
+libv3_user_dvfs.a : v3_user_dvfs.c v3_user_dvfs.h v3_ctrl.h
+	$(CC) $(CFLAGS) -I../linux_module -c v3_user_dvfs.c 
+	$(AR) ruv libv3_user_dvfs.a v3_user_dvfs.o
+	rm -f v3_user_dvfs.o
+
+v3_dvfs : v3_dvfs.c libv3_user_dvfs.a libv3_ctrl.a
+	$(CC) $(CFLAGS) $< -I../linux_module -L. -lv3_user_dvfs -lv3_ctrl -o $@
+
+
+#
+# FB (Graphics Console) user interface library (needed for VNC access
+#  to GC - also wraps mouse and keyboard event delivery)
+libv3_fb.a : v3_fb.c v3_fb.h
+	$(CC) $(CFLAGS) -I../linux_module -c v3_fb.c
+	$(AR) ruv libv3_fb.a v3_fb.o
+	rm -rf v3_fb.o 
+
+
+
+#
+# VNC support is compiled separately
+#
+v3_x0vncserver : 
+	@if [ -e 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" ; \
+		echo "To learn more about this, look in palacios/linux_usr/vnc"; \
+	fi;
+
+#
+# GUI is compiled separately
+#
+v3_x0gui : 
+	@if [ -e 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
+#
+clean:
+	rm -f $(BUILD_EXECS) $(BUILD_LIBS) $(COPIED_EXECS)
 
-v3_inject_ecc_scrubber_mce: v3_inject_ecc_scrubber_mce.c
-	gcc -static -I../linux_module v3_inject_ecc_scrubber_mce.c -o v3_inject_ecc_scrubber_mce
+depend:
+	$(CC) -MM $(CFILES) -I../linux_module > .dependencies
 
-clean:
-	rm -f v3_ctrl v3_cons v3_mem v3_monitor v3_stream v3_user_host_dev_example v3_os_debug v3_user_keyed_stream_example v3_user_keyed_stream_file v3_core_migrate