summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@tycho.nsa.gov>2011-05-24 17:33:00 -0400
committerEamon Walsh <ewalsh@tycho.nsa.gov>2011-05-24 17:33:00 -0400
commit31e470b7e56b329a4293b2db983666913b2af092 (patch)
tree1c28c6399db992aca4603de69621f77cff660978
parent07ed9a3f076e1ca7723f3e57b45a785eb4a5cf11 (diff)
More renames, in preparation for new monitor program.
-rw-r--r--configure.ac2
-rw-r--r--src/Makefile.am4
-rw-r--r--src/server.c (renamed from src/main.c)0
-rw-r--r--src/xen_server.c (renamed from src/xen_linpicker.c)0
-rw-r--r--src/xenfb_server.c (renamed from src/xenfb.c)0
5 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 67cdd89..8272f09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ(2.57)
AC_INIT([linpicker], 2.0, [ewalsh@tycho.nsa.gov])
-AC_CONFIG_SRCDIR([src/main.c])
+AC_CONFIG_SRCDIR([src/server.c])
AC_CONFIG_HEADERS([src/config.h])
AM_INIT_AUTOMAKE([dist-bzip2])
diff --git a/src/Makefile.am b/src/Makefile.am
index d25280f..9a038ac 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,10 +2,10 @@ bin_PROGRAMS = linpicker_server track
linpicker_server_CFLAGS = -I../libvchan $(DFB_CFLAGS) $(UDEV_CFLAGS) \
-DPKGDATADIR="\"$(pkgdatadir)\""
-linpicker_server_SOURCES = main.c local.c input.c comm.c \
+linpicker_server_SOURCES = server.c local.c input.c comm.c \
view.c buffer.c client.c display.c \
sclient.c dclient.c bclient.c \
- xen_linpicker.c xen_backend.c xenfb.c
+ xen_backend.c xen_server.c xenfb_server.c
linpicker_server_LDADD = ../libvchan/libvchan.la \
-lxenlight -lxenguest -lxenctrl -lxenstore \
-luuid -lblktapctl -lutil \
diff --git a/src/main.c b/src/server.c
index 7386670..7386670 100644
--- a/src/main.c
+++ b/src/server.c
diff --git a/src/xen_linpicker.c b/src/xen_server.c
index ca3bec1..ca3bec1 100644
--- a/src/xen_linpicker.c
+++ b/src/xen_server.c
diff --git a/src/xenfb.c b/src/xenfb_server.c
index a69d67c..a69d67c 100644
--- a/src/xenfb.c
+++ b/src/xenfb_server.c