More headers tweaking

Don't install the camel-case headers twice
Look for the plasma_export.h in the current directory instead of jumping
around in the project.

src/plasma/CMakeLists.txt

@@ -171,9 +171,9 @@ ecm_generate_headers(Plasma_CamelCase_HEADERS
 
 
 install(FILES
-        ${Plasma_CamelCase_HEADERS}
         ${Plasma_HEADERS}
         ${CMAKE_CURRENT_BINARY_DIR}/plasma_export.h
+        version.h
         DESTINATION ${INCLUDE_INSTALL_DIR}/plasma COMPONENT Devel)
 
 install(DIRECTORY

src/plasma/configloader.h

@@ -24,7 +24,7 @@
 #include <kconfigskeleton.h>
 #include <ksharedconfig.h>
 
-#include <plasma/plasma_export.h>
+#include "plasma_export.h"
 
 /**
  * @class ConfigLoader plasma/configloader.h <Plasma/ConfigLoader>

src/plasma/corona.h

@@ -24,7 +24,7 @@
 
 #include <plasma/containment.h>
 #include <plasma/plasma.h>
-#include <plasma/plasma_export.h>
+#include "plasma_export.h"
 
 class QAction;
 

src/plasma/datacontainer.h

@@ -25,7 +25,7 @@
 #include <QtCore/QTimer>
 
 #include <kjob.h>
-#include <plasma/plasma_export.h>
+#include "plasma_export.h"
 #include <plasma/dataengine.h>
 
 class QAbstractItemModel;

src/plasma/dataengineconsumer.h

@@ -22,7 +22,7 @@
 
 #include <QtCore/QUrl>
 
-#include <plasma/plasma_export.h>
+#include "plasma_export.h"
 
 namespace Plasma
 {

src/plasma/framesvg.h

@@ -24,7 +24,7 @@
 #include <QtCore/QObject>
 #include <QPixmap>
 
-#include <plasma/plasma_export.h>
+#include "plasma_export.h"
 
 #include <plasma/plasma.h>
 #include <plasma/svg.h>

src/plasma/package.h

@@ -25,7 +25,7 @@
 #include <kplugininfo.h>
 
 #include <plasma/plasma.h>
-#include <plasma/plasma_export.h>
+#include "plasma_export.h"
 
 class KJob;
 

src/plasma/packagestructure.h

@@ -25,7 +25,7 @@
 #include <kplugininfo.h>
 
 #include <plasma/plasma.h>
-#include <plasma/plasma_export.h>
+#include "plasma_export.h"
 #include <plasma/package.h>
 
 namespace Plasma

src/plasma/plasma.h

@@ -24,7 +24,7 @@
 
 #include <QPainterPath>
 
-#include <plasma/plasma_export.h>
+#include "plasma_export.h"
 
 class QAction;
 

src/plasma/scripting/appletscript.h

@@ -27,7 +27,7 @@
 #include <kplugininfo.h>
 
 #include <plasma/containment.h>
-#include <plasma/plasma_export.h>
+#include "plasma_export.h"
 #include <plasma/scripting/scriptengine.h>
 
 class QAction;

src/plasma/scripting/dataenginescript.h

@@ -22,7 +22,7 @@
 
 #include <kplugininfo.h>
 
-#include <plasma/plasma_export.h>
+#include "plasma_export.h"
 #include <plasma/dataengine.h>
 #include <plasma/scripting/scriptengine.h>
 

src/plasma/scripting/scriptengine.h

@@ -21,7 +21,7 @@
 #define PLASMA_SCRIPTENGINE_H
 
 #include <plasma/package.h>
-#include <plasma/plasma_export.h>
+#include "plasma_export.h"
 #include <plasma/plasma.h>
 
 #include <QtCore/QObject>

src/plasma/service.h

@@ -26,7 +26,7 @@
 
 #include <kconfiggroup.h>
 
-#include <plasma/plasma_export.h>
+#include "plasma_export.h"
 #include <plasma/plasma.h>
 
 class QIODevice;

src/plasma/servicejob.h

@@ -24,7 +24,7 @@
 
 #include <kjob.h>
 
-#include <plasma/plasma_export.h>
+#include "plasma_export.h"
 
 namespace Plasma
 {

src/plasma/svg.h

@@ -23,7 +23,7 @@
 #include <QtCore/QObject>
 #include <QPixmap>
 
-#include <plasma/plasma_export.h>
+#include "plasma_export.h"
 
 class QPainter;
 class QPoint;

src/plasma/theme.h

@@ -28,7 +28,7 @@
 #include <kplugininfo.h>
 #include <ksharedconfig.h>
 
-#include <plasma/plasma_export.h>
+#include "plasma_export.h"
 
 namespace Plasma
 {

src/plasma/version.h

@@ -22,7 +22,7 @@
 
 /** @file plasma/version.h <Plasma/Version> */
 
-#include <plasma/plasma_export.h>
+#include "plasma_export.h"
 #include <plasma_version.h>
 
 #define PLASMA_MAKE_VERSION(a,b,c) (((a) << 16) | ((b) << 8) | (c))