From 4ae124b1c92f21bc6b089863bf9c97145f44eb99 Mon Sep 17 00:00:00 2001 From: João Paulo Rechi Vita Date: Sun, 31 Aug 2008 09:22:36 -0300 Subject: Move bluetooth proximity module to src/modules/bluetooth/ --- src/Makefile.am | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index c5af829f..4c92f912 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1160,14 +1160,14 @@ endif if HAVE_BLUEZ modlibexec_LTLIBRARIES += \ - module-bt-proximity.la \ + module-bluetooth-proximity.la \ module-bluetooth-discover.la \ libbluetooth-ipc.la \ libbluetooth-sbc.la \ module-bluetooth-device.la pulselibexec_PROGRAMS += \ - bt-proximity-helper + proximity-helper endif # These are generated by a M4 script @@ -1223,7 +1223,7 @@ SYMDEF_FILES = \ modules/module-rescue-streams-symdef.h \ modules/module-suspend-on-idle-symdef.h \ modules/module-hal-detect-symdef.h \ - modules/module-bt-proximity-symdef.h \ + modules/bluetooth/module-bluetooth-proximity-symdef.h \ modules/bluetooth/module-bluetooth-discover-symdef.h \ modules/bluetooth/module-bluetooth-device-symdef.h \ modules/gconf/module-gconf-symdef.h \ @@ -1557,15 +1557,15 @@ gconf_helper_CFLAGS = $(AM_CFLAGS) $(GCONF_CFLAGS) gconf_helper_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) # Bluetooth proximity -module_bt_proximity_la_SOURCES = modules/module-bt-proximity.c -module_bt_proximity_la_LDFLAGS = -module -avoid-version -module_bt_proximity_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) libpulsecore.la libdbus-util.la -module_bt_proximity_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -DPA_BT_PROXIMITY_HELPER=\"$(pulselibexecdir)/bt-proximity-helper\" +module_bluetooth_proximity_la_SOURCES = modules/bluetooth/module-bluetooth-proximity.c +module_bluetooth_proximity_la_LDFLAGS = -module -avoid-version +module_bluetooth_proximity_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) libpulsecore.la libdbus-util.la +module_bluetooth_proximity_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -DPA_BT_PROXIMITY_HELPER=\"$(pulselibexecdir)/proximity-helper\" -bt_proximity_helper_SOURCES = modules/bt-proximity-helper.c -bt_proximity_helper_LDADD = $(AM_LDADD) $(BLUEZ_LIBS) -bt_proximity_helper_CFLAGS = $(AM_CFLAGS) $(BLUEZ_CFLAGS) -bt_proximity_helper_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) +proximity_helper_SOURCES = modules/bluetooth/proximity-helper.c +proximity_helper_LDADD = $(AM_LDADD) $(BLUEZ_LIBS) +proximity_helper_CFLAGS = $(AM_CFLAGS) $(BLUEZ_CFLAGS) +proximity_helper_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) # Bluetooth sink / source module_bluetooth_discover_la_SOURCES = modules/bluetooth/module-bluetooth-discover.c @@ -1635,7 +1635,7 @@ daemon.conf: daemon/daemon.conf.in Makefile install-exec-hook: chown root $(DESTDIR)$(bindir)/pulseaudio ; true chmod u+s $(DESTDIR)$(bindir)/pulseaudio - -chmod u+s $(DESTDIR)$(pulselibexecdir)/bt-proximity-helper + -chmod u+s $(DESTDIR)$(pulselibexecdir)/proximity-helper ln -sf pacat $(DESTDIR)$(bindir)/parec rm -f $(DESTDIR)$(modlibexecdir)/*.a rm -f $(DESTDIR)$(libdir)/libpulsedsp.a -- cgit