diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-27 02:16:11 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-27 02:16:11 -0600 |
| commit | b4426c06a4374b8e1025adce41427f0b1b072721 (patch) | |
| tree | b4181220745e6623995f9db4120a781a2455304a /servers/gpib_server_lin/src | |
| parent | e21781df2ef6bfdb1a650bab5298b0261c8f7d3c (diff) | |
| download | ulab-b4426c06a4374b8e1025adce41427f0b1b072721.tar.gz ulab-b4426c06a4374b8e1025adce41427f0b1b072721.zip | |
Fix remaining name references to use the uLab system name
Fix incorrect Debian init scripts and a wrong binary name
Diffstat (limited to 'servers/gpib_server_lin/src')
| -rw-r--r-- | servers/gpib_server_lin/src/Makefile.am | 8 | ||||
| -rw-r--r-- | servers/gpib_server_lin/src/gpib_conn.cpp | 2 | ||||
| -rw-r--r-- | servers/gpib_server_lin/src/main.cpp | 4 | ||||
| -rw-r--r-- | servers/gpib_server_lin/src/main_server_lin.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/servers/gpib_server_lin/src/Makefile.am b/servers/gpib_server_lin/src/Makefile.am index a09c7d3..af3a073 100644 --- a/servers/gpib_server_lin/src/Makefile.am +++ b/servers/gpib_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_gpibserver +bin_PROGRAMS = ulab_gpibserver -remotefpga_gpibserver_SOURCES = commanalyzer_functions.cpp gpib_functions.cpp scope_functions.cpp signal_functions.cpp main.cpp gpib_conn.cpp +ulab_gpibserver_SOURCES = commanalyzer_functions.cpp gpib_functions.cpp scope_functions.cpp signal_functions.cpp main.cpp gpib_conn.cpp -remotefpga_gpibserver_METASOURCES = AUTO -remotefpga_gpibserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla -lgpib +ulab_gpibserver_METASOURCES = AUTO +ulab_gpibserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla -lgpib KDE_OPTIONS = nofinal diff --git a/servers/gpib_server_lin/src/gpib_conn.cpp b/servers/gpib_server_lin/src/gpib_conn.cpp index 3fce6e2..c211f84 100644 --- a/servers/gpib_server_lin/src/gpib_conn.cpp +++ b/servers/gpib_server_lin/src/gpib_conn.cpp @@ -77,7 +77,7 @@ GPIBSocket::GPIBSocket(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/gpib_server_lin/src/main.cpp b/servers/gpib_server_lin/src/main.cpp index 89caa8e..6c2191e 100644 --- a/servers/gpib_server_lin/src/main.cpp +++ b/servers/gpib_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_gpib_server", I18N_NOOP("uLab GPIB Server"), + TDEAboutData aboutData( "ulab_gpib_server", I18N_NOOP("uLab GPIB 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_gpibserver.conf", false); + KSimpleConfig config(TQDir::currentDirPath() + "/ulab_gpibserver.conf", false); config.setGroup("Server"); GPIBServer fpgasvr(0, config.readNumEntry("port", 4013), &config); return app.exec(); diff --git a/servers/gpib_server_lin/src/main_server_lin.cpp b/servers/gpib_server_lin/src/main_server_lin.cpp index 589f5d5..0863c51 100644 --- a/servers/gpib_server_lin/src/main_server_lin.cpp +++ b/servers/gpib_server_lin/src/main_server_lin.cpp @@ -134,7 +134,7 @@ int k; int m; // Configuration stuff -static const char filename[] = "remotefpga_gpib.conf"; +static const char filename[] = "ulab_gpib.conf"; char linedata [256]; // Shut up GCC |