--- a/qtmobility/plugins/sensors/maemo6/maemo6.pro	Fri May 14 16:41:33 2010 +0300
+++ b/qtmobility/plugins/sensors/maemo6/maemo6.pro	Thu May 27 13:42:11 2010 +0300
@@ -1,31 +1,22 @@
+INCLUDEPATH+=../../../src/sensors
+
+include(version.pri)
+include(maemo6.pri)
+include(../../../common.pri)
+
+PLUGIN_TYPE = sensors
+
 TEMPLATE = lib
-TARGET = maemo6sensorplugin
-DEPENDPATH += .
-INCLUDEPATH += .
-QT += dbus
-QT += network
 CONFIG += plugin
-CONFIG += sensord
-CONFIG += link_pkgconfig
+TARGET = $$qtLibraryTarget(qtsensors_maemo6)
+
+QT = core dbus network
 CONFIG += mobility
-HEADERS += maemo6sensorbase.h \
-    maemo6accelerometer.h \
-    maemo6als.h \
-    maemo6compass.h \
-    maemo6magnetometer.h \
-    maemo6orientationsensor.h \
-    maemo6proximitysensor.h \
-    maemo6rotationsensor.h \
-    maemo6tapsensor.h
-SOURCES += maemo6sensorbase.cpp \
-    maemo6accelerometer.cpp \
-    maemo6als.cpp \
-    maemo6compass.cpp \
-    maemo6magnetometer.cpp \
-    maemo6orientationsensor.cpp \
-    maemo6proximitysensor.cpp \
-    maemo6rotationsensor.cpp \
-    maemo6tapsensor.cpp \
-    main.cpp
-target.path = /usr/lib/qt4/plugins/sensors
+MOBILITY += sensors
+CONFIG += link_pkgconfig
+PKGCONFIG += sensord
+
+target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE}
+maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
 INSTALLS += target
+