From kde-commits Fri Feb 02 09:29:44 2007 From: Laurent Montel Date: Fri, 02 Feb 2007 09:29:44 +0000 To: kde-commits Subject: extragear/multimedia/amarok/src Message-Id: <1170408584.870001.13563.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=117040933103136 SVN commit 629296 by mlaurent: Fix install files. Rename files with typo. Remove not necessary files M +1 -37 amarokcore/CMakeLists.txt D analyzers/CMakeLists.txt M +1 -20 data/CMakeLists.txt A device/CMakeLists.txt device/CMakteLists.txt#629291 D device/CMakteLists.txt M +3 -4 device/massstorage/CMakeLists.txt M +1 -57 images/CMakeLists.txt M +1 -7 images/icons/CMakeLists.txt --- trunk/extragear/multimedia/amarok/src/amarokcore/CMakeLists.txt #629295:629296 @@ -1,37 +1 @@ - - -install_files( ${KCFG_INSTALL_DIR} FILES amarok.kcfg ) - - - -#original Makefile.am contents follow: - -#INCLUDES = \ -# -I$(top_builddir)/amarok/src \ -# -I$(top_builddir)/amarok/src/amarokcore \ -# -I$(top_srcdir)/amarok/src \ -# -I$(top_srcdir)/amarok/src/klegendary \ -# -I$(top_srcdir)/amarok/src/engine \ -# -I$(top_srcdir)/amarok/src/plugin \ -# -I$(top_srcdir)/amarok/src/statusbar \ -# -I$(top_srcdir)/amarok/src/mediadevice \ -# $(all_includes) -# -#noinst_LTLIBRARIES = \ -# libamarokcore.la -# -#noinst_HEADERS = \ -# amarokconfig.h \ -# amarokdcophandler.h -# -#libamarokcore_la_SOURCES = \ -# amarokdcopiface.skel \ -# amarokdcophandler.cpp \ -# amarokconfig.kcfgc \ -# crashhandler.cpp -# -#METASOURCES = \ -# AUTO -# -#kde_kcfg_DATA = \ -# amarok.kcfg +install(FILES amarok.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) --- trunk/extragear/multimedia/amarok/src/data/CMakeLists.txt #629295:629296 @@ -1,22 +1,3 @@ -########### install files ############### +install( FILES Cool-Streams.xml amaroK_1.4_welcome.ogg ball.png dot.png equalizer_presets.xml firstrun.m3u grid.png wirl1.png wirl2.png DESTINATION ${DATA_INSTALL_DIR}/amarok/data) -install_files( ${DATA_INSTALL_DIR}/amarok/data FILES Cool-Streams.xml amaroK_1.4_welcome.ogg ball.png dot.png equalizer_presets.xml firstrun.m3u grid.png wirl1.png wirl2.png ) - - - -#original Makefile.am contents follow: - -#amarokdatadir = \ -# $(kde_datadir)/amarok/data -# -#amarokdata_DATA = \ -# Cool-Streams.xml \ -# amaroK_1.4_welcome.ogg \ -# ball.png \ -# dot.png \ -# equalizer_presets.xml \ -# firstrun.m3u \ -# grid.png \ -# wirl1.png \ -# wirl2.png --- trunk/extragear/multimedia/amarok/src/device/massstorage/CMakeLists.txt #629295:629296 @@ -1,5 +1,4 @@ -include_directories( ${CMAKE_SOURCE_DIR}/amarok/src ${CMAKE_SOURCE_DIR}/amarok/s -rc/device ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ) +include_directories( ${CMAKE_SOURCE_DIR}/amarok/src ${CMAKE_SOURCE_DIR}/amarok/src/device ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ) ########### next target ############### @@ -14,10 +13,10 @@ target_link_libraries(libamarok_massstorage-device ${KDE4_KDECORE_LIBS} ) -install_targets(${PLUGIN_INSTALL_DIR} libamarok_massstorage-device ) +install(TARGETS libamarok_massstorage-device DESTINATION ${PLUGIN_INSTALL_DIR} ) ########### install files ############### -install_files( ${SERVICES_INSTALL_DIR} FILES amarok_massstorage-device.desktop ) +install(FILES amarok_massstorage-device.desktop DESTINATION ${SERVICES_INSTALL_DIR}) --- trunk/extragear/multimedia/amarok/src/images/CMakeLists.txt #629295:629296 @@ -3,60 +3,4 @@ ########### install files ############### -install_files( ${DATA_INSTALL_DIR}/amarok/images FILES amarok_cut.png amarok_rocks.jpg b_next.png b_pause.png b_play.png b_prev.png b_stop.png back_stars_grey.png currenttrack_bar_left.png currenttrack_bar_mid.png currenttrack_bar_right.png currenttrack_play.png currenttrack_pause.png currenttrack_stop.png currenttrack_stop_small.png currenttrack_repeat.png currenttrack_repeat_small.png description.png eq_active2.png eq_inactive2.png loading1.png loading2.png logo_web.png menu_sidepixmap.png more_albums.png musicbrainz.png nocover.png pl_active2.png pl_inactive2.png shadow_albumcover.png sbinner_stars.png smallstar.png splash_screen.jpg star.png time_minus.png time_plus.png vol_speaker.png volumeslider-gradient.png volumeslider-handle.png volumeslider-handle_glow.png volumeslid er-inset.png wizard_compact.png wizard_xmms.png xine_logo.png ) - - - -#original Makefile.am contents follow: - -#SUBDIRS = \ -# icons -# -#imagesdir = \ -# $(kde_datadir)/amarok/images -# -#images_DATA = \ -# amarok_cut.png \ -# amarok_rocks.jpg \ -# b_next.png \ -# b_pause.png \ -# b_play.png \ -# b_prev.png \ -# b_stop.png \ -# back_stars_grey.png \ -# currenttrack_bar_left.png \ -# currenttrack_bar_mid.png \ -# currenttrack_bar_right.png \ -# currenttrack_play.png \ -# currenttrack_pause.png \ -# currenttrack_stop.png \ -# currenttrack_stop_small.png \ -# currenttrack_repeat.png \ -# currenttrack_repeat_small.png \ -# description.png \ -# eq_active2.png \ -# eq_inactive2.png \ -# loading1.png \ -# loading2.png \ -# logo_web.png \ -# menu_sidepixmap.png \ -# more_albums.png \ -# musicbrainz.png \ -# nocover.png \ -# pl_active2.png \ -# pl_inactive2.png \ -# shadow_albumcover.png \ -# sbinner_stars.png \ -# smallstar.png \ -# splash_screen.jpg \ -# star.png \ -# time_minus.png \ -# time_plus.png \ -# vol_speaker.png \ -# volumeslider-gradient.png \ -# volumeslider-handle.png \ -# volumeslider-handle_glow.png \ -# volumeslider-inset.png \ -# wizard_compact.png \ -# wizard_xmms.png \ -# xine_logo.png +install( FILES amarok_cut.png amarok_rocks.jpg b_next.png b_pause.png b_play.png b_prev.png b_stop.png back_stars_grey.png currenttrack_bar_left.png currenttrack_bar_mid.png currenttrack_bar_right.png currenttrack_play.png currenttrack_pause.png currenttrack_stop.png currenttrack_stop_small.png currenttrack_repeat.png currenttrack_repeat_small.png description.png eq_active2.png eq_inactive2.png loading1.png loading2.png logo_web.png menu_sidepixmap.png more_albums.png musicbrainz.png nocover.png pl_active2.png pl_inactive2.png shadow_albumcover.png sbinner_stars.png smallstar.png splash_screen.jpg star.png time_minus.png time_plus.png vol_speaker.png volumeslider-gradient.png volumeslider-handle.png volumeslider-handle_glow.png volumeslider-inset.png wizard_compact.png wizard_xmms.png xine_logo.png DESTINATION ${DATA_INSTALL_DIR}/amarok/images ) --- trunk/extragear/multimedia/amarok/src/images/icons/CMakeLists.txt #629295:629296 @@ -1,11 +1,5 @@ ########### install files ############### -install_files( ${DATA_INSTALL_DIR}/amarok/icons FILES ) +kde4_install_icons( ${DATA_INSTALL_DIR}/amarok/icons ) - - -#original Makefile.am contents follow: - -#amarokicondir = $(kde_datadir)/amarok/icons -#amarokicon_ICON = AUTO