[sensorfw] hybris build fix

bump version to 0.7.3.13
sailfishos · Sep 16, 2013 · d5af46e · d5af46e
1 parent 674df11
commit d5af46e
Show file tree

Hide file tree

Showing 15 changed files with 12 additions and 22 deletions.
diff --git a/adaptors/adaptors.pro b/adaptors/adaptors.pro
@@ -27,8 +27,6 @@ SUBDIRS += steaccelerometeradaptor
 SUBDIRS += mpu6050accelerometer
 
 contains(CONFIG,hybris) {
-    PKGCONFIG += android-headers
-    PKGCONFIG += libhardware
     SUBDIRS = hybrisaccelerometer
     SUBDIRS += hybrisalsadaptor
     SUBDIRS += hybrisgyroscopeadaptor

diff --git a/adaptors/hybrisaccelerometer/hybrisaccelerometer.pro b/adaptors/hybrisaccelerometer/hybrisaccelerometer.pro
@@ -8,5 +8,3 @@ SOURCES += hybrisaccelerometeradaptor.cpp \
 LIBS+= -L../../core -lhybrissensorfw-qt5
 
 include( ../adaptor-config.pri )
-    PKGCONFIG += android-headers
-    PKGCONFIG += libhardware
diff --git a/adaptors/hybrisalsadaptor/hybrisalsadaptor.pro b/adaptors/hybrisalsadaptor/hybrisalsadaptor.pro
@@ -8,5 +8,3 @@ SOURCES += hybrisalsadaptor.cpp \
 LIBS+= -L../../core -lhybrissensorfw-qt5
 
 include(../adaptor-config.pri )
-    PKGCONFIG += android-headers
-    PKGCONFIG += libhardware
diff --git a/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptor.pro b/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptor.pro
@@ -9,5 +9,3 @@ SOURCES += hybrisgyroscopeadaptor.cpp \
 LIBS+= -L../../core -lhybrissensorfw-qt5
 
 include( ../adaptor-config.pri )
-    PKGCONFIG += android-headers
-    PKGCONFIG += libhardware
diff --git a/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptor.pro b/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptor.pro
@@ -9,5 +9,3 @@ SOURCES += hybrismagnetometeradaptor.cpp \
 LIBS+= -L../../core -lhybrissensorfw-qt5
 
 include( ../adaptor-config.pri )
-    PKGCONFIG += android-headers
-    PKGCONFIG += libhardware
diff --git a/adaptors/hybrisorientationadaptor/hybrisorientationadaptor.pro b/adaptors/hybrisorientationadaptor/hybrisorientationadaptor.pro
@@ -9,5 +9,3 @@ SOURCES += hybrisorientationadaptor.cpp \
 LIBS+= -L../../core -lhybrissensorfw-qt5
 
 include( ../adaptor-config.pri )
-    PKGCONFIG += android-headers
-    PKGCONFIG += libhardware
diff --git a/adaptors/hybrisproximityadaptor/hybrisproximityadaptor.pro b/adaptors/hybrisproximityadaptor/hybrisproximityadaptor.pro
@@ -9,5 +9,3 @@ SOURCES += hybrisproximityadaptor.cpp \
 LIBS+= -L../../core -lhybrissensorfw-qt5
 
 include( ../adaptor-config.pri )
-    PKGCONFIG += android-headers
-    PKGCONFIG += libhardware
diff --git a/common-config.pri b/common-config.pri
@@ -35,3 +35,9 @@ equals(QT_MAJOR_VERSION, 5):{
 
 OTHER_FILES += \
     ../../common.pri
+
+contains(CONFIG,hybris) {
+    CONFIG += link_pkgconfig
+    PKGCONFIG += android-headers
+    PKGCONFIG += libhardware
+}
diff --git a/core/hybris.pro b/core/hybris.pro
@@ -20,8 +20,6 @@ QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5
 SOURCES += hybrisadaptor.cpp
 HEADERS += hybrisadaptor.h
 LIBS += -L/usr/lib -lhybris-common -lhardware
-PKGCONFIG += android-headers
-PKGCONFIG += libhardware
 
 include(../common-install.pri)
 target.path = $$SHAREDLIBPATH

diff --git a/rpm/sensorfw-qt5-hybris.spec b/rpm/sensorfw-qt5-hybris.spec
@@ -9,7 +9,7 @@ Name:       hybris-libsensorfw-qt5
 # << macros
 
 Summary:    Sensor Framework Qt5
-Version:    0.7.3.12
+Version:    0.7.3.13
 Release:    0
 Group:      System/Sensor Framework
 License:    LGPLv2+

diff --git a/rpm/sensorfw-qt5-hybris.yaml b/rpm/sensorfw-qt5-hybris.yaml
@@ -1,6 +1,6 @@
 Name: sensorfw-qt5
 Summary: Sensor Framework Qt5
-Version: 0.7.3.12
+Version: 0.7.3.13
 Release: 0
 Group: "System/Sensor Framework"
 License: LGPLv2+

diff --git a/rpm/sensorfw-qt5.spec b/rpm/sensorfw-qt5.spec
@@ -9,7 +9,7 @@ Name:       sensorfw-qt5
 # << macros
 
 Summary:    Sensor Framework Qt5
-Version:    0.7.3.12
+Version:    0.7.3.13
 Release:    0
 Group:      System/Sensor Framework
 License:    LGPLv2+

diff --git a/rpm/sensorfw-qt5.yaml b/rpm/sensorfw-qt5.yaml
@@ -1,6 +1,6 @@
 Name: sensorfw-qt5
 Summary: Sensor Framework Qt5
-Version: 0.7.3.12
+Version: 0.7.3.13
 Release: 0
 Group: "System/Sensor Framework"
 License: LGPLv2+

diff --git a/rpm/sensorfw.spec b/rpm/sensorfw.spec
@@ -9,7 +9,7 @@ Name:       sensorfw
 # << macros
 
 Summary:    Sensor Framework
-Version:    0.7.3.12
+Version:    0.7.3.13
 Release:    0
 Group:      System/Sensor Framework
 License:    LGPLv2+

diff --git a/rpm/sensorfw.yaml b/rpm/sensorfw.yaml
@@ -1,6 +1,6 @@
 Name: sensorfw
 Summary: Sensor Framework
-Version: 0.7.3.12
+Version: 0.7.3.13
 Release: 0
 Group: "System/Sensor Framework"
 License: LGPLv2+