diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2007-01-12 00:37:42 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2007-01-12 00:37:42 +0000 |
| commit | c97480f11bdfdc3cbb867b8127074bcb6b047024 (patch) | |
| tree | 885dff3c4d9f46567af438af0e266acdc932f281 /audio | |
| parent | b6f6c5cf2f85f27b277b891acf0a22c4a068bbbe (diff) | |
Allow compilation against GLib
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/Makefile.am | 14 | ||||
| -rw-r--r-- | audio/headset.c | 8 |
2 files changed, 15 insertions, 7 deletions
diff --git a/audio/Makefile.am b/audio/Makefile.am index 85025d5b..45afab3c 100644 --- a/audio/Makefile.am +++ b/audio/Makefile.am @@ -1,15 +1,23 @@ +if GLIB +glib_cflags = @GLIB_CFLAGS@ +glib_ldadd = @GLIB_LIBS@ +else +glib_cflags = +glib_ldadd = +endif + noinst_PROGRAMS = bt.audiod bt.headsetd bt_audiod_SOURCES = main.c -bt_audiod_LDADD = @DBUS_LIBS@ @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a +bt_audiod_LDADD = $(glib_ldadd) @DBUS_LIBS@ @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a bt_headsetd_SOURCES = headset.c -bt_headsetd_LDADD = @DBUS_LIBS@ @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a +bt_headsetd_LDADD = $(glib_ldadd) @DBUS_LIBS@ @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a -AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ +AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ $(glib_cflags) INCLUDES = -I$(top_srcdir)/common diff --git a/audio/headset.c b/audio/headset.c index 02938768..144d2668 100644 --- a/audio/headset.c +++ b/audio/headset.c @@ -27,12 +27,12 @@ #include <stdio.h> #include <errno.h> -#include <getopt.h> -#include <stdlib.h> -#include <string.h> #include <fcntl.h> #include <unistd.h> +#include <stdlib.h> #include <signal.h> +#include <string.h> +#include <getopt.h> #include <sys/ioctl.h> #include <sys/socket.h> @@ -48,7 +48,7 @@ #include "dbus.h" #include "logging.h" -#include "glib-ectomy.c" +#include "glib-ectomy.h" #define BUF_SIZE 1024 |