diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:21 -0600 |
| commit | dfe289850f068f19ba4a83ab4e7e22a7e09c13c9 (patch) | |
| tree | c297348a55df66c571de4525646e0b9762427353 /dnssd | |
| parent | b7658a0d5eca24a9d37c6e04f88298ef02389db0 (diff) | |
| download | tdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.tar.gz tdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'dnssd')
| -rw-r--r-- | dnssd/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | dnssd/Makefile.am | 10 | ||||
| -rw-r--r-- | dnssd/README | 2 | ||||
| -rw-r--r-- | dnssd/kcm_tdednssd.kcfg (renamed from dnssd/kcm_kdnssd.kcfg) | 2 | ||||
| -rw-r--r-- | dnssd/settings.kcfgc | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/dnssd/CMakeLists.txt b/dnssd/CMakeLists.txt index 3df24100b..09d96161d 100644 --- a/dnssd/CMakeLists.txt +++ b/dnssd/CMakeLists.txt @@ -31,9 +31,9 @@ install( FILES DESTINATION ${INCLUDE_INSTALL_DIR}/dnssd ) -##### kdnssd #################################### +##### tdednssd #################################### -set( target kdnssd ) +set( target tdednssd ) set( ${target}_SRCS remoteservice.cpp responder.cpp servicebase.cpp diff --git a/dnssd/Makefile.am b/dnssd/Makefile.am index c24bdd6ba..25e749d72 100644 --- a/dnssd/Makefile.am +++ b/dnssd/Makefile.am @@ -7,16 +7,16 @@ noinst_HEADERS = sdevent.h # let automoc handle all of the meta source files (moc) METASOURCES = AUTO -lib_LTLIBRARIES = libkdnssd.la +lib_LTLIBRARIES = libtdednssd.la -libkdnssd_la_SOURCES = remoteservice.cpp responder.cpp servicebase.cpp \ +libtdednssd_la_SOURCES = remoteservice.cpp responder.cpp servicebase.cpp \ settings.kcfgc publicservice.cpp query.cpp domainbrowser.cpp servicebrowser.cpp dnssdincludedir = $(includedir)/dnssd dnssdinclude_HEADERS = domainbrowser.h query.h remoteservice.h \ publicservice.h servicebase.h servicebrowser.h settings.h -libkdnssd_la_LIBADD = ../tdecore/libtdecore.la $(AVAHI_LIBS) $(LIB_QT) -libkdnssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0 +libtdednssd_la_LIBADD = ../tdecore/libtdecore.la $(AVAHI_LIBS) $(LIB_QT) +libtdednssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0 -#kde_kcfg_DATA = kcm_kdnssd.kcfg +#kde_kcfg_DATA = kcm_tdednssd.kcfg include ../admin/Doxyfile.am diff --git a/dnssd/README b/dnssd/README index ffceb8ce9..304a7babb 100644 --- a/dnssd/README +++ b/dnssd/README @@ -1,7 +1,7 @@ Checklist to ensure that zeroconf will work: 1) Install Avahi, at least version 0.3 -2) compile kdnssd-avahi and install it to replace 'stub' libkdnssd.so provided by tdelibs +2) compile tdednssd-avahi and install it to replace 'stub' libtdednssd.so provided by tdelibs 3) check /etc/nsswitch.conf and ensure that there is 'mdns' before 'dns' in line starting with 'host:'. It should be something like: host: files mdns dns diff --git a/dnssd/kcm_kdnssd.kcfg b/dnssd/kcm_tdednssd.kcfg index 207ab608c..19cefaafa 100644 --- a/dnssd/kcm_kdnssd.kcfg +++ b/dnssd/kcm_tdednssd.kcfg @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - <kcfgfile name="kdnssdrc" /> + <kcfgfile name="tdednssdrc" /> <group name="browsing" > <entry key="DomainList" type="StringList" > <label>Additional domains for browsing</label> diff --git a/dnssd/settings.kcfgc b/dnssd/settings.kcfgc index 63764fc57..b8454f94b 100644 --- a/dnssd/settings.kcfgc +++ b/dnssd/settings.kcfgc @@ -1,5 +1,5 @@ ClassName=Configuration -File=kcm_kdnssd.kcfg +File=kcm_tdednssd.kcfg GlobalEnums=false Inherits=TDEConfigSkeleton ItemAccessors=false |