[Amarok] Clean up includes a bit.

[Mark Kretschmann]

On Fri, Dec 25, 2009 at 3:18 PM, Dan Meltzer
<parallelgrapefruit at gmail.com> wrote:
> On Fri, Dec 25, 2009 at 7:45 AM, Mark Kretschmann <kretschmann at kde.org> wrote:
>> commit 9a999f2196c3da8f6bc992207dc3a3f98611e906
>> Author:     Mark Kretschmann <kretschmann at kde.org>
>> AuthorDate: Fri Dec 25 13:40:54 2009 +0100
>> Commit:     Mark Kretschmann <kretschmann at kde.org>
>> CommitDate: Fri Dec 25 13:40:54 2009 +0100
>>
>>    Clean up includes a bit.
>>
>> diff --git a/src/collection/mtpcollection/CMakeLists.txt b/src/collection/mtpcollection/CMakeLists.txt
>> index 225184c..5b88a09 100644
>> --- a/src/collection/mtpcollection/CMakeLists.txt
>> +++ b/src/collection/mtpcollection/CMakeLists.txt
>> @@ -5,24 +5,26 @@ macro_optional_find_package(Mtp)
>>  #pkg_check_modules(Mtp libmtp>=0.3.0)
>>
>>  if (MTP_FOUND)
>> -   include_directories( ../..
>> -   ../../plugin
>> -   ../../meta
>> -   ../../meta/file
>> -   ../../collection
>> -   ../mediadevicecollection
>> -   ../mediadevicecollection/support
>> -   ../mediadevicecollection/handler
>> -   ../mediadevicecollection/handler/capabilities
>> -   handler
>> -   handler/capabilities
>> -   support
>> -   ${GLIB2_INCLUDE_DIR}
>> -   ${MTP_INCLUDE_DIR}
>> -   ${CMAKE_CURRENT_BINARY_DIR}/../..
>> -   ${AMAROK_COLLECTION_SUPPORT_DIR}
>> -   ${KDE4_INCLUDE_DIR}
>> -   ${QT_INCLUDES} )
>> +   include_directories(
>> +       ${Amarok_SOURCE_DIR}/src
>> +       ${Amarok_SOURCE_DIR}/src/plugin
>> +       ${Amarok_SOURCE_DIR}/src/meta
>> +       ${Amarok_SOURCE_DIR}/src/meta/file
>> +       ${Amarok_SOURCE_DIR}/src/collection
>> +       ${Amarok_SOURCE_DIR}/src/collection/mediadevicecollection
>> +       ${Amarok_SOURCE_DIR}/src/collection/mediadevicecollection/support
>> +       ${Amarok_SOURCE_DIR}/src/collection/mediadevicecollection/handler
>> +       ${Amarok_SOURCE_DIR}/src/collection/mediadevicecollection/handler/capabilities
>> +       ${Amarok_SOURCE_DIR}/src/collection/mtpcollection/handler
>> +       ${Amarok_SOURCE_DIR}/src/collection/mtpcollection/handler/capabilities
>> +       ${Amarok_SOURCE_DIR}/src/collection/mtpcollection/support
>> +       ${GLIB2_INCLUDE_DIR}
>> +       ${MTP_INCLUDE_DIR}
>> +       ${CMAKE_CURRENT_BINARY_DIR}/../..
>> +       ${AMAROK_COLLECTION_SUPPORT_DIR}
>> +       ${KDE4_INCLUDE_DIR}
>> +       ${QT_INCLUDES}
>> +)
>
> This really doesn't look any prettier to me.  It's a lot more typing
> and repeated words that hide all the important stuff.  It's also
> different than every other piece of amarok now.  I disagree with this.

I agree that this system isn't a really good solution, on second
thought. Also see what Max wrote.

-- 
Mark Kretschmann
Amarok Developer
Fellow of the Free Software Foundation Europe
www.kde.org - amarok.kde.org - www.fsfe.org