X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_usr%2FMakefile;h=e3142094c1e1ccb07a153622d412d8faecbfc967;hb=700ce14388ea852b7599b73b0d5a9f94fd873045;hp=5da0c44251790bf227df5a7802faeff5a5dec506;hpb=3711d0163d1dcba26b73a6427f3feefa8fc24733;p=palacios.git

diff --git a/linux_usr/Makefile b/linux_usr/Makefile
index 5da0c44..e314209 100644
--- a/linux_usr/Makefile
+++ b/linux_usr/Makefile
@@ -5,7 +5,7 @@
 
 # define this at the command-line or here
 # to get dynamically linked versions
-STATIC = 1
+STATIC = 0
 
 #
 # Executables that implement core functionality
@@ -30,6 +30,8 @@ BASE_EXECS = 	v3_mem \
 		v3_debug \
 		v3_send \
 		v3_receive \
+		v3_pci
+
 
 #
 # Examples
@@ -56,12 +58,12 @@ EXPERIMENTAL_EXECS = 	v3_simulate  \
 #
 PRECOMPILED_EXECS = x0vncserver
 
-COPIED_EXECS = v3_x0vncserver
+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)
@@ -81,11 +83,16 @@ 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 $@
 
 
 #
@@ -93,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 $@
 
 
 
@@ -139,9 +153,27 @@ v3_user_keyed_stream_file : v3_user_keyed_stream_file.c libv3_user_keyed_stream.
 #
 # VNC support is compiled separately
 #
-v3_x0vncserver : x0vncserver
-	cp x0vncserver v3_x0vncserver
-
+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