[sensorfw] Cleanup Qt project files. JB#38781

Make legacy hardware support optional.
sailfishos · Nov 30, 2020 · 23abb4a · 23abb4a
1 parent 492a653
commit 23abb4a
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 32 deletions.
diff --git a/adaptors/adaptor-config.pri b/adaptors/adaptor-config.pri
@@ -16,7 +16,3 @@ publicheaders.files += $$HEADERS
 target.path = $$PLUGINPATH
 
 INSTALLS += target
-
-config_hybris {
-    CONFIG += link_pkgconfig
-}
diff --git a/adaptors/adaptors.pro b/adaptors/adaptors.pro
@@ -14,7 +14,7 @@ contains(CONFIG,hybris) {
     SUBDIRS += hybrisgeorotationadaptor
     SUBDIRS += hybrisstepcounteradaptor
 
-    } else {
+} else {
 
 SUBDIRS = alsadaptor \
           alsadaptor-evdev \
@@ -25,16 +25,24 @@ SUBDIRS = alsadaptor \
           magnetometeradaptor \
           magnetometeradaptor-ascii \
           magnetometeradaptor-evdev \
-          magnetometeradaptor-ncdk \
           touchadaptor \
           kbslideradaptor \
           proximityadaptor \
           proximityadaptor-evdev \
           proximityadaptor-ascii \
-          mrstaccelerometer \
           gyroscopeadaptor \
           gyroscopeadaptor-evdev
 
+SUBDIRS += lidsensoradaptor-evdev
+SUBDIRS += iioadaptor
+SUBDIRS += humidityadaptor
+SUBDIRS += pressureadaptor
+SUBDIRS += temperatureadaptor
+
+contains(CONFIG,legacy) {
+
+SUBDIRS += mrstaccelerometer
+SUBDIRS += magnetometeradaptor-ncdk
 SUDBIRS += oemtabletmagnetometeradaptor
 SUBDIRS += pegatronaccelerometeradaptor
 SUBDIRS += oemtabletalsadaptor-ascii
@@ -43,24 +51,9 @@ SUBDIRS += oemtabletaccelerometer
 SUDBIRS += oemtabletgyroscopeadaptor
 SUBDIRS += steaccelerometeradaptor
 SUBDIRS += mpu6050accelerometer
-SUBDIRS += lidsensoradaptor-evdev
-SUBDIRS += iioadaptor
-SUBDIRS += humidityadaptor
-SUBDIRS += pressureadaptor
-SUBDIRS += temperatureadaptor
 
-config_hybris {
-    SUBDIRS += hybrisaccelerometer
-    SUBDIRS += hybrisalsadaptor
-    SUBDIRS += hybrisgyroscopeadaptor
-    SUBDIRS += hybrismagnetometeradaptor
-    SUBDIRS += hybrispressureadaptor
-    SUBDIRS += hybrisproximityadaptor
-    SUBDIRS += hybrisorientationadaptor
-    SUBDIRS += hybrisrotationadaptor
-    SUBDIRS += hybrisgeorotationadaptor
-    SUBDIRS += hybrisstepcounteradaptor
- }
+}
+
 }
 
 
diff --git a/adaptors/iioadaptor/iioadaptor.pro b/adaptors/iioadaptor/iioadaptor.pro
@@ -8,8 +8,6 @@ SOURCES += iioadaptor.cpp \
 
 CONFIG += qt debug warn_on link_prl link_pkgconfig plugin
 
-CONFIG += link_pkgconfig
-PKGCONFIG += udev
-LIBS += -ludev
+PKGCONFIG += libudev
 
 include( ../adaptor-config.pri )
diff --git a/debian/rules b/debian/rules
@@ -48,7 +48,7 @@ configure-stamp: builddir
 	dh_testdir
 
 	# Add here commands to configure the package.
-	cd $(BUILD_DIR) && qmake $(QMAKECONFIG) CONFIG+="configs" CONFIG+="autohybris" CONFIG+="systemdunit" "QMAKE_CXXFLAGS=$(CFLAGS)" "MAKE_DOCS=$(MAKE_DOCS)" ../$(PROJECT_NAME).pro
+	cd $(BUILD_DIR) && qmake $(QMAKECONFIG) CONFIG+="configs" CONFIG+="autohybris" CONFIG+="legacy" CONFIG+="systemdunit" "QMAKE_CXXFLAGS=$(CFLAGS)" "MAKE_DOCS=$(MAKE_DOCS)" ../$(PROJECT_NAME).pro
 	export LD_RUN_PATH=/usr/lib/sensord-qt5/
 
 	touch configure-stamp

diff --git a/sensorfw.pro b/sensorfw.pro
@@ -27,11 +27,14 @@ SUBDIRS = datatypes \
           examples
 
 contains(CONFIG,configs) {
-   # !contains(CONFIG,hybris) {
+    contains(CONFIG,hybris) {
         SENSORDHYBRISCONFIGFILE.files = config/sensord-hybris.conf
         SENSORDHYBRISCONFIGFILE.path = /etc/sensorfw
         INSTALLS += SENSORDHYBRISCONFIGFILE
-    # }
+    }
+
+    contains(CONFIG,legacy) {
+
         SENSORFWCONFIGFILES.files = config/sensord-rx_51.conf \
                config/sensord-oaktrail.conf \
                config/sensord-exopc.conf \
@@ -46,12 +49,14 @@ contains(CONFIG,configs) {
                config/sensord-u8500.conf \
 
         SENSORFWCONFIGFILES.path = /etc/sensorfw
+        INSTALLS += SENSORFWCONFIGFILES
+    }
 
     SENSORCONFIG_SETUP.files = config/sensord-daemon-conf-setup
     SENSORCONFIG_SETUP.path = /usr/bin
 
-     INSTALLS +=  SENSORFWCONFIGFILES SENSORCONFIG_SETUP
- }
+    INSTALLS += SENSORCONFIG_SETUP
+}
 
 contains(CONFIG,hybris) {