diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2008-09-29 03:21:35 +0200 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2008-09-29 03:21:35 +0200 |
commit | a8172d36292707dda18a877cce34fa1ece3d241d (patch) | |
tree | 3b4567159f72b24e53d7be7896fa38969c5f57fa /plugins | |
parent | 4b71a08bdc6d45f24f8908e62ac645880d4a3d88 (diff) |
The usage of libhal is no longer required
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/Makefile.am | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am index e8b6ca0f..e95662ac 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -1,12 +1,6 @@ plugindir = $(libdir)/bluetooth/plugins -if HAL -hal_plugins = hal.la -else -hal_plugins = -endif - if NETLINK netlink_plugins = netlink.la else @@ -19,7 +13,7 @@ else service_plugins = endif -plugin_LTLIBRARIES = $(hal_plugins) $(netlink_plugins) $(service_plugins) +plugin_LTLIBRARIES = hal.la $(netlink_plugins) $(service_plugins) noinst_LTLIBRARIES = echo.la storage.la @@ -27,12 +21,6 @@ echo_la_SOURCES = echo.c storage_la_SOURCES = storage.c -if HAL -hal_la_SOURCES = hal.c - -hal_la_LIBADD = @HAL_LIBS@ -endif - if NETLINK netlink_la_SOURCES = netlink.c @@ -46,8 +34,8 @@ endif AM_LDFLAGS = -module -avoid-version -no-undefined \ -export-symbols-regex bluetooth_plugin_desc -AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ \ - @NETLINK_CFLAGS@ @HAL_CFLAGS@ +AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ + @GDBUS_CFLAGS@ @NETLINK_CFLAGS@ INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/src |