Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[sensorfw] move common LIBS stuff to a common file to ease
maintainability.
  • Loading branch information
Lorn Potter committed May 15, 2013
1 parent 3014d61 commit f73b96c
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 29 deletions.
3 changes: 3 additions & 0 deletions common-config.pri
Expand Up @@ -32,3 +32,6 @@ profile-libc {
equals(QT_MAJOR_VERSION, 5):{
TARGET = $$TARGET-qt5
}

OTHER_FILES += \
../../common.pri
8 changes: 8 additions & 0 deletions common.pri
@@ -0,0 +1,8 @@
equals(QT_MAJOR_VERSION, 4):{
QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorfw
}
equals(QT_MAJOR_VERSION, 5):{
QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorfw-qt5
}

LIBS += -L/usr/local/lib -lhybris-common -lhardware
1 change: 1 addition & 0 deletions filters/filters.pro
Expand Up @@ -8,3 +8,4 @@ SUBDIRS = coordinatealignfilter \
include(../common-install.pri)
publicheaders.files = *.h
publicheaders.path = $${publicheaders.path}/filters

4 changes: 2 additions & 2 deletions sensord/sensord.pro
Expand Up @@ -23,11 +23,9 @@ QMAKE_LIBDIR_FLAGS += -L../datatypes \
-L../core

equals(QT_MAJOR_VERSION, 4):{
QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorfw
TARGET_H.path += /usr/include/sensord
}
equals(QT_MAJOR_VERSION, 5):{
QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorfw-qt5
TARGET_H.path += /usr/include/sensord-qt5
}
QMAKE_RPATHDIR += /usr/lib/sensord
Expand All @@ -49,3 +47,5 @@ target.path = /usr/sbin/

INSTALLS += target \
TARGET_H

include(../../common.pri)
8 changes: 2 additions & 6 deletions tests/adaptors/adaptors.pro
Expand Up @@ -46,9 +46,5 @@ INCLUDEPATH += ../.. \
../../adaptors/gyroscopeadaptor

QMAKE_LIBDIR_FLAGS += -L../../builddir/core -L../../core/ -lrt
equals(QT_MAJOR_VERSION, 4):{
QMAKE_LIBDIR_FLAGS += -lsensorfw
}
equals(QT_MAJOR_VERSION, 5):{
QMAKE_LIBDIR_FLAGS += -lsensorfw-qt5
}

include(../../common.pri)
8 changes: 2 additions & 6 deletions tests/chains/chains.pro
Expand Up @@ -21,9 +21,5 @@ INCLUDEPATH += ../../include \
QMAKE_LIBDIR_FLAGS += -L../../builddir/datatypes -L../../datatypes/
QMAKE_LIBDIR_FLAGS += -L../../builddir/core -L../../core/
QMAKE_RPATHDIR += /usr/lib/sensord
equals(QT_MAJOR_VERSION, 4):{
QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorfw
}
equals(QT_MAJOR_VERSION, 5):{
QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorfw-qt5
}

include(../../common.pri)
7 changes: 1 addition & 6 deletions tests/dataflow/dataflow.pro
Expand Up @@ -24,9 +24,4 @@ QMAKE_LIBDIR_FLAGS += -L../../builddir/datatypes -L../../datatypes/
QMAKE_LIBDIR_FLAGS += -L../../builddir/core -L../../core/
QMAKE_RPATHDIR += /usr/lib/sensord

equals(QT_MAJOR_VERSION, 4):{
QMAKE_LIBDIR_FLAGS += -lsensorfw
}
equals(QT_MAJOR_VERSION, 5):{
QMAKE_LIBDIR_FLAGS += -lsensorfw-qt5
}
include(../../common.pri)
8 changes: 1 addition & 7 deletions tests/filters/filters.pro
Expand Up @@ -34,10 +34,4 @@ INCLUDEPATH += ../../include \
QMAKE_LIBDIR_FLAGS += -L../../datatypes
QMAKE_LIBDIR_FLAGS += -L../../builddir/core -L../../core/

equals(QT_MAJOR_VERSION, 4):{
QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorfw
}

equals(QT_MAJOR_VERSION, 5):{
QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorfw-qt5
}
include(../../common.pri)
8 changes: 6 additions & 2 deletions tests/testapp/testapp.pro
Expand Up @@ -35,13 +35,17 @@ INCLUDEPATH += $$SENSORFW_INCLUDEPATHS
QMAKE_LIBDIR_FLAGS += -L../../qt-api\
-L../../datatypes \
-L../../core

equals(QT_MAJOR_VERSION, 4):{
QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient -lsensorfw
QMAKE_LIBDIR_FLAGS += -lsensorclient
}

equals(QT_MAJOR_VERSION, 5):{
QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5 -lsensorfw-qt5
QMAKE_LIBDIR_FLAGS += -lsensorclient-qt5
}

include(../../common.pri)

DEFINES += TARGET_LIB_$$TARGET_LIB

message("Compiling testapp for $$TARGET_LIB")
Expand Down

0 comments on commit f73b96c

Please sign in to comment.