Commit 85bc2f9c authored by Richard Lärkäng's avatar Richard Lärkäng
Browse files

Rename config.{h,cpp} to kcddbconfig.{h,cpp} so it doesn't

conflict with toplevel config.h

Add RUN_UNINSTALLED to tests

svn path=/trunk/KDE/kdemultimedia/libkcddb/; revision=529041
parent de06b014
......@@ -23,7 +23,7 @@ include_directories(${CMAKE_BINARY_DIR}/libkcddb/ ${KDE4_INCLUDE_DIR} ${QT_INCLU
set(kcddb_LIB_SRCS ${libmusicbrainz_SRCS}
cache.cpp
cdinfo.cpp
config.cpp
kcddbconfig.cpp
client.cpp
cddb.cpp
lookup.cpp
......@@ -65,7 +65,7 @@ install_targets(${LIB_INSTALL_DIR} kcddb )
########### install files ###############
install_files( /include/libkcddb FILES cdinfo.h client.h config.h cddb.h configbase.h )
install_files( /include/libkcddb FILES cdinfo.h client.h kcddbconfig.h cddb.h configbase.h )
install_files( ${KCFG_INSTALL_DIR} FILES libkcddb.kcfg )
kde4_footer()
......@@ -88,7 +88,7 @@ kde4_footer()
#lib_LTLIBRARIES = libkcddb.la
#
#libkcddb_la_SOURCES = \
# cache.cpp cdinfo.cpp config.cpp client.cpp cddb.cpp lookup.cpp \
# cache.cpp cdinfo.cpp kcddbconfig.cpp client.cpp cddb.cpp lookup.cpp \
# cddbplookup.cpp synccddbplookup.cpp asynccddbplookup.cpp httplookup.cpp \
# synchttplookup.cpp asynchttplookup.cpp smtpsubmit.cpp \
# asyncsmtpsubmit.cpp syncsmtpsubmit.cpp configbase.kcfgc \
......@@ -107,9 +107,9 @@ kde4_footer()
#
#kcddbincludedir = $(includedir)/libkcddb
#kcddbinclude_HEADERS = \
# cdinfo.h client.h config.h cddb.h configbase.h
# cdinfo.h client.h kcddbconfig.h cddb.h configbase.h
#
#messages: rc.cpp
# $(XGETTEXT) *.cpp -o $(podir)/libkcddb.pot
#
#config.lo: configbase.h
#kcddbconfig.lo: configbase.h
......@@ -12,7 +12,7 @@ INCLUDES = -I$(srcdir)/.. $(all_includes)
lib_LTLIBRARIES = libkcddb.la
libkcddb_la_SOURCES = \
cache.cpp cdinfo.cpp config.cpp client.cpp cddb.cpp lookup.cpp \
cache.cpp cdinfo.cpp kcddbconfig.cpp client.cpp cddb.cpp lookup.cpp \
cddbplookup.cpp synccddbplookup.cpp asynccddbplookup.cpp httplookup.cpp \
synchttplookup.cpp asynchttplookup.cpp smtpsubmit.cpp \
asyncsmtpsubmit.cpp syncsmtpsubmit.cpp configbase.kcfgc \
......@@ -31,9 +31,9 @@ kde_kcfg_DATA = libkcddb.kcfg
kcddbincludedir = $(includedir)/libkcddb
kcddbinclude_HEADERS = \
cdinfo.h client.h config.h cddb.h configbase.h
cdinfo.h client.h kcddbconfig.h cddb.h configbase.h
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/libkcddb.pot
config.lo: configbase.h
kcddbconfig.lo: configbase.h
......@@ -28,7 +28,7 @@
#include <QTextStream>
#include "cache.h"
#include "config.h"
#include "kcddbconfig.h"
namespace KCDDB
{
......
......@@ -21,7 +21,7 @@
#ifndef KCDDB_CLIENT_H
#define KCDDB_CLIENT_H
#include "config.h"
#include "kcddbconfig.h"
#include "cdinfo.h"
#include <qobject.h>
#include "cddb.h"
......
......@@ -22,7 +22,7 @@
#include <kemailsettings.h>
#include <libkcddb/config.h>
#include <libkcddb/kcddbconfig.h>
namespace KCDDB
{
......
......@@ -22,7 +22,7 @@
#include <kcmodule.h>
#include "libkcddb/config.h"
#include "libkcddb/kcddbconfig.h"
class CDDBConfigWidgetBase;
class KConfigDialogManager;
......
kde4_header()
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/.. ${KDE4_INCLUDES} )
########### next target ###############
set(syncsmtpsubmittest_SRCS syncsmtpsubmittest.cpp )
kde4_automoc(${syncsmtpsubmittest_SRCS})
if(KDE4_BUILD_TESTS)
kde4_add_executable(syncsmtpsubmittest ${syncsmtpsubmittest_SRCS})
target_link_libraries(syncsmtpsubmittest ${KDE4_KDECORE_LIBS} kcddb )
endif(KDE4_BUILD_TESTS)
########### next target ###############
set(asyncsmtpsubmittest_SRCS asyncsmtpsubmittest.cpp )
kde4_automoc(${asyncsmtpsubmittest_SRCS})
if(KDE4_BUILD_TESTS)
kde4_add_executable(asyncsmtpsubmittest ${asyncsmtpsubmittest_SRCS})
target_link_libraries(asyncsmtpsubmittest ${KDE4_KDECORE_LIBS} kcddb )
endif(KDE4_BUILD_TESTS)
########### next target ###############
set(asynchttplookuptest_SRCS asynchttplookuptest.cpp )
kde4_automoc(${asynchttplookuptest_SRCS})
if(KDE4_BUILD_TESTS)
kde4_add_executable(asynchttplookuptest ${asynchttplookuptest_SRCS})
target_link_libraries(asynchttplookuptest ${KDE4_KDECORE_LIBS} kcddb QtTest_debug )
endif(KDE4_BUILD_TESTS)
########### next target ###############
set(asynccddblookuptest_SRCS asynccddblookuptest.cpp )
kde4_automoc(${asynccddblookuptest_SRCS})
if(KDE4_BUILD_TESTS)
kde4_add_executable(asynccddblookuptest ${asynccddblookuptest_SRCS})
target_link_libraries(asynccddblookuptest ${KDE4_KDECORE_LIBS} kcddb )
endif(KDE4_BUILD_TESTS)
########### next target ###############
set(synccddblookuptest_SRCS synccddblookuptest.cpp )
kde4_automoc(${synccddblookuptest_SRCS})
if(KDE4_BUILD_TESTS)
kde4_add_executable(synccddblookuptest ${synccddblookuptest_SRCS})
target_link_libraries(synccddblookuptest ${KDE4_KDECORE_LIBS} kcddb QtTest_debug )
set(syncsmtpsubmittest_SRCS syncsmtpsubmittest.cpp )
kde4_automoc(${syncsmtpsubmittest_SRCS})
kde4_add_executable(syncsmtpsubmittest RUN_UNINSTALLED ${syncsmtpsubmittest_SRCS})
target_link_libraries(syncsmtpsubmittest ${KDE4_KDECORE_LIBS} kcddb )
set(asyncsmtpsubmittest_SRCS asyncsmtpsubmittest.cpp )
kde4_automoc(${asyncsmtpsubmittest_SRCS})
kde4_add_executable(asyncsmtpsubmittest RUN_UNINSTALLED ${asyncsmtpsubmittest_SRCS})
target_link_libraries(asyncsmtpsubmittest ${KDE4_KDECORE_LIBS} kcddb )
set(asynchttplookuptest_SRCS asynchttplookuptest.cpp )
kde4_automoc(${asynchttplookuptest_SRCS})
kde4_add_executable(asynchttplookuptest RUN_UNINSTALLED ${asynchttplookuptest_SRCS})
target_link_libraries(asynchttplookuptest ${KDE4_KDECORE_LIBS} kcddb QtTest_debug )
set(asynccddblookuptest_SRCS asynccddblookuptest.cpp )
kde4_automoc(${asynccddblookuptest_SRCS})
kde4_add_executable(asynccddblookuptest RUN_UNINSTALLED ${asynccddblookuptest_SRCS})
target_link_libraries(asynccddblookuptest ${KDE4_KDECORE_LIBS} kcddb )
set(synccddblookuptest_SRCS synccddblookuptest.cpp )
kde4_automoc(${synccddblookuptest_SRCS})
kde4_add_executable(synccddblookuptest RUN_UNINSTALLED ${synccddblookuptest_SRCS})
target_link_libraries(synccddblookuptest ${KDE4_KDECORE_LIBS} kcddb QtTest_debug )
set(synchttplookuptest_SRCS synchttplookuptest.cpp )
kde4_automoc(${synchttplookuptest_SRCS})
kde4_add_executable(synchttplookuptest RUN_UNINSTALLED ${synchttplookuptest_SRCS})
target_link_libraries(synchttplookuptest ${KDE4_KDECORE_LIBS} kcddb )
set(asynchttpsubmittest_SRCS asynchttpsubmittest.cpp )
kde4_automoc(${asynchttpsubmittest_SRCS})
kde4_add_executable(asynchttpsubmittest RUN_UNINSTALLED ${asynchttpsubmittest_SRCS})
target_link_libraries(asynchttpsubmittest ${KDE4_KDECORE_LIBS} kcddb )
set(synchttpsubmittest_SRCS synchttpsubmittest.cpp )
kde4_automoc(${synchttpsubmittest_SRCS})
kde4_add_executable(synchttpsubmittest RUN_UNINSTALLED ${synchttpsubmittest_SRCS})
target_link_libraries(synchttpsubmittest ${KDE4_KDECORE_LIBS} kcddb )
set(sitestest_SRCS sitestest.cpp )
kde4_automoc(${sitestest_SRCS})
kde4_add_executable(sitestest RUN_UNINSTALLED ${sitestest_SRCS})
target_link_libraries(sitestest ${KDE4_KDECORE_LIBS} kcddb )
set(utf8test_SRCS utf8test.cpp )
kde4_automoc(${utf8test_SRCS})
kde4_add_executable(utf8test RUN_UNINSTALLED ${utf8test_SRCS})
target_link_libraries(utf8test ${KDE4_KDECORE_LIBS} kcddb )
set(musicbrainztest_SRCS musicbrainztest.cpp )
kde4_automoc(${musicbrainztest_SRCS})
kde4_add_executable(musicbrainztest RUN_UNINSTALLED ${musicbrainztest_SRCS})
target_link_libraries(musicbrainztest ${KDE4_KDECORE_LIBS} kcddb QtTest_debug )
set(cdinfotest_SRCS cdinfotest.cpp )
kde4_automoc(${cdinfotest_SRCS})
kde4_add_executable(cdinfotest RUN_UNINSTALLED ${cdinfotest_SRCS})
target_link_libraries(cdinfotest ${KDE4_KDECORE_LIBS} kcddb QtTest_debug )
endif(KDE4_BUILD_TESTS)
########### next target ###############
set(synchttplookuptest_SRCS synchttplookuptest.cpp )
kde4_automoc(${synchttplookuptest_SRCS})
if(KDE4_BUILD_TESTS)
kde4_add_executable(synchttplookuptest ${synchttplookuptest_SRCS})
target_link_libraries(synchttplookuptest ${KDE4_KDECORE_LIBS} kcddb )
endif(KDE4_BUILD_TESTS)
########### next target ###############
set(asynchttpsubmittest_SRCS asynchttpsubmittest.cpp )
kde4_automoc(${asynchttpsubmittest_SRCS})
if(KDE4_BUILD_TESTS)
kde4_add_executable(asynchttpsubmittest ${asynchttpsubmittest_SRCS})
target_link_libraries(asynchttpsubmittest ${KDE4_KDECORE_LIBS} kcddb )
endif(KDE4_BUILD_TESTS)
########### next target ###############
set(synchttpsubmittest_SRCS synchttpsubmittest.cpp )
kde4_automoc(${synchttpsubmittest_SRCS})
if(KDE4_BUILD_TESTS)
kde4_add_executable(synchttpsubmittest ${synchttpsubmittest_SRCS})
target_link_libraries(synchttpsubmittest ${KDE4_KDECORE_LIBS} kcddb )
endif(KDE4_BUILD_TESTS)
########### next target ###############
set(sitestest_SRCS sitestest.cpp )
kde4_automoc(${sitestest_SRCS})
if(KDE4_BUILD_TESTS)
kde4_add_executable(sitestest ${sitestest_SRCS})
target_link_libraries(sitestest ${KDE4_KDECORE_LIBS} kcddb )
endif(KDE4_BUILD_TESTS)
########### next target ###############
set(utf8test_SRCS utf8test.cpp )
kde4_automoc(${utf8test_SRCS})
if(KDE4_BUILD_TESTS)
kde4_add_executable(utf8test ${utf8test_SRCS})
target_link_libraries(utf8test ${KDE4_KDECORE_LIBS} kcddb )
endif(KDE4_BUILD_TESTS)
########### next target ###############
set(musicbrainztest_SRCS musicbrainztest.cpp )
kde4_automoc(${musicbrainztest_SRCS})
if(KDE4_BUILD_TESTS)
kde4_add_executable(musicbrainztest ${musicbrainztest_SRCS})
target_link_libraries(musicbrainztest ${KDE4_KDECORE_LIBS} kcddb QtTest_debug )
endif(KDE4_BUILD_TESTS)
########### next target ###############
set(cdinfotest_SRCS cdinfotest.cpp )
kde4_automoc(${cdinfotest_SRCS})
if(KDE4_BUILD_TESTS)
kde4_add_executable(cdinfotest ${cdinfotest_SRCS})
target_link_libraries(cdinfotest ${KDE4_KDECORE_LIBS} kcddb QtTest_debug )
endif(KDE4_BUILD_TESTS)
########### install files ###############
kde4_footer()
#original Makefile.am contents follow:
#INCLUDES = -I$(top_srcdir) -I$(top_builddir)/libkcddb $(all_includes)
#
#check_PROGRAMS = syncsmtpsubmittest asyncsmtpsubmittest asynchttplookuptest \
# asynccddblookuptest synccddblookuptest synchttplookuptest \
# asynchttpsubmittest synchttpsubmittest sitestest utf8test \
# musicbrainztest cdinfotest
#
#AM_LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS) $(KDE_RPATH)
#
#syncsmtpsubmittest_SOURCES = syncsmtpsubmittest.cpp
#syncsmtpsubmittest_LDFLAGS = $(all_libraries)
#syncsmtpsubmittest_LDADD = $(top_builddir)/libkcddb/libkcddb.la
#
#asyncsmtpsubmittest_SOURCES = asyncsmtpsubmittest.cpp
#asyncsmtpsubmittest_LDFLAGS = $(all_libraries)
#asyncsmtpsubmittest_LDADD = $(top_builddir)/libkcddb/libkcddb.la
#
#asynchttplookuptest_SOURCES = asynchttplookuptest.cpp
#asynchttplookuptest_LDFLAGS = $(all_libraries)
#asynchttplookuptest_LDADD = $(top_builddir)/libkcddb/libkcddb.la -lQtTest_debug
#
#asynccddblookuptest_SOURCES = asynccddblookuptest.cpp
#asynccddblookuptest_LDFLAGS = $(all_libraries)
#asynccddblookuptest_LDADD = $(top_builddir)/libkcddb/libkcddb.la
#
#synchttplookuptest_SOURCES = synchttplookuptest.cpp
#synchttplookuptest_LDFLAGS = $(all_libraries)
#synchttplookuptest_LDADD = $(top_builddir)/libkcddb/libkcddb.la
#
#synccddblookuptest_SOURCES = synccddblookuptest.cpp
#synccddblookuptest_LDFLAGS = $(all_libraries)
#synccddblookuptest_LDADD = $(top_builddir)/libkcddb/libkcddb.la -lQtTest_debug
#
#synchttpsubmittest_SOURCES = synchttpsubmittest.cpp
#synchttpsubmittest_LDFLAGS = $(all_libraries)
#synchttpsubmittest_LDADD = $(top_builddir)/libkcddb/libkcddb.la
#
#asynchttpsubmittest_SOURCES = asynchttpsubmittest.cpp
#asynchttpsubmittest_LDFLAGS = $(all_libraries)
#asynchttpsubmittest_LDADD = $(top_builddir)/libkcddb/libkcddb.la
#
#musicbrainztest_SOURCES = musicbrainztest.cpp
#musicbrainztest_LDFLAGS = $(all_libraries)
#musicbrainztest_LDADD = $(top_builddir)/libkcddb/libkcddb.la -lQtTest_debug
#
#utf8test_SOURCES = utf8test.cpp
#utf8test_LDFLAGS = $(all_libraries)
#utf8test_LDADD = $(top_builddir)/libkcddb/libkcddb.la
#
#sitestest_SOURCES = sitestest.cpp
#sitestest_LDFLAGS = $(all_libraries)
#sitestest_LDADD = $(top_builddir)/libkcddb/libkcddb.la
#
#cdinfotest_SOURCES = cdinfotest.cpp
#cdinfotest_LDFLAGS = $(all_libraries)
#cdinfotest_LDADD = $(top_builddir)/libkcddb/libkcddb.la -lQtTest_debug
#
#TESTS = synccddblookuptest cdinfotest asynchttplookuptest musicbrainztest
#
#METASOURCES = AUTO
#
......@@ -22,7 +22,7 @@
#include <kcmdlineargs.h>
#include "libkcddb/client.h"
#include "libkcddb/config.h"
#include "libkcddb/kcddbconfig.h"
#include "libkcddb/submit.h"
int
......
......@@ -22,7 +22,7 @@
#include <kcmdlineargs.h>
#include "libkcddb/client.h"
#include "libkcddb/config.h"
#include "libkcddb/kcddbconfig.h"
#include "libkcddb/submit.h"
int
......
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