diff options
author | João Paulo Rechi Vita <jprvita@openbossa.org> | 2012-10-29 17:33:57 -0300 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-10-30 14:12:08 +0200 |
commit | 394b893a4db7991f0e3e88707eff1ce67494532a (patch) | |
tree | 767264604169d9a1e96879787c32509ff037c88a | |
parent | 214244f1cb9a8fbf6e2ba5ae2849f74a5d95b472 (diff) | |
download | bluez-394b893a4db7991f0e3e88707eff1ce67494532a.tar.gz |
build: Fix selecting HoG suspend backend
The dummy backend was always being compiled and the --with-hog-suspend
option was not being accepted by configure. Now the backend can be
selected with --with-hog-suspend and the suspend implementation file is
generated during compile time.
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | Makefile.am | 5 | ||||
-rw-r--r-- | acinclude.m4 | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index b5c7356aa..27c4687ea 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,7 @@ scripts/bluetooth.rules scripts/97-bluetooth.rules scripts/97-bluetooth-hid2hci.rules +profiles/input/suspend.c profiles/sap/sap.c profiles/cups/bluetooth diff --git a/Makefile.am b/Makefile.am index 35b152039..291f75a89 100644 --- a/Makefile.am +++ b/Makefile.am @@ -184,9 +184,12 @@ if HOGPLUGIN builtin_modules += hog builtin_sources += profiles/input/hog_manager.c profiles/input/hog_device.h \ profiles/input/hog_device.c profiles/input/uhid_copy.h \ - profiles/input/suspend-dummy.c profiles/input/suspend.h + profiles/input/suspend.h +builtin_nodist += profiles/input/suspend.c endif +EXTRA_DIST += profiles/input/suspend-dummy.c + if NETWORKPLUGIN builtin_modules += network builtin_sources += profiles/network/main.c \ diff --git a/acinclude.m4 b/acinclude.m4 index 4bac3f00d..ddc818322 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -290,7 +290,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ wiimote_enable=${enableval} ]) - AC_ARG_WITH(gatt, AC_HELP_STRING([--with-hog-suspend=DRIVER], [select HoG suspend driver]), [ + AC_ARG_WITH(hog_suspend, AC_HELP_STRING([--with-hog-suspend=DRIVER], [select HoG suspend driver]), [ hog_suspend_driver=${withval} ]) |