Commit 8d34ef91 authored by David Faure's avatar David Faure
Browse files

Major cleanup of the kioslaves Makefiles

svn path=/trunk/kdebase/kioslave/; revision=73142
parent 64aea1cc
INCLUDES = $(all_includes) $(CDPARANOIA_INCS)
lib_LTLIBRARIES = kio_audiocd.la
kde_module_LTLIBRARIES = kio_audiocd.la
kio_audiocd_la_SOURCES = audiocd.cpp
kio_audiocd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(CDPARANOIA_RPATH) \
-module -avoid-version -no-undefined
-module $(KDE_PLUGIN)
kio_audiocd_la_LIBADD = $(LIB_KIO) $(CDPARANOIA_LIBS)
......
SUBDIRS = gzip $(BZIP2DIR)
AM_CPPFLAGS = -DQT_NO_CAST_ASCII
KDE_CPPFLAGS = -DQT_NO_CAST_ASCII
INCLUDES = $(all_includes)
lib_LTLIBRARIES = kio_filter.la
kde_module_LTLIBRARIES = kio_filter.la
kio_filter_la_SOURCES = filter.cc
kio_filter_la_LIBADD = $(LIB_KSYCOCA)
kio_filter_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kio_filter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = filter.h
METASOURCES = AUTO
......
......@@ -2,11 +2,11 @@ INCLUDES = $(all_includes)
LDFLAGS = $(all_libraries) $(KDE_RPATH)
METASOURCES = AUTO
lib_LTLIBRARIES = kbzip2filter.la
kde_module_LTLIBRARIES = kbzip2filter.la
kbzip2filter_la_SOURCES = kbzip2filter.cpp
kbzip2filter_la_LIBADD = $(LIB_KSYCOCA) $(LIBBZ2)
kbzip2filter_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kbzip2filter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
kde_services_DATA = kbzip2filter.desktop
......
......@@ -57,7 +57,7 @@ int kdemain( int argc, char ** argv)
FilterProtocol::FilterProtocol( const QCString & protocol, const QCString &pool, const QCString &app )
: KIO::SlaveBase( protocol, pool, app )
{
QString mimetype = QString::fromLatin1("application/x-") + protocol;
QString mimetype = QString::fromLatin1("application/x-") + QString::fromLatin1(protocol);
filter = KFilterBase::findFilterByMimeType( mimetype );
ASSERT(filter);
}
......
......@@ -2,11 +2,11 @@ INCLUDES = $(all_includes)
LDFLAGS = $(all_libraries) $(KDE_RPATH)
METASOURCES = AUTO
lib_LTLIBRARIES = kgzipfilter.la
kde_module_LTLIBRARIES = kgzipfilter.la
kgzipfilter_la_SOURCES = kgzipfilter.cpp
kgzipfilter_la_LIBADD = $(LIB_KSYCOCA) $(LIBZ)
kgzipfilter_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kgzipfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
kde_services_DATA = kgzipfilter.desktop
......@@ -6,11 +6,11 @@ LDFLAGS = $(all_libraries) $(KDE_RPATH)
####### Files
lib_LTLIBRARIES = kio_finger.la
kde_module_LTLIBRARIES = kio_finger.la
kio_finger_la_SOURCES = kio_finger.cpp
kio_finger_la_LIBADD = -lkio
kio_finger_la_LDFLAGS = -module -avoid-version -no-undefined
kio_finger_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = kio_finger.h
......
......@@ -5,20 +5,14 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(all_includes)
####### Files
lib_LTLIBRARIES = kio_gopher.la
kde_module_LTLIBRARIES = kio_gopher.la
kio_gopher_la_SOURCES = gopher.cc
kio_gopher_la_LIBADD = $(LIB_KIO)
kio_gopher_la_LDFLAGS = $(all_libraries) -module -avoid-version
kio_gopher_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = gopher.h
kdelnk_DATA = gopher.protocol
kdelnkdir = $(kde_servicesdir)
check_PROGRAMS = linktest
linktest_SOURCES = $(kio_gopher_la_SOURCES) linktest.cpp
linktest.cpp:
echo "int main() {};" > linktest.cpp
linktest_LDFLAGS = $(all_libraries) -module -avoid-version
linktest_LDADD = $(kio_gopher_la_LIBADD)
......@@ -6,11 +6,11 @@ INCLUDES = $(all_includes)
####### Files
lib_LTLIBRARIES = kio_gzip.la
kde_module_LTLIBRARIES = kio_gzip.la
kio_gzip_la_SOURCES = gzip.cc
kio_gzip_la_LIBADD = $(LIB_KIO)
kio_gzip_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kio_gzip_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = gzip.h
METASOURCES = AUTO
......
......@@ -5,11 +5,11 @@ LDFLAGS = $(all_libraries) $(KDE_RPATH)
####### Files
lib_LTLIBRARIES = kio_help.la
kde_module_LTLIBRARIES = kio_help.la
kio_help_la_SOURCES = kio_help.cpp
kio_help_la_LIBADD = -lkio
kio_help_la_LDFLAGS = -module -avoid-version -no-undefined
kio_help_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = kio_help.h
kdelnk_DATA = help.protocol
......
......@@ -2,20 +2,14 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(SSL_INCLUDES) $(all_includes)
####### Files
lib_LTLIBRARIES = kio_imap4.la
kde_module_LTLIBRARIES = kio_imap4.la
kio_imap4_la_SOURCES = imap4.cc base64md5.cc response.cc md5.cc
kio_imap4_la_LIBADD = $(LIB_KIO)
kio_imap4_la_LDFLAGS = $(all_libraries) -module -avoid-version
kio_imap4_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = imap4.h
kdelnk_DATA = imap4.protocol imaps.protocol
kdelnkdir = $(kde_servicesdir)
check_PROGRAMS = linktest
linktest_SOURCES = $(kio_imap4_la_SOURCES) linktest.cpp
linktest.cpp:
echo "int main() {};" > linktest.cpp
linktest_LDFLAGS = $(all_libraries) -module -avoid-version
linktest_LDADD = $(kio_imap4_la_LIBADD)
......@@ -6,20 +6,13 @@ METASOURCES = AUTO
####### Files
lib_LTLIBRARIES = kio_info.la
kde_module_LTLIBRARIES = kio_info.la
kio_info_la_SOURCES = info.cc
kio_info_la_LIBADD = $(LIB_KIO)
kio_info_la_LDFLAGS = $(all_libraries) -module -avoid-version
kio_info_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = info.h
check_PROGRAMS = test
test_SOURCES = $(kio_info_la_SOURCES) test.cc
test.cc:
echo "int main() {};" > test.cc
test_LDFLAGS = $(all_libraries) -module -avoid-version
test_LDADD = $(kio_info_la_LIBADD)
kdelnk_DATA = info.protocol
kdelnkdir = $(kde_servicesdir)
......
......@@ -6,20 +6,14 @@ LDADD = $(LIB_KIO) $(LDAP_LIBS)
####### Files
lib_LTLIBRARIES = kio_ldap.la
kde_module_LTLIBRARIES = kio_ldap.la
kio_ldap_la_SOURCES = kio_ldap.cpp kldap.cpp kldapurl.cpp
kio_ldap_la_LIBADD = $(LIB_KIO) $(LDAP_LIBS) $(KERBEROS_LIBS)
kio_ldap_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDAP_RPATH) $(KRB_RPATH) -module -avoid-version
kio_ldap_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDAP_RPATH) $(KRB_RPATH) -module $(KDE_PLUGIN)
noinst_HEADERS = kio_ldap.h kldap.h kldapurl.h
kdelnk_DATA = ldap.protocol
kdelnkdir = $(kde_servicesdir)
check_PROGRAMS = linktest
linktest_SOURCES = $(kio_ldap_la_SOURCES) linktest.cpp
linktest.cpp:
echo "int main() {};" > linktest.cpp
linktest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDAP_RPATH) -module -avoid-version
linktest_LDADD = $(kio_ldap_la_LIBADD)
......@@ -5,11 +5,11 @@ LDFLAGS = $(all_libraries) $(KDE_RPATH)
####### Files
lib_LTLIBRARIES = kio_man.la
kde_module_LTLIBRARIES = kio_man.la
kio_man_la_SOURCES = kio_man.cpp man2html.cpp
kio_man_la_LIBADD = -lksycoca
kio_man_la_LDFLAGS = -module -avoid-version -no-undefined
kio_man_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = kio_man.h
kdelnk_DATA = man.protocol
......
......@@ -5,11 +5,11 @@ LDFLAGS = $(all_libraries) $(KDE_RPATH)
####### Files
lib_LTLIBRARIES = kio_nfs.la
kde_module_LTLIBRARIES = kio_nfs.la
kio_nfs_la_SOURCES = kio_nfs.cpp mount_xdr.c nfs_prot_xdr.c
kio_nfs_la_LIBADD = -lkio
kio_nfs_la_LDFLAGS = -module -avoid-version -no-undefined
kio_nfs_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = nfs_prot.h mount.h
kdelnk_DATA = nfs.protocol
......
......@@ -2,21 +2,17 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(all_includes)
####### Files
lib_LTLIBRARIES = kio_nntp.la
kde_module_LTLIBRARIES = kio_nntp.la
kio_nntp_la_SOURCES = nntp.cpp
kio_nntp_la_LIBADD = $(LIB_KIO)
kio_nntp_la_LDFLAGS = $(all_libraries) -module -avoid-version
kio_nntp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
METASOURCES = AUTO
noinst_HEADERS = nntp.h
kdelnk_DATA = nntp.protocol
kdelnkdir = $(kde_servicesdir)
check_PROGRAMS = linktest
linktest_SOURCES = $(kio_nntp_la_SOURCES) linktest.cpp
linktest.cpp:
echo "int main() {};" > linktest.cpp
linktest_LDFLAGS = $(all_libraries) -module -avoid-version
linktest_LDADD = $(kio_nntp_la_LIBADD)
......@@ -936,5 +936,4 @@ bool TCPWrapper::readLine(QCString &line) {
return true;
}
#include "nntp.moc"
......@@ -2,20 +2,14 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(SSL_INCLUDES) $(all_includes)
####### Files
lib_LTLIBRARIES = kio_pop3.la
kde_module_LTLIBRARIES = kio_pop3.la
kio_pop3_la_SOURCES = pop3.cc md5.c
kio_pop3_la_LIBADD = $(LIB_KIO)
kio_pop3_la_LDFLAGS = $(all_libraries) -module -avoid-version
kio_pop3_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = pop3.h
kdelnk_DATA = pop3.protocol pop3s.protocol
kdelnkdir = $(kde_servicesdir)
check_PROGRAMS = linktest
linktest_SOURCES = $(kio_pop3_la_SOURCES) linktest.cpp
linktest.cpp:
echo "int main() {};" > linktest.cpp
linktest_LDFLAGS = $(all_libraries) -module -avoid-version
linktest_LDADD = $(kio_pop3_la_LIBADD)
......@@ -7,11 +7,11 @@ LDFLAGS = $(all_libraries) $(KDE_RPATH)
####### Files
lib_LTLIBRARIES = kio_smb.la
kde_module_LTLIBRARIES = kio_smb.la
kio_smb_la_SOURCES = smb.cc
kio_smb_la_LIBADD = -lkio libsmb++/src/libsmb++.la @EXTRA_LIBSMB_ADD@
kio_smb_la_LDFLAGS = -module -avoid-version @EXTRA_LIBSMB_FLAGS@
kio_smb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) @EXTRA_LIBSMB_FLAGS@
noinst_HEADERS = smb.h
if LINKHOOK
......@@ -31,9 +31,3 @@ endif
kdelnk_DATA = smb.protocol
kdelnkdir = $(kde_servicesdir)
check_PROGRAMS = linktest
linktest_SOURCES = $(kio_smb_la_SOURCES) linktest.cpp
linktest.cpp:
echo "int main() {};" > linktest.cpp
linktest_LDFLAGS = $(all_libraries) -module -avoid-version
linktest_LDADD = $(kio_smb_la_LIBADD)
......@@ -2,20 +2,14 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(SSL_INCLUDES) $(all_includes)
####### Files
lib_LTLIBRARIES = kio_smtp.la
kde_module_LTLIBRARIES = kio_smtp.la
kio_smtp_la_SOURCES = smtp.cc
kio_smtp_la_LIBADD = $(LIB_KIO)
kio_smtp_la_LDFLAGS = $(all_libraries) -module -avoid-version
kio_smtp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = smtp.h
kdelnk_DATA = smtp.protocol
kdelnkdir = $(kde_servicesdir)
check_PROGRAMS = linktest
linktest_SOURCES = $(kio_smtp_la_SOURCES) linktest.cpp
linktest.cpp:
echo "int main() {};" > linktest.cpp
linktest_LDFLAGS = $(all_libraries) -module -avoid-version
linktest_LDADD = $(kio_smtp_la_LIBADD)
......@@ -5,11 +5,11 @@ INCLUDES = $(all_includes)
LDFLAGS = $(all_libraries) $(KDE_RPATH)
METASOURCES = AUTO
lib_LTLIBRARIES = kio_tar.la
kde_module_LTLIBRARIES = kio_tar.la
kio_tar_la_SOURCES = tar.cc ktar.cpp
kio_tar_la_LIBADD = $(LIB_KSYCOCA)
kio_tar_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kio_tar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
check_PROGRAMS = ktartest
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment