summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKimmo Hämäläinen <kimmo.hamalainen@nokia.com>2010-09-22 17:11:00 +0300
committerKimmo Hämäläinen <kimmo.hamalainen@nokia.com>2010-09-22 17:11:00 +0300
commit727b6cef26150cec975ebb4800c19064083579a4 (patch)
treec110e129e7586adfc71002503fdd9c20585937e1
parent1d017a29da798fe6185bd0b6d3f302a1009c96fd (diff)
New mcompositor-dev package with public headers
- headers still need refactoring to remove private API
-rw-r--r--.gitignore5
-rw-r--r--debian/control6
-rw-r--r--debian/mcompositor-dev.install1
-rw-r--r--src/mcompositewindow.h1
-rw-r--r--src/src.pro11
5 files changed, 22 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 674040a..9b36b5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ debian/tmp
debian/duicompositor
debian/duicompositor-dbg
debian/duicompositor-tests
+debian/mcompositor-dev/
debian/mcompositor-dbg/
debian/mcompositor-functional-tests/
debian/mcompositor/
@@ -23,6 +24,8 @@ tests/ut_duisimplewindowframe/ut_duisimplewindowframe
*-stamp
tests.xml
decorators/mdecorator/mdecorator
-src/mcompositor
+mcompositor/mcompositor
tests/windowctl/windowctl
tests/windowstack/windowstack
+tests/GLES2/test-gles2
+tests/focus-tracker/focus-tracker
diff --git a/debian/control b/debian/control
index 11aed02..e05d809 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,12 @@ Depends: mcompositor (=${Source-Version})
Description: MeeGo Touch UI Compositing Window Manager debug symbols
MeeGo Touch UI Compositor debug symbols
+Package: mcompositor-dev
+Architecture: all
+Depends: mcompositor (=${Source-Version})
+Description: MeeGo Touch UI Compositing Window Manager header files
+ MeeGo Touch UI Compositor header files for plugins.
+
Package: mcompositor-functional-tests
Architecture: any
Depends: libmeegotouchcore0, ci-testing, meego-env-dimming, meego-env-behave, python, contextkit-utils, ${shlibs:Depends}
diff --git a/debian/mcompositor-dev.install b/debian/mcompositor-dev.install
new file mode 100644
index 0000000..e43b95c
--- /dev/null
+++ b/debian/mcompositor-dev.install
@@ -0,0 +1 @@
+usr/include
diff --git a/src/mcompositewindow.h b/src/mcompositewindow.h
index c7d39e5..1efb022 100644
--- a/src/mcompositewindow.h
+++ b/src/mcompositewindow.h
@@ -24,7 +24,6 @@
#include <QtOpenGL>
#include <QPointer>
#include <X11/Xutil.h>
-#include "mcompatoms_p.h"
#include "mwindowpropertycache.h"
class MCompWindowAnimator;
diff --git a/src/src.pro b/src/src.pro
index 8ffc7f7..8bf0568 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -64,6 +64,17 @@ CONFIG += release link_pkgconfig
PKGCONFIG += contextsubscriber-1.0
QT += core gui opengl
+# TODO: refactor the headers to exclude private stuff
+publicHeaders.files = mcompositewindow.h \
+ mcompositemanager.h \
+ mcompositewindowshadereffect.h \
+ mcompositemanagerextension.h \
+ mwindowpropertycache.h \
+ mcompatoms_p.h \
+ mcompmgrextensionfactory.h
+publicHeaders.path = $$M_INSTALL_HEADERS/mcompositor
+INSTALLS += publicHeaders
+
target.path += /usr/lib
INSTALLS += target