Merge branch 'jbicha-personal/jbicha/remove-unused-build-options'

Attributes GH PR #88: https://github.com/AyatanaIndicators/ayatana-indicator-keyboard/pull/88

2 files changed, 2 insertions, 43 deletions

diff --git a/INSTALL.md b/INSTALL.md
index bf2200a4..a5640dc6 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -10,9 +10,6 @@
  - libxklavier (>=5.4)
  - intltool
  - systemd
- - gcovr (>= 2.4)
- - lcov (>= 1.9)
- - gtest (>= 1.6.0)
 
 ## For end-users and packagers
 
@@ -26,26 +23,3 @@ sudo make install
 ```
 
 **The install prefix defaults to `/usr`, change it with `-DCMAKE_INSTALL_PREFIX=/some/path`**
-
-## For testers - unit tests only
-
-```
-cd ayatana-indicator-keyboard-X.Y.Z
-mkdir build
-cd build
-cmake .. -DENABLE_TESTS=ON
-make
-make test
-make cppcheck
-```
-
-## For testers - both unit tests and code coverage
-
-```
-cd ayatana-indicator-keyboard-X.Y.Z
-mkdir build-coverage
-cd build-coverage
-cmake .. -DENABLE_COVERAGE=ON
-make
-make coverage-html
-```
diff --git a/debian/rules b/debian/rules
index 6919358e..78ec9efd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,29 +1,14 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-DEB_CMAKE_EXTRA_FLAGS = \
-	-DENABLE_TESTS=ON \
-	-DENABLE_COVERAGE=OFF \
-	$(NULL)
-
-ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
-	DEB_CMAKE_EXTRA_FLAGS = "-DENABLE_UBUNTU_ACCOUNTSSERVICE=ON"
-endif
-
 %:
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- $(DEB_CMAKE_EXTRA_FLAGS)
-
-execute_before_dh_install:
-	find debian/ayatana-indicator-keyboard -name \*.la -delete
-	find debian/ayatana-indicator-keyboard -name \*.a -delete
+	dh_auto_configure -- \
+		-DENABLE_UBUNTU_ACCOUNTSSERVICE=$(if $(shell dpkg-vendor --derives-from Ubuntu && echo y),ON,OFF)
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS