diff options
Diffstat (limited to 'kaffeine/src')
32 files changed, 17 insertions, 542 deletions
diff --git a/kaffeine/src/CMakeLists.txt b/kaffeine/src/CMakeLists.txt index f77334f..7dbe0d2 100644 --- a/kaffeine/src/CMakeLists.txt +++ b/kaffeine/src/CMakeLists.txt @@ -66,11 +66,11 @@ install( ) install( - FILES kaffeine.profile.xml + FILES ${PROJECT_NAME}.profile.xml DESTINATION ${DATA_INSTALL_DIR}/profiles ) -install( - FILES kaffeine.desktop kaffeine-iso.desktop +tde_create_translated_desktop( + SOURCE ${PROJECT_NAME}.desktop ${PROJECT_NAME}-iso.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) diff --git a/kaffeine/src/Makefile.am b/kaffeine/src/Makefile.am deleted file mode 100644 index 952b4ed..0000000 --- a/kaffeine/src/Makefile.am +++ /dev/null @@ -1,53 +0,0 @@ -SUBDIRS = player-parts input - -bin_PROGRAMS = kaffeine - -INCLUDES = -I$(top_srcdir)/kaffeine/src/input/ \ - -I$(top_srcdir)/kaffeine/src/input/dvb/ \ - -I$(top_builddir)/kaffeine/src/input/dvb/plugins/epg \ - -I$(top_srcdir)/kaffeine/src/input/dvb/plugins/epg \ - -I$(top_builddir)/kaffeine/src/input/dvb/ \ - -I$(top_builddir)/kaffeine/src/input/disc/ \ - -I$(top_srcdir)/kaffeine/src/input/disc/ \ - -I$(top_srcdir)/kaffeine/src/input/disc/plugins \ - -I$(top_srcdir)/kaffeine/src/player-parts/kaffeine-part \ - -I$(top_srcdir)/kaffeine/src/input/dvbclient/ \ - -I$(top_srcdir)/kaffeine/src/input/audiobrowser/ \ - $(all_includes) $(CFLAGS_DPMS) $(CFLAGS_XTEST) - -METASOURCES = AUTO - -kaffeine_SOURCES = main.cpp \ - kaffeine.cpp \ - startwindow.cpp \ - pref.cpp \ - kaffeineiface.skel \ - systemtray.cpp \ - instwizard.cpp\ - tdemultitabbar.cpp \ - inputmanager.cpp - -kaffeine_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor - -if with_dvb - DVBLIB = input/dvb/libkaffeinedvb.la -endif - -kaffeine_LDADD = $(LIB_TDEPARTS) \ - player-parts/kaffeine-part/libkaffeinepart.la \ - input/dvbclient/libkaffeinedvbclient.la \ - input/audiobrowser/libkaffeineaudiobrowser.la \ - input/disc/libkaffeinedisc.la \ - $(DVBLIB) $(LIB_DPMS) $(LIB_XTEST) - -# this is where the desktop file will go -shelldesktopdir = $(xdg_appsdir) -shelldesktop_DATA = kaffeine.desktop - -# this is where the XML-GUI resource file goes -shellrcdir = $(kde_datadir)/kaffeine -shellrc_DATA = kaffeineui.rc - -# this is where profile file for KDE-LIRC goes -profiledata_DATA = kaffeine.profile.xml -profiledatadir = $(kde_datadir)/profiles diff --git a/kaffeine/src/input/Makefile.am b/kaffeine/src/input/Makefile.am deleted file mode 100644 index 75b2ab7..0000000 --- a/kaffeine/src/input/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -noinst_LTLIBRARIES = libkaffeineinput.la - -if with_dvb - DVB_SUBDIR = dvb -endif - -SUBDIRS = . dvbclient audiobrowser disc $(DVB_SUBDIR) - -INCLUDES = -I$(top_srcdir)/kaffeine/src \ - -I$(top_srcdir)/kaffeine/src/player-parts/kaffeine-part $(all_includes) - -noinst_HEADERS = kaffeineinput.h - -METASOURCES = AUTO - -libkaffeineinput_la_SOURCES = kaffeineinput.cpp - -libkaffeineinput_la_LDFLAGS = $(KDE_RPATH) \ - $(all_libraries) - -libkaffeineinput_la_LIBADD = $(top_builddir)/kaffeine/src/player-parts/kaffeine-part/libkaffeinepart.la diff --git a/kaffeine/src/input/audiobrowser/Makefile.am b/kaffeine/src/input/audiobrowser/Makefile.am deleted file mode 100644 index 451ff96..0000000 --- a/kaffeine/src/input/audiobrowser/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -METASOURCES = AUTO - -noinst_LTLIBRARIES = libkaffeineaudiobrowser.la - -INCLUDES = -I$(top_srcdir)/kaffeine/src/input/ \ - -I$(top_srcdir)/kaffeine/src/ \ - $(all_includes) \ - -I$(top_srcdir)/kaffeine/src/player-parts/kaffeine-part - -libkaffeineaudiobrowser_la_SOURCES = playlist.cpp \ - playlistitem.cpp \ - urllistview.cpp \ - googlefetcher.cpp \ - googlefetcherdialog.cpp - -KDE_CXXFLAGS = $(USE_EXCEPTIONS) - -libkaffeineaudiobrowser_la_LDFLAGS = $(KDE_RPATH) \ - $(all_libraries) \ - -L$(top_srcdir)/kaffeine/src/input - -libkaffeineaudiobrowser_la_LIBADD = $(top_builddir)/kaffeine/src/input/libkaffeineinput.la \ - $(top_builddir)/kaffeine/src/player-parts/kaffeine-part/libkaffeinepart.la \ - $(LIB_TDEHTML) - -# this is where the XML-GUI resource file goes -shellrcdir = $(kde_datadir)/kaffeine -shellrc_DATA = kaffeineplaylist.rc 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 diff --git a/kaffeine/src/input/dvb/Makefile.am b/kaffeine/src/input/dvb/Makefile.am deleted file mode 100644 index d5b1035..0000000 --- a/kaffeine/src/input/dvb/Makefile.am +++ /dev/null @@ -1,83 +0,0 @@ -SUBDIRS = lib plugins . - -INCLUDES = -I$(top_srcdir)/kaffeine/src/input/ \ - -I$(top_srcdir)/kaffeine/src/input/dvb/lib \ - -I$(top_srcdir)/kaffeine/src/input/dvb/plugins/stream \ - -I$(top_srcdir)/kaffeine/src/input/dvb/plugins/epg \ - -I$(top_srcdir)/kaffeine/src \ - $(all_includes) - -METASOURCES = AUTO - -noinst_LTLIBRARIES = libkaffeinedvb.la - -libkaffeinedvb_la_SOURCES = audioeditor.cpp \ - audioeditor.h \ - audioeditorui.ui \ - channeldesc.cpp \ - channeldesc.h \ - channeleditor.cpp \ - channeleditor.h \ - channeleditorui.ui \ - dvbconfig.cpp \ - dvbconfig.h \ - dvbevents.cpp \ - dvbevents.h \ - dvbout.cpp \ - dvbout.h \ - dvbpanel.cpp \ - dvbpanel.h \ - dvbsection.h \ - dvbsi.cpp \ - dvbsi.h \ - camdialog.ui \ - cammenudialog.ui \ - dvbstream.cpp \ - dvbstream.h \ - gdvb.h \ - kevents.cpp \ - kevents.h \ - kgradprogress.cpp \ - kgradprogress.h \ - krecord.cpp \ - krecord.h \ - ktimereditor.cpp \ - ktimereditor.h \ - scandialog.cpp \ - scandialog.h \ - scandialogui.ui \ - sender.cpp \ - sender.h \ - ts2rtp.cpp \ - ts2rtp.h \ - subeditorui.ui \ - subeditor.cpp \ - subeditor.h \ - broadcasteditorui.ui \ - broadcasteditor.cpp \ - broadcasteditor.h \ - cleaner.cpp \ - cleaner.h \ - crontimerui.ui \ - crontimer.cpp \ - crontimer.h \ - dvbcam.cpp \ - dvbcam.h - -libkaffeinedvb_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \ - -L$(top_srcdir)/kaffeine/src/input \ - -L$(top_srcdir)/kaffeine/src/input/dvb/plugins/stream \ - -L$(top_srcdir)/kaffeine/src/input/dvb/plugins/epg \ - ./lib/libdvbapi \ - ./lib/libdvben50221 \ - ./lib/libucsi - -libkaffeinedvb_la_LIBADD = \ - $(top_builddir)/kaffeine/src/input/dvb/plugins/stream/libkaffeinedvbplugin.la \ - $(top_builddir)/kaffeine/src/input/dvb/plugins/epg/libkaffeineepgplugin.la \ - $(top_builddir)/kaffeine/src/input/libkaffeineinput.la \ - ./lib/libdvbapi/libdvbapi.la ./lib/libdvben50221/libdvben50221.la ./lib/libucsi/libucsi.la - -# this is where the XML-GUI resource file goes -shellrcdir = $(kde_datadir)/kaffeine -shellrc_DATA = kaffeinedvb.rc diff --git a/kaffeine/src/input/dvb/lib/Makefile.am b/kaffeine/src/input/dvb/lib/Makefile.am deleted file mode 100644 index aa4701c..0000000 --- a/kaffeine/src/input/dvb/lib/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = libdvbapi libdvben50221 libucsi diff --git a/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am b/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am deleted file mode 100644 index 9963cd4..0000000 --- a/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -noinst_LTLIBRARIES = libdvbapi.la - -INCLUDES = -I$(top_srcdir)/kaffeine/src/input/dvb/lib - -libdvbapi_la_SOURCES = dvbaudio.c \ - dvbca.c \ - dvbdemux.c \ - dvbfe.c \ - dvbnet.c \ - dvbvideo.c - -CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC diff --git a/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am b/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am deleted file mode 100644 index 6942c02..0000000 --- a/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -noinst_LTLIBRARIES = libdvben50221.la - -INCLUDES = -I$(top_srcdir)/kaffeine/src/input/dvb/lib - -libdvben50221_la_SOURCES = asn_1.c \ - en50221_app_ai.c \ - en50221_app_auth.c \ - en50221_app_ca.c \ - en50221_app_datetime.c \ - en50221_app_dvb.c \ - en50221_app_epg.c \ - en50221_app_lowspeed.c \ - en50221_app_mmi.c \ - en50221_app_rm.c \ - en50221_app_smartcard.c \ - en50221_app_teletext.c \ - en50221_app_utils.c \ - en50221_session.c \ - en50221_transport.c \ - en50221_stdcam.c \ - en50221_stdcam_llci.c \ - en50221_stdcam_hlci.c - -CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC diff --git a/kaffeine/src/input/dvb/lib/libucsi/Makefile.am b/kaffeine/src/input/dvb/lib/libucsi/Makefile.am deleted file mode 100644 index 36f905e..0000000 --- a/kaffeine/src/input/dvb/lib/libucsi/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -noinst_LTLIBRARIES = libucsi.la - -SUBDIRS = dvb mpeg atsc . - -INCLUDES = -I$(top_srcdir)/kaffeine/src/input/dvb/lib - -libucsi_la_SOURCES = crc32.c \ - section_buf.c \ - transport_packet.c - -libucsi_la_LDFLAGS = ./mpeg \ - ./dvb \ - /atsc - -libucsi_la_LIBADD = ./mpeg/libdvbmpeg.la \ - ./dvb/libdvbdvb.la \ - ./atsc/libdvbatsc.la - -CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC diff --git a/kaffeine/src/input/dvb/lib/libucsi/atsc/Makefile.am b/kaffeine/src/input/dvb/lib/libucsi/atsc/Makefile.am deleted file mode 100644 index 2df5d3b..0000000 --- a/kaffeine/src/input/dvb/lib/libucsi/atsc/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -noinst_LTLIBRARIES = libdvbatsc.la - -INCLUDES = -I$(top_srcdir)/kaffeine/src/input/dvb/lib - -libdvbatsc_la_SOURCES = atsc_text.c \ - cvct_section.c \ - dccsct_section.c \ - dcct_section.c \ - eit_section.c \ - ett_section.c \ - mgt_section.c \ - rrt_section.c \ - stt_section.c \ - tvct_section.c \ - types.c - -CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC diff --git a/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am b/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am deleted file mode 100644 index b358273..0000000 --- a/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -noinst_LTLIBRARIES = libdvbdvb.la - -INCLUDES = -I$(top_srcdir)/kaffeine/src/input/dvb/lib - -libdvbdvb_la_SOURCES = bat_section.c \ - dit_section.c \ - eit_section.c \ - int_section.c \ - nit_section.c \ - rst_section.c \ - sdt_section.c \ - sit_section.c \ - st_section.c \ - tdt_section.c \ - tot_section.c \ - tva_container_section.c \ - types.c - -CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC diff --git a/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am b/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am deleted file mode 100644 index a8d0c32..0000000 --- a/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -noinst_LTLIBRARIES = libdvbmpeg.la - -INCLUDES = -I$(top_srcdir)/kaffeine/src/input/dvb/lib - -libdvbmpeg_la_SOURCES = cat_section.c \ - metadata_section.c \ - odsmt_section.c \ - pat_section.c \ - pmt_section.c \ - tsdt_section.c - -CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC diff --git a/kaffeine/src/input/dvb/plugins/Makefile.am b/kaffeine/src/input/dvb/plugins/Makefile.am deleted file mode 100644 index 63f5318..0000000 --- a/kaffeine/src/input/dvb/plugins/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = epg stream
\ No newline at end of file diff --git a/kaffeine/src/input/dvb/plugins/epg/CMakeLists.txt b/kaffeine/src/input/dvb/plugins/epg/CMakeLists.txt index 6b36d4c..de6e320 100644 --- a/kaffeine/src/input/dvb/plugins/epg/CMakeLists.txt +++ b/kaffeine/src/input/dvb/plugins/epg/CMakeLists.txt @@ -34,8 +34,8 @@ tde_add_library( kaffeineepgplugin SHARED AUTOMOC ##### other data -install( - FILES kaffeineepgplugin.desktop +tde_create_translated_desktop( + SOURCE kaffeineepgplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) diff --git a/kaffeine/src/input/dvb/plugins/epg/Makefile.am b/kaffeine/src/input/dvb/plugins/epg/Makefile.am deleted file mode 100644 index 33babab..0000000 --- a/kaffeine/src/input/dvb/plugins/epg/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -lib_LTLIBRARIES = libkaffeineepgplugin.la - -METASOURCES = AUTO - -INCLUDES = -I$(top_srcdir)/kaffeine/src/input/dvb \ - -I$(top_srcdir)/kaffeine/src \ - $(all_includes) - -kaffeineincludedir = $(includedir)/kaffeine -kaffeineinclude_HEADERS = kaffeinedvbevents.h kaffeinedvbsection.h - -libkaffeineepgplugin_la_SOURCES = kaffeinedvbevents.cpp kaffeinedvbsection.cpp -libkaffeineepgplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) -libkaffeineepgplugin_la_LDFLAGS = $(all_libraries) -version-info 0:1:0 -no-undefined - -kde_servicetypes_DATA = kaffeineepgplugin.desktop diff --git a/kaffeine/src/input/dvb/plugins/stream/CMakeLists.txt b/kaffeine/src/input/dvb/plugins/stream/CMakeLists.txt index 6c669cb..e5b49ae 100644 --- a/kaffeine/src/input/dvb/plugins/stream/CMakeLists.txt +++ b/kaffeine/src/input/dvb/plugins/stream/CMakeLists.txt @@ -33,8 +33,8 @@ tde_add_library( kaffeinedvbplugin SHARED AUTOMOC ##### other data -install( - FILES kaffeinedvbplugin.desktop +tde_create_translated_desktop( + SOURCE kaffeinedvbplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) diff --git a/kaffeine/src/input/dvb/plugins/stream/Makefile.am b/kaffeine/src/input/dvb/plugins/stream/Makefile.am deleted file mode 100644 index 033d4b8..0000000 --- a/kaffeine/src/input/dvb/plugins/stream/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -lib_LTLIBRARIES = libkaffeinedvbplugin.la - -METASOURCES = AUTO - -INCLUDES = -I$(top_srcdir)/kaffeine/src/input/dvb \ - -I$(top_srcdir)/kaffeine/src \ - $(all_includes) - -kaffeineincludedir = $(includedir)/kaffeine -kaffeineinclude_HEADERS = kaffeinedvbplugin.h - -libkaffeinedvbplugin_la_SOURCES = kaffeinedvbplugin.cpp -libkaffeinedvbplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT) -libkaffeinedvbplugin_la_LDFLAGS = $(all_libraries) -version-info 0:1:0 -no-undefined - -kde_servicetypes_DATA = kaffeinedvbplugin.desktop diff --git a/kaffeine/src/input/dvbclient/Makefile.am b/kaffeine/src/input/dvbclient/Makefile.am deleted file mode 100644 index fb4a110..0000000 --- a/kaffeine/src/input/dvbclient/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -INCLUDES = -I$(top_srcdir)/kaffeine/src/input/ \ - $(all_includes) - -METASOURCES = AUTO - -noinst_LTLIBRARIES = libkaffeinedvbclient.la - -libkaffeinedvbclient_la_SOURCES = cdchannel.cpp \ - cdchannel.h \ - cdwidget.cpp \ - cdwidget.h \ - cddump.cpp \ - cddump.h \ - cdlisten.cpp \ - cdlisten.h \ - cdcleaner.cpp \ - cdcleaner.h - -libkaffeinedvbclient_la_LDFLAGS = $(KDE_RPATH) \ - $(all_libraries) \ - -L$(top_srcdir)/kaffeine/src/input - -libkaffeinedvbclient_la_LIBADD = $(top_builddir)/kaffeine/src/input/libkaffeineinput.la diff --git a/kaffeine/src/player-parts/Makefile.am b/kaffeine/src/player-parts/Makefile.am deleted file mode 100644 index 81311d2..0000000 --- a/kaffeine/src/player-parts/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -if with_gstreamer - GST_SUBDIR = gstreamer-part -endif - -SUBDIRS = kaffeine-part xine-part $(GST_SUBDIR) diff --git a/kaffeine/src/player-parts/dummy-part/Makefile.am b/kaffeine/src/player-parts/dummy-part/Makefile.am deleted file mode 100644 index 5df27f0..0000000 --- a/kaffeine/src/player-parts/dummy-part/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ - -kde_module_LTLIBRARIES = libdummypart.la - -INCLUDES = -I$(top_srcdir)/kaffeine/src/player-parts/ $(all_includes) - -METASOURCES = AUTO - -noinst_HEADERS = dummy_part.h - -libdummypart_la_SOURCES = dummy_part.cpp -libdummypart_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEFILE) ../libkaffeinepart.la -libdummypart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -avoid-version -no-undefined - -# this is where the desktop file will go -partdesktopdir = $(kde_servicesdir) -partdesktop_DATA = dummy_part.desktop - -# this is where the part's XML-GUI resource file goes -partrcdir = $(kde_datadir)/dummypart -partrc_DATA = dummy_part.rc
\ No newline at end of file diff --git a/kaffeine/src/player-parts/gstreamer-part/CMakeLists.txt b/kaffeine/src/player-parts/gstreamer-part/CMakeLists.txt index 1834a02..4058068 100644 --- a/kaffeine/src/player-parts/gstreamer-part/CMakeLists.txt +++ b/kaffeine/src/player-parts/gstreamer-part/CMakeLists.txt @@ -46,8 +46,8 @@ tde_add_kpart( libgstreamerpart AUTOMOC ##### other data -install( - FILES gstreamer_part.desktop +tde_create_translated_desktop( + SOURCE gstreamer_part.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) @@ -60,4 +60,3 @@ install( FILES gstreamer.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/16x16/apps ) - diff --git a/kaffeine/src/player-parts/gstreamer-part/Makefile.am b/kaffeine/src/player-parts/gstreamer-part/Makefile.am deleted file mode 100644 index 16cbbbd..0000000 --- a/kaffeine/src/player-parts/gstreamer-part/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -kde_module_LTLIBRARIES = libgstreamerpart.la - -INCLUDES = -I$(top_srcdir)/kaffeine/src/player-parts/kaffeine-part -I$(top_srcdir)/kaffeine/src/ $(all_includes) $(CFLAGS_GSTREAMER) - -METASOURCES = AUTO - -noinst_HEADERS = gstreamer_part.h timer.h video.h videosettings.h gstreamerconfig.h - -libgstreamerpart_la_SOURCES = gstreamer_part.cpp video.cpp timer.cpp videosettings.cpp gstreamerconfig.cpp -libgstreamerpart_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEFILE) ../kaffeine-part/libkaffeinepart.la -libgstreamerpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_GSTREAMER) $(LIB_GSTOVERLAY) $(all_libraries) -avoid-version -no-undefined - -# this is where the desktop file will go -partdesktopdir = $(kde_servicesdir) -partdesktop_DATA = gstreamer_part.desktop - -# this is where the part's XML-GUI resource file goes -partrcdir = $(kde_datadir)/gstreamerpart -partrc_DATA = gstreamer_part.rc - -icondir = $(kde_icondir)/hicolor/16x16/apps/ -icon_DATA = gstreamer.png diff --git a/kaffeine/src/player-parts/kaffeine-part/Makefile.am b/kaffeine/src/player-parts/kaffeine-part/Makefile.am deleted file mode 100644 index 7555424..0000000 --- a/kaffeine/src/player-parts/kaffeine-part/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -lib_LTLIBRARIES = libkaffeinepart.la - -INCLUDES = $(all_includes) - -kaffeineincludedir = $(includedir)/kaffeine -kaffeineinclude_HEADERS = kaffeinepart.h mrl.h - -METASOURCES = AUTO - -libkaffeinepart_la_SOURCES = kaffeinepart.cpp mrl.cpp playlistimport.cpp -libkaffeinepart_la_LIBADD = $(LIB_TDEPARTS) $(all_libraries) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) -libkaffeinepart_la_LDFLAGS = -no-undefined -avoid-version diff --git a/kaffeine/src/player-parts/xine-part/CMakeLists.txt b/kaffeine/src/player-parts/xine-part/CMakeLists.txt index 09e8d53..2683a2a 100644 --- a/kaffeine/src/player-parts/xine-part/CMakeLists.txt +++ b/kaffeine/src/player-parts/xine-part/CMakeLists.txt @@ -49,8 +49,8 @@ tde_add_kpart( libxinepart AUTOMOC ##### other data -install( - FILES xine_part.desktop +tde_create_translated_desktop( + SOURCE xine_part.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) diff --git a/kaffeine/src/player-parts/xine-part/Makefile.am b/kaffeine/src/player-parts/xine-part/Makefile.am deleted file mode 100644 index b87656b..0000000 --- a/kaffeine/src/player-parts/xine-part/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -kde_module_LTLIBRARIES = libxinepart.la - -INCLUDES = -I$(top_srcdir)/kaffeine/src/ -I$(top_srcdir)/kaffeine/src/player-parts/kaffeine-part $(all_includes) $(CFLAGS_XINERAMA) $(CFLAGS_XINE) $(CFLAGS_XCB) - -METASOURCES = AUTO - -kaffeineincludedir = $(includedir)/kaffeine -kaffeineinclude_HEADERS = xine_part.h xine_part_iface.h - -noinst_HEADERS = xine_part_iface.h kxinewidget.h postfilter.h deinterlacequality.h videosettings.h \ - filterdialog.h screenshotpreview.h xineconfig.h positionslider.h equalizer.h - -libxinepart_la_SOURCES = xine_part.cpp kxinewidget.cpp postfilter.cpp deinterlacequality.cpp \ - videosettings.cpp filterdialog.cpp screenshotpreview.cpp xineconfig.cpp positionslider.cpp \ - equalizer.cpp xine_part_iface.skel -libxinepart_la_LIBADD = $(LIB_XINERAMA) $(LIB_XINE) $(LIB_XCB) ../kaffeine-part/libkaffeinepart.la -libxinepart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPRINT) -avoid-version -no-undefined - - -# this is where the desktop file will go -partdesktopdir = $(kde_servicesdir) -partdesktop_DATA = xine_part.desktop - -# this is where the part's XML-GUI resource file goes -partrcdir = $(kde_datadir)/kaffeine -partrc_DATA = xine_part.rc |