summaryrefslogtreecommitdiffstats
path: root/servers/fpga_programming_server_lin
diff options
context:
space:
mode:
Diffstat (limited to 'servers/fpga_programming_server_lin')
-rw-r--r--servers/fpga_programming_server_lin/debian/ulab-fpgaprogserver.init6
-rw-r--r--servers/fpga_programming_server_lin/src/Makefile.am8
-rw-r--r--servers/fpga_programming_server_lin/src/fpga_conn.cpp2
-rw-r--r--servers/fpga_programming_server_lin/src/main.cpp4
4 files changed, 10 insertions, 10 deletions
diff --git a/servers/fpga_programming_server_lin/debian/ulab-fpgaprogserver.init b/servers/fpga_programming_server_lin/debian/ulab-fpgaprogserver.init
index f6eaa31..02432fd 100644
--- a/servers/fpga_programming_server_lin/debian/ulab-fpgaprogserver.init
+++ b/servers/fpga_programming_server_lin/debian/ulab-fpgaprogserver.init
@@ -20,9 +20,9 @@
set -e
PATH=/opt/trinity/bin:/usr/bin:/sbin:/usr/sbin
-DAEMON=/opt/trinity/bin/remotefpga_fpgaprogserver
-PIDFILE=/var/run/remotefpga_authserver.pid
-UPGRADEFILE=/var/run/remotefpga_authserver.upgrade
+DAEMON=/opt/trinity/bin/ulab_fpgaprogserver
+PIDFILE=/var/run/ulab_fpgaprogserver.pid
+UPGRADEFILE=/var/run/ulab_fpgaprogserver.upgrade
DESC="uLab FPGA Programming Server"
diff --git a/servers/fpga_programming_server_lin/src/Makefile.am b/servers/fpga_programming_server_lin/src/Makefile.am
index e6d603b..2a67614 100644
--- a/servers/fpga_programming_server_lin/src/Makefile.am
+++ b/servers/fpga_programming_server_lin/src/Makefile.am
@@ -1,11 +1,11 @@
INCLUDES= $(all_includes) $(KDE_INCLUDES)/tde -I/usr/include/sasl
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
-bin_PROGRAMS = remotefpga_fpgaprogserver
+bin_PROGRAMS = ulab_fpgaprogserver
-remotefpga_fpgaprogserver_SOURCES = main.cpp fpga_conn.cpp
+ulab_fpgaprogserver_SOURCES = main.cpp fpga_conn.cpp
-remotefpga_fpgaprogserver_METASOURCES = AUTO
-remotefpga_fpgaprogserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
+ulab_fpgaprogserver_METASOURCES = AUTO
+ulab_fpgaprogserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
KDE_OPTIONS = nofinal
diff --git a/servers/fpga_programming_server_lin/src/fpga_conn.cpp b/servers/fpga_programming_server_lin/src/fpga_conn.cpp
index 84911c8..663c7f9 100644
--- a/servers/fpga_programming_server_lin/src/fpga_conn.cpp
+++ b/servers/fpga_programming_server_lin/src/fpga_conn.cpp
@@ -79,7 +79,7 @@ FPGASocket::FPGASocket(int sock, TQObject *parent, const char *name) :
connect(m_kerberosInitTimer, SIGNAL(timeout()), this, SLOT(finishKerberosHandshake()));
m_servClientTimeout = new TQTimer();
- setServiceName("remotefpga");
+ setServiceName("ulab");
line = 0;
connect(this, SIGNAL(connectionClosed()), SLOT(connectionClosedHandler()));
diff --git a/servers/fpga_programming_server_lin/src/main.cpp b/servers/fpga_programming_server_lin/src/main.cpp
index f3422de..7cd8e92 100644
--- a/servers/fpga_programming_server_lin/src/main.cpp
+++ b/servers/fpga_programming_server_lin/src/main.cpp
@@ -45,7 +45,7 @@ static const char version[] = "v0.0.1";
int main(int argc, char *argv[])
{
- TDEAboutData aboutData( "remotefpga_fpgaprog_server", I18N_NOOP("uLab FPGA Programming Server"),
+ TDEAboutData aboutData( "ulab_fpgaprog_server", I18N_NOOP("uLab FPGA Programming Server"),
version, description, TDEAboutData::License_GPL,
"(c) 2012, Timothy Pearson");
aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net");
@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
TDEStartupInfo::appStarted();
- KSimpleConfig config(TQDir::currentDirPath() + "/remotefpga_fpgaprogserver.conf", false);
+ KSimpleConfig config(TQDir::currentDirPath() + "/ulab_fpgaprogserver.conf", false);
config.setGroup("Server");
FPGAServer fpgasvr(0, config.readNumEntry("port", 4012), &config);
return app.exec();