Update API to TDE R14

master
Timothy Pearson 11 years ago
parent 051031488b
commit e9bed7d3af

@ -25,7 +25,7 @@
<executable path="" params="" /> <executable path="" params="" />
<valgrind path="" params="" /> <valgrind path="" params="" />
<calltree path="" params="" /> <calltree path="" params="" />
<kcachegrind path="" /> <tdecachegrind path="" />
</kdevvalgrind> </kdevvalgrind>
</pluginList> </pluginList>
</KDevPrjSession> </KDevPrjSession>

@ -1,5 +1,5 @@
<?xml version = '1.0'?> <?xml version = '1.0'?>
<kdevelop> <tdevelop>
<general> <general>
<author>Timothy Pearson</author> <author>Timothy Pearson</author>
<email>kb9vqf@pearsoncomputing.net</email> <email>kb9vqf@pearsoncomputing.net</email>
@ -274,4 +274,4 @@
<appskde>false</appskde> <appskde>false</appskde>
<url/> <url/>
</dist> </dist>
</kdevelop> </tdevelop>

@ -28,7 +28,7 @@
<executable path="" params="" /> <executable path="" params="" />
<valgrind path="" params="" /> <valgrind path="" params="" />
<calltree path="" params="" /> <calltree path="" params="" />
<kcachegrind path="" /> <tdecachegrind path="" />
</kdevvalgrind> </kdevvalgrind>
</pluginList> </pluginList>
</KDevPrjSession> </KDevPrjSession>

@ -18,7 +18,7 @@
<executable path="" params="" /> <executable path="" params="" />
<valgrind path="" params="" /> <valgrind path="" params="" />
<calltree path="" params="" /> <calltree path="" params="" />
<kcachegrind path="" /> <tdecachegrind path="" />
</kdevvalgrind> </kdevvalgrind>
</pluginList> </pluginList>
</KDevPrjSession> </KDevPrjSession>

@ -1,5 +1,5 @@
<?xml version = '1.0'?> <?xml version = '1.0'?>
<kdevelop> <tdevelop>
<general> <general>
<author>Timothy Pearson</author> <author>Timothy Pearson</author>
<email>kb9vqf@pearsoncomputing.net</email> <email>kb9vqf@pearsoncomputing.net</email>
@ -249,4 +249,4 @@
<outputradix>10</outputradix> <outputradix>10</outputradix>
</display> </display>
</kdevdebugger> </kdevdebugger>
</kdevelop> </tdevelop>

@ -7,5 +7,5 @@ KDE_ICON = remote_laboratory_client
# Application # Application
bin_PROGRAMS = remote_laboratory_client bin_PROGRAMS = remote_laboratory_client
remote_laboratory_client_SOURCES = main.cpp remotemdi.cpp remote_laboratory_client_SOURCES = main.cpp remotemdi.cpp
remote_laboratory_client_LDADD = ./views/libinstrumentview.la ../dialogs/libselectserverdlg.la $(LIB_KPARTS) $(LIB_TDEUI) remote_laboratory_client_LDADD = ./views/libinstrumentview.la ../dialogs/libselectserverdlg.la $(LIB_TDEPARTS) $(LIB_TDEUI)
remote_laboratory_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdemdi -ltdekrbsocket -ltqtrla remote_laboratory_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdemdi -ltdekrbsocket -ltqtrla

@ -19,9 +19,9 @@
#define PROTOCOL_VERSION 1 #define PROTOCOL_VERSION 1
class KMdiChildView; class KMdiChildView;
class KListBox; class TDEListBox;
class TQListBoxItem; class TQListBoxItem;
class KToggleAction; class TDEToggleAction;
/** /**
* @short Remote Laboratory Main Window * @short Remote Laboratory Main Window

@ -6,6 +6,6 @@ KDE_ICON = libremotelab_adminconsole
# Part # Part
kde_module_LTLIBRARIES = libremotelab_adminconsole.la kde_module_LTLIBRARIES = libremotelab_adminconsole.la
libremotelab_adminconsole_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla libremotelab_adminconsole_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla
libremotelab_adminconsole_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio -ltdefx libremotelab_adminconsole_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio -ltdefx
libremotelab_adminconsole_la_SOURCES = part.cpp layout.ui terminatedlg.cpp terminatedlgbase.ui libremotelab_adminconsole_la_SOURCES = part.cpp layout.ui terminatedlg.cpp terminatedlgbase.ui

@ -6,6 +6,6 @@ KDE_ICON = libremotelab_adminusermgmt
# Part # Part
kde_module_LTLIBRARIES = libremotelab_adminusermgmt.la kde_module_LTLIBRARIES = libremotelab_adminusermgmt.la
libremotelab_adminusermgmt_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla libremotelab_adminusermgmt_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla
libremotelab_adminusermgmt_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio -ltdefx libremotelab_adminusermgmt_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio -ltdefx
libremotelab_adminusermgmt_la_SOURCES = part.cpp layout.ui groupauthdlg.cpp groupauthdlgbase.ui libremotelab_adminusermgmt_la_SOURCES = part.cpp layout.ui groupauthdlg.cpp groupauthdlgbase.ui

@ -6,7 +6,7 @@ KDE_ICON = libremotelab_commanalyzer
#Part #Part
kde_module_LTLIBRARIES = libremotelab_commanalyzer.la kde_module_LTLIBRARIES = libremotelab_commanalyzer.la
libremotelab_commanalyzer_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT) libremotelab_commanalyzer_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT)
libremotelab_commanalyzer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui -ltdeio -ltdefx -ltdekrbsocket -ltqtrla libremotelab_commanalyzer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui -ltdeio -ltdefx -ltdekrbsocket -ltqtrla
libremotelab_commanalyzer_la_SOURCES = \ libremotelab_commanalyzer_la_SOURCES = \
part.cpp layout.ui part.cpp layout.ui

@ -6,6 +6,6 @@ KDE_ICON = libremotelab_fpgaprogrammer
# Part # Part
kde_module_LTLIBRARIES = libremotelab_fpgaprogrammer.la kde_module_LTLIBRARIES = libremotelab_fpgaprogrammer.la
libremotelab_fpgaprogrammer_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla libremotelab_fpgaprogrammer_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla
libremotelab_fpgaprogrammer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio -ltdefx libremotelab_fpgaprogrammer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio -ltdefx
libremotelab_fpgaprogrammer_la_SOURCES = part.cpp layout.ui libremotelab_fpgaprogrammer_la_SOURCES = part.cpp layout.ui

@ -6,6 +6,6 @@ KDE_ICON = libremotelab_fpgaviewer
# Part # Part
kde_module_LTLIBRARIES = libremotelab_fpgaviewer.la kde_module_LTLIBRARIES = libremotelab_fpgaviewer.la
libremotelab_fpgaviewer_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla libremotelab_fpgaviewer_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla
libremotelab_fpgaviewer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio -ltdefx -ltdemdi libremotelab_fpgaviewer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio -ltdefx -ltdemdi
libremotelab_fpgaviewer_la_SOURCES = part.cpp layout.ui libremotelab_fpgaviewer_la_SOURCES = part.cpp layout.ui

@ -6,7 +6,7 @@ KDE_ICON = libremotelab_scope
#Part #Part
kde_module_LTLIBRARIES = libremotelab_scope.la kde_module_LTLIBRARIES = libremotelab_scope.la
libremotelab_scope_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT) libremotelab_scope_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT)
libremotelab_scope_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui -ltdeio -ltdefx -ltdekrbsocket -ltqtrla libremotelab_scope_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui -ltdeio -ltdefx -ltdekrbsocket -ltqtrla
libremotelab_scope_la_SOURCES = \ libremotelab_scope_la_SOURCES = \
part.cpp layout.ui part.cpp layout.ui

@ -6,6 +6,6 @@ KDE_ICON = libremotelab_sensormonitor
# Part # Part
kde_module_LTLIBRARIES = libremotelab_sensormonitor.la kde_module_LTLIBRARIES = libremotelab_sensormonitor.la
libremotelab_sensormonitor_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla libremotelab_sensormonitor_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla
libremotelab_sensormonitor_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio -ltdefx libremotelab_sensormonitor_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio -ltdefx
libremotelab_sensormonitor_la_SOURCES = part.cpp layout.ui libremotelab_sensormonitor_la_SOURCES = part.cpp layout.ui

@ -8,5 +8,5 @@ lib_LTLIBRARIES = libtdekrbsocket.la
include_HEADERS = tdekrbclientsocket.h tdekrbserversocket.h include_HEADERS = tdekrbclientsocket.h tdekrbserversocket.h
libtdekrbsocket_la_SOURCES = tdekrbclientsocket.cpp tdekrbserversocket.cpp libtdekrbsocket_la_SOURCES = tdekrbclientsocket.cpp tdekrbserversocket.cpp
libtdekrbsocket_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI) -lsasl2 libtdekrbsocket_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUI) -lsasl2
libtdekrbsocket_la_LDFLAGS = -version-info $(lt_current):$(lt_revision):$(lt_age) -no-undefined $(all_libraries) libtdekrbsocket_la_LDFLAGS = -version-info $(lt_current):$(lt_revision):$(lt_age) -no-undefined $(all_libraries)

@ -7,5 +7,5 @@ lib_LTLIBRARIES = libtqtrla.la
include_HEADERS = tqtrla.h include_HEADERS = tqtrla.h
libtqtrla_la_SOURCES = tqtrla.cpp libtqtrla_la_SOURCES = tqtrla.cpp
libtqtrla_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI) libtqtrla_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUI)
libtqtrla_la_LDFLAGS = -version-info $(lt_current):$(lt_revision):$(lt_age) -no-undefined $(all_libraries) $(LIB_KPARTS) -ltdekrbsocket libtqtrla_la_LDFLAGS = -version-info $(lt_current):$(lt_revision):$(lt_age) -no-undefined $(all_libraries) $(LIB_TDEPARTS) -ltdekrbsocket

@ -47,7 +47,7 @@ namespace KParts
{ {
class RemoteInstrumentPartPrivate; class RemoteInstrumentPartPrivate;
class KPARTS_EXPORT RemoteInstrumentPart : public Part class TDEPARTS_EXPORT RemoteInstrumentPart : public Part
{ {
Q_OBJECT Q_OBJECT

@ -6,6 +6,6 @@ bin_PROGRAMS = ulab_adminsysctlserver
ulab_adminsysctlserver_SOURCES = main.cpp admin_sys_ctl.cpp ulab_adminsysctlserver_SOURCES = main.cpp admin_sys_ctl.cpp
ulab_adminsysctlserver_METASOURCES = AUTO ulab_adminsysctlserver_METASOURCES = AUTO
ulab_adminsysctlserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla ulab_adminsysctlserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
KDE_OPTIONS = nofinal KDE_OPTIONS = nofinal

@ -6,6 +6,6 @@ bin_PROGRAMS = ulab_adminusermgmtserver
ulab_adminusermgmtserver_SOURCES = main.cpp admin_user_mgmt.cpp ulab_adminusermgmtserver_SOURCES = main.cpp admin_user_mgmt.cpp
ulab_adminusermgmtserver_METASOURCES = AUTO ulab_adminusermgmtserver_METASOURCES = AUTO
ulab_adminusermgmtserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla ulab_adminusermgmtserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
KDE_OPTIONS = nofinal KDE_OPTIONS = nofinal

@ -2315,23 +2315,23 @@ if test $kde_qtver = 4; then
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEABC, "-ltdeabc") AC_SUBST(LIB_TDEABC, "-ltdeabc")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-ltdeutils") AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-ltdednssd") AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-ltdeio") AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_TDEFILE, "-ltdeio") AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 3; then elif test $kde_qtver = 3; then
case $host in case $host in
@ -2341,35 +2341,35 @@ elif test $kde_qtver = 3; then
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEABC, "-ltdeabc") AC_SUBST(LIB_TDEABC, "-ltdeabc")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-ltdeutils") AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-ltdednssd") AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-ltdeio") AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_TDEFILE, "-ltdeio") AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_TDEFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")

@ -6,6 +6,6 @@ bin_PROGRAMS = ulab_authserver
ulab_authserver_SOURCES = main.cpp auth_conn.cpp ulab_authserver_SOURCES = main.cpp auth_conn.cpp
ulab_authserver_METASOURCES = AUTO ulab_authserver_METASOURCES = AUTO
ulab_authserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla ulab_authserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
KDE_OPTIONS = nofinal KDE_OPTIONS = nofinal

@ -638,7 +638,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
if test -n "$trinity14ornewer"; then if test -n "$trinity14ornewer"; then
KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)]) KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) KDE_FIND_PATH(maketdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
AC_SUBST(MAKEKDEWIDGETS) AC_SUBST(MAKEKDEWIDGETS)
fi fi
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
@ -2315,23 +2315,23 @@ if test $kde_qtver = 4; then
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-ltdeabc")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-ltdeutils") AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-ltdednssd") AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-ltdeio") AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_TDEFILE, "-ltdeio") AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 3; then elif test $kde_qtver = 3; then
case $host in case $host in
@ -2341,35 +2341,35 @@ elif test $kde_qtver = 3; then
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-ltdeabc")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-ltdeutils") AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-ltdednssd") AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-ltdeio") AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_TDEFILE, "-ltdeio") AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_TDEFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")

@ -6,6 +6,6 @@ bin_PROGRAMS = ulab_fpgaprogserver
ulab_fpgaprogserver_SOURCES = main.cpp fpga_conn.cpp ulab_fpgaprogserver_SOURCES = main.cpp fpga_conn.cpp
ulab_fpgaprogserver_METASOURCES = AUTO ulab_fpgaprogserver_METASOURCES = AUTO
ulab_fpgaprogserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla ulab_fpgaprogserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
KDE_OPTIONS = nofinal KDE_OPTIONS = nofinal

@ -638,7 +638,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
if test -n "$trinity14ornewer"; then if test -n "$trinity14ornewer"; then
KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)]) KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) KDE_FIND_PATH(maketdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
AC_SUBST(MAKEKDEWIDGETS) AC_SUBST(MAKEKDEWIDGETS)
fi fi
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
@ -2315,23 +2315,23 @@ if test $kde_qtver = 4; then
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-ltdeabc")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-ltdeutils") AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-ltdednssd") AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-ltdeio") AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_TDEFILE, "-ltdeio") AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 3; then elif test $kde_qtver = 3; then
case $host in case $host in
@ -2341,35 +2341,35 @@ elif test $kde_qtver = 3; then
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-ltdeabc")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-ltdeutils") AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-ltdednssd") AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-ltdeio") AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_TDEFILE, "-ltdeio") AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_TDEFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")

@ -6,6 +6,6 @@ bin_PROGRAMS = ulab_fpgaserver
ulab_fpgaserver_SOURCES = main.cpp fpga_conn.cpp ulab_fpgaserver_SOURCES = main.cpp fpga_conn.cpp
ulab_fpgaserver_METASOURCES = AUTO ulab_fpgaserver_METASOURCES = AUTO
ulab_fpgaserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla ulab_fpgaserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
KDE_OPTIONS = nofinal KDE_OPTIONS = nofinal

@ -2315,23 +2315,23 @@ if test $kde_qtver = 4; then
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEABC, "-ltdeabc") AC_SUBST(LIB_TDEABC, "-ltdeabc")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-ltdeutils") AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-ltdednssd") AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-ltdeio") AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_TDEFILE, "-ltdeio") AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 3; then elif test $kde_qtver = 3; then
case $host in case $host in
@ -2341,35 +2341,35 @@ elif test $kde_qtver = 3; then
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEABC, "-ltdeabc") AC_SUBST(LIB_TDEABC, "-ltdeabc")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-ltdeutils") AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-ltdednssd") AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-ltdeio") AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_TDEFILE, "-ltdeio") AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_TDEFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")

@ -6,6 +6,6 @@ bin_PROGRAMS = ulab_gpibserver
ulab_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
ulab_gpibserver_METASOURCES = AUTO 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 ulab_gpibserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdekrbsocket -ltqtrla -lgpib
KDE_OPTIONS = nofinal KDE_OPTIONS = nofinal

@ -638,7 +638,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
if test -n "$trinity14ornewer"; then if test -n "$trinity14ornewer"; then
KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)]) KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) KDE_FIND_PATH(maketdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
AC_SUBST(MAKEKDEWIDGETS) AC_SUBST(MAKEKDEWIDGETS)
fi fi
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
@ -2315,23 +2315,23 @@ if test $kde_qtver = 4; then
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-ltdeabc")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-ltdeutils") AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-ltdednssd") AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-ltdeio") AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_TDEFILE, "-ltdeio") AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 3; then elif test $kde_qtver = 3; then
case $host in case $host in
@ -2341,35 +2341,35 @@ elif test $kde_qtver = 3; then
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-ltdeabc")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-ltdeutils") AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-ltdednssd") AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-ltdeio") AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_TDEFILE, "-ltdeio") AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_TDEFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")

@ -6,6 +6,6 @@ bin_PROGRAMS = ulab_sensormonserver
ulab_sensormonserver_SOURCES = main.cpp sensor_conn.cpp ulab_sensormonserver_SOURCES = main.cpp sensor_conn.cpp
ulab_sensormonserver_METASOURCES = AUTO ulab_sensormonserver_METASOURCES = AUTO
ulab_sensormonserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla ulab_sensormonserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
KDE_OPTIONS = nofinal KDE_OPTIONS = nofinal

Loading…
Cancel
Save