Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Removed deprecated "internal" build config.
  • Loading branch information
Antti Virtanen committed Oct 13, 2010
1 parent 0e9a510 commit 13bb29c
Show file tree
Hide file tree
Showing 9 changed files with 52 additions and 84 deletions.
26 changes: 12 additions & 14 deletions adaptors/adaptors.pro
Expand Up @@ -2,17 +2,15 @@ TEMPLATE = subdirs

include( ../common-config.pri )

internal {
SUBDIRS = alsadaptor \
alsadaptor-sysfs \
tapadaptor \
accelerometeradaptor \
magnetometeradaptor \
magnetometeradaptor-ascii \
touchadaptor \
kbslideradaptor \
proximityadaptor \
proximityadaptor-evdev \
proximityadaptor-ascii \
mrstaccelerometer
}
SUBDIRS = alsadaptor \
alsadaptor-sysfs \
tapadaptor \
accelerometeradaptor \
magnetometeradaptor \
magnetometeradaptor-ascii \
touchadaptor \
kbslideradaptor \
proximityadaptor \
proximityadaptor-evdev \
proximityadaptor-ascii \
mrstaccelerometer
10 changes: 2 additions & 8 deletions chains/chains.pro
Expand Up @@ -3,11 +3,5 @@ TEMPLATE = subdirs
include( ../common-config.pri )
include( ../common-install.pri )

internal {
SUBDIRS = accelerometerchain \
orientationchain
}




SUBDIRS = accelerometerchain \
orientationchain
1 change: 0 additions & 1 deletion common-config.pri
Expand Up @@ -8,7 +8,6 @@ QT += dbus
CONFIG += debug

# Maemo specific options
CONFIG += internal
CONFIG += contextprovider

# DEPRECATED: CompassChain is now provided by separate package
Expand Down
20 changes: 7 additions & 13 deletions datatypes/datatypes.pro
Expand Up @@ -19,28 +19,22 @@ HEADERS += xyz.h \
utils.h \
timedunsigned.h \
genericdata.h \
orientationdata.h
orientationdata.h \
tap.h \
posedata.h \
tapdata.h \
touchdata.h


SOURCES += xyz.cpp \
orientation.cpp \
unsigned.cpp \
compass.cpp \
utils.cpp

utils.cpp \
tap.cpp

LIBS += -lrt


internal {
HEADERS += tap.h \
posedata.h \
tapdata.h \
touchdata.h

SOURCES += tap.cpp
}

include(../common-install.pri)
publicheaders.path = $${publicheaders.path}/datatypes
publicheaders.files = $$HEADERS
Expand Down
42 changes: 20 additions & 22 deletions qt-api/qt-api.pro
Expand Up @@ -8,38 +8,36 @@ include( ../common-config.pri )
SOURCES += sensormanagerinterface.cpp \
sensormanager_i.cpp \
abstractsensor_i.cpp \
socketreader.cpp
socketreader.cpp \
compasssensor_i.cpp \
orientationsensor_i.cpp \
accelerometersensor_i.cpp \
alssensor_i.cpp \
tapsensor_i.cpp \
proximitysensor_i.cpp \
rotationsensor_i.cpp \
magnetometersensor_i.cpp

HEADERS += sensormanagerinterface.h \
sensormanager_i.h \
abstractsensor_i.h \
socketreader.h
socketreader.h \
compasssensor_i.h \
orientationsensor_i.h \
accelerometersensor_i.h \
alssensor_i.h \
tapsensor_i.h \
proximitysensor_i.h \
rotationsensor_i.h \
magnetometersensor_i.h

SENSORFW_INCLUDEPATHS = .. \
../include \
../filters \
../datatypes
DEPENDPATH += $$SENSORFW_INCLUDEPATHS
INCLUDEPATH += $$SENSORFW_INCLUDEPATHS

internal {
SOURCES += compasssensor_i.cpp \
orientationsensor_i.cpp \
accelerometersensor_i.cpp \
alssensor_i.cpp \
tapsensor_i.cpp \
proximitysensor_i.cpp \
rotationsensor_i.cpp \
magnetometersensor_i.cpp

HEADERS += compasssensor_i.h \
orientationsensor_i.h \
accelerometersensor_i.h \
alssensor_i.h \
tapsensor_i.h \
proximitysensor_i.h \
rotationsensor_i.h \
magnetometersensor_i.h
}

include(../common-install.pri)
publicheaders.files = $$HEADERS
target.path = $$SHAREDLIBPATH
Expand Down
7 changes: 0 additions & 7 deletions sensord/main.cpp
Expand Up @@ -44,10 +44,7 @@
#include "calibrationhandler.h"
#include "datatypes/datarange.h"
#include "parser.h"

#ifdef USE_INTERNAL
#include "datatypes/tap.h"
#endif

#define CONFIG_FILE_PATH "/etc/sensorfw/sensord.conf"
#define CONFIG_DIR_PATH "/etc/sensorfw/sensord.conf.d/"
Expand Down Expand Up @@ -123,22 +120,18 @@ int main(int argc, char *argv[])
qDBusRegisterMetaType<Unsigned>();
qDBusRegisterMetaType<Orientation>();
qDBusRegisterMetaType<MagneticField>();
#ifdef USE_INTERNAL
qDBusRegisterMetaType<Tap>();
#endif
qDBusRegisterMetaType<DataRange>();

// TODO: this results in error messages in case only Ariane is used

#ifdef USE_INTERNAL
// Leave loading for client app. ALS loaded for context fw.
//sensordLogD() << "Loading CompassSensor:" << sm.loadPlugin("compasssensor");
//sensordLogD() << "Loading OrientationSensor:" << sm.loadPlugin("orientationsensor");
sensordLogD() << "Loading ALSSensor:" << sm.loadPlugin("alssensor");
//sensordLogD() << "Loading TapSensor:" << sm.loadPlugin("tapsensor");
//sensordLogD() << "Loading AccelerometerSensor" << sm.loadPlugin("accelerometersensor");
//sensordLogD() << "Loading ProximitySensor" << sm.loadPlugin("proximitysensor");
#endif

#ifdef PROVIDE_CONTEXT_INFO

Expand Down
2 changes: 0 additions & 2 deletions sensord/sensord.pro
Expand Up @@ -86,8 +86,6 @@ HEADERS += sensormanager.h \
DEFINES += SENSORFW_MCE_WATCHER
}

internal:DEFINES += USE_INTERNAL

contextprovider {
DEFINES += PROVIDE_CONTEXT_INFO
PKGCONFIG += contextprovider-1.0
Expand Down
9 changes: 3 additions & 6 deletions sensorfw.pro
Expand Up @@ -5,9 +5,10 @@ SUBDIRS = datatypes \
filters \
sensors \
sensord \
qt-api
qt-api \
chains \
tests

#sensord.depends = datatypes adaptors filters sensors chains
sensord.depends = datatypes adaptors sensors chains

include( doc/doc.pri )
Expand All @@ -32,10 +33,6 @@ SENSORDCONFIGFILE.path = /etc/sensorfw
SENSORDCONFIGFILES.files = config/90-sensord-default.conf
SENSORDCONFIGFILES.path = /etc/sensorfw/sensord.conf.d

internal {
SUBDIRS += chains tests
}

publicheaders.files += include/*.h

INSTALLS += PKGCONFIGFILES QTCONFIGFILES DBUSCONFIGFILES SENSORDCONFIGFILE SENSORDCONFIGFILES
19 changes: 8 additions & 11 deletions sensors/sensors.pro
Expand Up @@ -3,16 +3,14 @@ TEMPLATE = subdirs
include( ../common-config.pri )
include( ../common-install.pri )

internal {
SUBDIRS = accelerometersensor \
orientationsensor \
tapsensor \
alssensor \
proximitysensor \
compasssensor \
rotationsensor \
magnetometersensor
}
SUBDIRS = accelerometersensor \
orientationsensor \
tapsensor \
alssensor \
proximitysensor \
compasssensor \
rotationsensor \
magnetometersensor

ariane {
SUBDIRS += arianeplugin \
Expand All @@ -22,4 +20,3 @@ ariane {
motionband:SUBDIRS += raworientationplugin

contextprovider:SUBDIRS += contextplugin

0 comments on commit 13bb29c

Please sign in to comment.