X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_usr%2FMakefile;h=e3142094c1e1ccb07a153622d412d8faecbfc967;hb=a47bf8387bc195230e95edb4b0c9ffb81e50ac9f;hp=868d0d703cb5eae91a1ca0343a28f0180c8800ee;hpb=3f777ee2e04c359758b0658b04ff8f076d38f2f9;p=palacios.git

diff --git a/linux_usr/Makefile b/linux_usr/Makefile
index 868d0d7..e314209 100644
--- a/linux_usr/Makefile
+++ b/linux_usr/Makefile
@@ -12,6 +12,7 @@ STATIC = 0
 #
 BASE_EXECS = 	v3_mem \
                 v3_mem_free \
+		v3_create \
                 v3_create_bind \
 		v3_free  \
 	  	v3_launch \
@@ -57,7 +58,7 @@ EXPERIMENTAL_EXECS = 	v3_simulate  \
 #
 PRECOMPILED_EXECS = x0vncserver
 
-COPIED_EXECS = v3_x0vncserver
+COPIED_EXECS = v3_x0vncserver v3_x0gui
 
 #
 # Libraries that we need to build
@@ -99,14 +100,17 @@ libv3_ctrl.a : v3_ctrl.c v3_ctrl.h
 #
 ifeq ($(STATIC),1)
   CURSES_CFLAGS = -DNCURSES_STATIC
-  CURSES_LIBS = -ltermcap
+  CURSES_LIBS = -lcurses                           
+else
+  CURSES_CFLAGS = 
+  CURSES_LIBS = -lcurses 
 endif
 
 v3_cons: v3_cons.c
-	$(CC) $(CFLAGS) $(CURSES_CFLAGS) $< -lcurses $(CURSES_LIBS) -o $@
+	$(CC) $(CFLAGS) $(CURSES_CFLAGS) $< $(CURSES_LIBS) -o $@
 
 v3_cons_sc: v3_cons_sc.c
-	$(CC) $(CFLAGS) $(CURSES_CFLAGS) $< -lcurses $(CURSES_LIBS) -o $@
+	$(CC) $(CFLAGS) $(CURSES_CFLAGS) $< $(CURSES_LIBS) -o $@
 
 v3_create: v3_create.c ezxml.c libv3_ctrl.a 
 	$(CC) $(CFLAGS) $^ -lv3_ctrl -L. -o $@
@@ -149,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