7 files changed, 6 insertions, 100 deletions
diff --git a/kaffeine/src/input/disc/Makefile.am b/kaffeine/src/input/disc/Makefile.am
deleted file mode 100644
index fe91515..0000000
--- a/kaffeine/src/input/disc/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-METASOURCES = AUTO
-
-SUBDIRS = plugins .
-
-noinst_LTLIBRARIES = libkaffeinedisc.la
-
-noinst_HEADERS = cddb.h \
-	disc.h \
-	paranoia.h
-
-INCLUDES = -I$(top_srcdir)/kaffeine/src/input/ \
-	-I$(top_builddir)/kaffeine/src/input/ \
-	-I$(top_srcdir)/kaffeine/src/ \
-	-I$(top_srcdir)/kaffeine/src/player-parts/kaffeine-part \
-	-I$(top_srcdir)/kaffeine/src/input/disc/plugins \
-	$(all_includes) 
-
-libkaffeinedisc_la_SOURCES = disc.cpp \
-	cddb.cpp \
-	paranoia.cpp \
-	paranoiasettings.ui
-
-libkaffeinedisc_la_LDFLAGS = $(KDE_RPATH) \
-	$(all_libraries) \
-	-L$(top_srcdir)/kaffeine/src/input \
-	-L$(top_srcdir)/kaffeine/src/input/disc/plugins
-
-libkaffeinedisc_la_LIBADD = $(top_builddir)/kaffeine/src/input/libkaffeineinput.la \
-	$(top_builddir)/kaffeine/src/player-parts/kaffeine-part/libkaffeinepart.la \
-	$(top_builddir)/kaffeine/src/input/disc/plugins/libkaffeineaudioencoder.la \
-	-lcdio_cdda -lcdio_paranoia
-
-# this is where the XML-GUI resource file goes
-shellrcdir   = $(kde_datadir)/kaffeine
-shellrc_DATA = kaffeinedisc.rc
-
diff --git a/kaffeine/src/input/disc/plugins/CMakeLists.txt b/kaffeine/src/input/disc/plugins/CMakeLists.txt
index 3efdd45..81e4656 100644
--- a/kaffeine/src/input/disc/plugins/CMakeLists.txt
+++ b/kaffeine/src/input/disc/plugins/CMakeLists.txt
@@ -47,8 +47,8 @@ install(
     DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}
 )
 
-install(
-   FILES kaffeineaudioencoder.desktop
+tde_create_translated_desktop(
+   SOURCE kaffeineaudioencoder.desktop
    DESTINATION ${SERVICETYPES_INSTALL_DIR}
 )
 
diff --git a/kaffeine/src/input/disc/plugins/Makefile.am b/kaffeine/src/input/disc/plugins/Makefile.am
deleted file mode 100644
index dab8353..0000000
--- a/kaffeine/src/input/disc/plugins/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-if with_lame
-    LAME_SUBDIR = mp3lame
-endif
-
-if with_oggvorbis
-    OGGVORBIS_SUBDIR = oggvorbis
-endif
-
-lib_LTLIBRARIES = libkaffeineaudioencoder.la
-
-METASOURCES = AUTO
-
-SUBDIRS = . $(LAME_SUBDIR) $(OGGVORBIS_SUBDIR)
-
-INCLUDES = -I$(top_srcdir)/kaffeine/src $(all_includes)
-
-kaffeineincludedir = $(includedir)/kaffeine
-kaffeineinclude_HEADERS = kaffeineaudioencoder.h
-
-libkaffeineaudioencoder_la_SOURCES = kaffeineaudioencoder.cpp
-libkaffeineaudioencoder_la_LIBADD  = $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT) $(LIB_OGGVORBIS)
-libkaffeineaudioencoder_la_LDFLAGS = $(all_libraries) -version-info 0:1:0 -no-undefined
-
-kde_servicetypes_DATA = kaffeineaudioencoder.desktop
diff --git a/kaffeine/src/input/disc/plugins/mp3lame/CMakeLists.txt b/kaffeine/src/input/disc/plugins/mp3lame/CMakeLists.txt
index e696f4f..30968f2 100644
--- a/kaffeine/src/input/disc/plugins/mp3lame/CMakeLists.txt
+++ b/kaffeine/src/input/disc/plugins/mp3lame/CMakeLists.txt
@@ -33,7 +33,7 @@ tde_add_kpart( libkaffeinemp3lame AUTOMOC
 
 ##### other data
 
-install(
-    FILES kaffeinemp3lame.desktop
+tde_create_translated_desktop(
+    SOURCE kaffeinemp3lame.desktop
     DESTINATION ${SERVICES_INSTALL_DIR}
 )
diff --git a/kaffeine/src/input/disc/plugins/mp3lame/Makefile.am b/kaffeine/src/input/disc/plugins/mp3lame/Makefile.am
deleted file mode 100644
index 4b05e2e..0000000
--- a/kaffeine/src/input/disc/plugins/mp3lame/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-kde_module_LTLIBRARIES = libkaffeinemp3lame.la
-
-INCLUDES = -I$(top_srcdir)/kaffeine/src/ -I$(top_srcdir)/kaffeine/src/input/disc/plugins/ $(all_includes)
-
-METASOURCES = AUTO
-
-kaffeineincludedir = $(includedir)/kaffeine
-
-noinst_HEADERS =  klameenc.h
-
-libkaffeinemp3lame_la_SOURCES = klameenc.cpp lameconfig.ui
-libkaffeinemp3lame_la_LIBADD  = ../libkaffeineaudioencoder.la $(LIB_LAME) $(LIB_TDECORE)
-libkaffeinemp3lame_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -avoid-version -no-undefined
-
-# this is where the desktop file will go
-partdesktopdir   = $(kde_servicesdir)
-partdesktop_DATA = kaffeinemp3lame.desktop
diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/CMakeLists.txt b/kaffeine/src/input/disc/plugins/oggvorbis/CMakeLists.txt
index 2659f4e..1aeae20 100644
--- a/kaffeine/src/input/disc/plugins/oggvorbis/CMakeLists.txt
+++ b/kaffeine/src/input/disc/plugins/oggvorbis/CMakeLists.txt
@@ -38,7 +38,7 @@ tde_add_kpart( libkaffeineoggvorbis AUTOMOC
 
 ##### other data
 
-install(
-    FILES kaffeineoggvorbis.desktop
+tde_create_translated_desktop(
+    SOURCE kaffeineoggvorbis.desktop
     DESTINATION ${SERVICES_INSTALL_DIR}
 )
diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/Makefile.am b/kaffeine/src/input/disc/plugins/oggvorbis/Makefile.am
deleted file mode 100644
index 90e8338..0000000
--- a/kaffeine/src/input/disc/plugins/oggvorbis/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-kde_module_LTLIBRARIES = libkaffeineoggvorbis.la
-
-INCLUDES = -I$(top_srcdir)/kaffeine/src/ -I$(top_srcdir)/kaffeine/src/input/disc/plugins/ $(all_includes) $(CFLAGS_OGGVORBIS)
-
-METASOURCES = AUTO
-
-kaffeineincludedir = $(includedir)/kaffeine
-
-noinst_HEADERS =  koggenc.h
-
-libkaffeineoggvorbis_la_SOURCES = koggenc.cpp oggconfig.ui
-libkaffeineoggvorbis_la_LIBADD  = ../libkaffeineaudioencoder.la $(LIB_OGGVORBIS)
-libkaffeineoggvorbis_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -avoid-version -no-undefined
-
-# this is where the desktop file will go
-partdesktopdir   = $(kde_servicesdir)
-partdesktop_DATA = kaffeineoggvorbis.desktop