Branch: master

c5332f8d 2014-12-29 13:30:07 Timothy Pearson
Fix servers failing to build with newest TDE version
M servers/admin_sys_ctl_server_lin/src/Makefile.am
M servers/admin_user_mgmt_server_lin/src/Makefile.am
M servers/auth_server_lin/src/Makefile.am
M servers/fpga_programming_server_lin/src/Makefile.am
M servers/fpga_server_lin/src/Makefile.am
M servers/gpib_server_lin/src/Makefile.am
M servers/logic_analyzer_server_lin/src/Makefile.am
M servers/sensor_monitor_server_lin/src/Makefile.am
M servers/serial_server_lin/src/Makefile.am
diff --git a/servers/admin_sys_ctl_server_lin/src/Makefile.am b/servers/admin_sys_ctl_server_lin/src/Makefile.am
index e48bf93..bf50dbd 100644
--- a/servers/admin_sys_ctl_server_lin/src/Makefile.am
+++ b/servers/admin_sys_ctl_server_lin/src/Makefile.am
@@ -6,6 +6,6 @@
 ulab_adminsysctlserver_SOURCES = main.cpp admin_sys_ctl.cpp
 
 ulab_adminsysctlserver_METASOURCES = AUTO
-ulab_adminsysctlserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
+ulab_adminsysctlserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdeldap -ltdekrbsocket -ltqtrla
 
 KDE_OPTIONS = nofinal
diff --git a/servers/admin_user_mgmt_server_lin/src/Makefile.am b/servers/admin_user_mgmt_server_lin/src/Makefile.am
index 7e25027..1ad698d 100644
--- a/servers/admin_user_mgmt_server_lin/src/Makefile.am
+++ b/servers/admin_user_mgmt_server_lin/src/Makefile.am
@@ -6,6 +6,6 @@
 ulab_adminusermgmtserver_SOURCES = main.cpp admin_user_mgmt.cpp
 
 ulab_adminusermgmtserver_METASOURCES = AUTO
-ulab_adminusermgmtserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
+ulab_adminusermgmtserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdeldap -ltdekrbsocket -ltqtrla
 
 KDE_OPTIONS = nofinal
diff --git a/servers/auth_server_lin/src/Makefile.am b/servers/auth_server_lin/src/Makefile.am
index 57d4949..1295b8f 100644
--- a/servers/auth_server_lin/src/Makefile.am
+++ b/servers/auth_server_lin/src/Makefile.am
@@ -6,6 +6,6 @@
 ulab_authserver_SOURCES = main.cpp auth_conn.cpp
 
 ulab_authserver_METASOURCES = AUTO
-ulab_authserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdekrbsocket -ltqtrla -ltdeldap
+ulab_authserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdeldap -ltdekrbsocket -ltqtrla -ltdeldap
 
 KDE_OPTIONS = nofinal
diff --git a/servers/fpga_programming_server_lin/src/Makefile.am b/servers/fpga_programming_server_lin/src/Makefile.am
index 579bb6a..7abb8db 100644
--- a/servers/fpga_programming_server_lin/src/Makefile.am
+++ b/servers/fpga_programming_server_lin/src/Makefile.am
@@ -6,6 +6,6 @@
 ulab_fpgaprogserver_SOURCES = main.cpp fpga_progserver.cpp
 
 ulab_fpgaprogserver_METASOURCES = AUTO
-ulab_fpgaprogserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
+ulab_fpgaprogserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdeldap -ltdekrbsocket -ltqtrla
 
 KDE_OPTIONS = nofinal
diff --git a/servers/fpga_server_lin/src/Makefile.am b/servers/fpga_server_lin/src/Makefile.am
index b08365b..ff574b8 100644
--- a/servers/fpga_server_lin/src/Makefile.am
+++ b/servers/fpga_server_lin/src/Makefile.am
@@ -6,6 +6,6 @@
 ulab_fpgaserver_SOURCES = main.cpp fpga_conn.cpp
 
 ulab_fpgaserver_METASOURCES = AUTO
-ulab_fpgaserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdekrbsocket -ltqtrla -lbbbgpmc
+ulab_fpgaserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdeldap -ltdekrbsocket -ltqtrla -lbbbgpmc
 
 KDE_OPTIONS = nofinal
diff --git a/servers/gpib_server_lin/src/Makefile.am b/servers/gpib_server_lin/src/Makefile.am
index d5da85e..2e4a862 100644
--- a/servers/gpib_server_lin/src/Makefile.am
+++ b/servers/gpib_server_lin/src/Makefile.am
@@ -6,6 +6,6 @@
 ulab_gpibserver_SOURCES = commanalyzer_functions.cpp gpib_functions.cpp scope_functions.cpp signal_functions.cpp main.cpp gpib_conn.cpp
 
 ulab_gpibserver_METASOURCES = AUTO
-ulab_gpibserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdekrbsocket -ltqtrla -lgpib
+ulab_gpibserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdeldap -ltdekrbsocket -ltqtrla -lgpib
 
 KDE_OPTIONS = nofinal
diff --git a/servers/logic_analyzer_server_lin/src/Makefile.am b/servers/logic_analyzer_server_lin/src/Makefile.am
index 1468663..9d463d9 100644
--- a/servers/logic_analyzer_server_lin/src/Makefile.am
+++ b/servers/logic_analyzer_server_lin/src/Makefile.am
@@ -6,6 +6,6 @@
 ulab_logicanalyzerserver_SOURCES = main.cpp logic_analyzer_server.cpp
 
 ulab_logicanalyzerserver_METASOURCES = AUTO
-ulab_logicanalyzerserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdekrbsocket -ltqtrla -lbbbgpmc
+ulab_logicanalyzerserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdeldap -ltdekrbsocket -ltqtrla -lbbbgpmc
 
 KDE_OPTIONS = nofinal
diff --git a/servers/sensor_monitor_server_lin/src/Makefile.am b/servers/sensor_monitor_server_lin/src/Makefile.am
index bacbfab..a2453a1 100644
--- a/servers/sensor_monitor_server_lin/src/Makefile.am
+++ b/servers/sensor_monitor_server_lin/src/Makefile.am
@@ -6,6 +6,6 @@
 ulab_sensormonserver_SOURCES = main.cpp sensor_conn.cpp
 
 ulab_sensormonserver_METASOURCES = AUTO
-ulab_sensormonserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
+ulab_sensormonserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdeldap -ltdekrbsocket -ltqtrla
 
 KDE_OPTIONS = nofinal
diff --git a/servers/serial_server_lin/src/Makefile.am b/servers/serial_server_lin/src/Makefile.am
index 643df79..b797668 100644
--- a/servers/serial_server_lin/src/Makefile.am
+++ b/servers/serial_server_lin/src/Makefile.am
@@ -6,6 +6,6 @@
 ulab_serialserver_SOURCES = main.cpp serial_server.cpp
 
 ulab_serialserver_METASOURCES = AUTO
-ulab_serialserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
+ulab_serialserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdeldap -ltdekrbsocket -ltqtrla
 
 KDE_OPTIONS = nofinal