X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_usr%2FMakefile;h=238458f8540f9089e57e7b732e3ebbb8364b680e;hb=f2a53228fe453dcc66700d9a48129d5fe4514816;hp=d8aae7c8af0f4a5d6d0c3827c5ac5ad4f9c53ef3;hpb=4a7e01a6d71dcfb0ecf19ca4271f195a654a94ca;p=palacios.git

diff --git a/linux_usr/Makefile b/linux_usr/Makefile
index d8aae7c..238458f 100644
--- a/linux_usr/Makefile
+++ b/linux_usr/Makefile
@@ -55,7 +55,9 @@ EXPERIMENTAL_EXECS = 	v3_simulate  \
                         v3_env_inject \
 			v3_syscall \
 			v3_register_gm \
-			v3_devfile_shadow
+			v3_devfile_shadow \
+
+NONDEFAULT_EXECS = v3_cons_tc  # needs to have termkey installed
 
 
 
@@ -99,8 +101,9 @@ libv3_io_chan.so: v3_io_chan.c v3_io_chan.h v3_user_host_dev.c v3_user_host_dev.
 	$(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
-	cp $@ /usr/lib64/
-	cp v3_io_chan.h /usr/include/
+	-echo "Attempting install into system paths"
+	-cp $@ /usr/lib64/
+	-cp v3_io_chan.h /usr/include/
 #
 # JSON library for use in some tools
 #
@@ -132,6 +135,10 @@ v3_cons: v3_cons.c
 v3_cons_sc: v3_cons_sc.c
 	$(CC) $(CFLAGS) $(CURSES_CFLAGS) $< $(CURSES_LIBS) -o $@
 
+v3_cons_tc: v3_cons_tc.c
+	$(CC) $(CFLAGS) $(CURSES_CFLAGS) $< $(CURSES_LIBS) -L. -ltermkey -lcurses -o $@
+
+
 v3_create: v3_create.c ezxml.c libv3_ctrl.a 
 	$(CC) $(CFLAGS) $^ -lv3_ctrl -L. -o $@
 
@@ -155,7 +162,7 @@ v3_os_debug : v3_os_debug.c libv3_user_host_dev.a
 # Guarded module registration for GEARS
 #
 v3_register_gm: v3_register_gm.c libjson.a libv3_ctrl.a v3_ctrl.h
-	$(CC) $(CFLAGS) $< -L. -lm -lv3_ctrl -ljson -o $@
+	$(CC) $(CFLAGS) $< -L. -lv3_ctrl -ljson -lm -o $@
 
 #
 # User keyed stream support includes a library and examples
@@ -220,7 +227,7 @@ libv3_fb.a : v3_fb.c v3_fb.h
 # VNC support is compiled separately
 #
 v3_x0vncserver : 
-	@if [ -a x0vncserver ] ; \
+	@if [ -e x0vncserver ] ; \
 	then \
 		cp x0vncserver v3_x0vncserver ; \
 	else \
@@ -233,7 +240,7 @@ v3_x0vncserver :
 # GUI is compiled separately
 #
 v3_x0gui : 
-	@if [ -a gui/Palacios ] ; \
+	@if [ -e gui/Palacios ] ; \
 	then \
 		cp gui/Palacios v3_x0gui ; \
 	else \