diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2007-01-20 05:26:15 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2007-01-20 05:26:15 +0000 |
| commit | 8cc5595d9091b484b9a4abe314c0f3ec055e0581 (patch) | |
| tree | 0d20c6f621673dbdb6095fb4854077152c1d9b40 /transfer | |
| parent | 884cfe825db1a0e8c98aa6a604fd4588a1de1340 (diff) | |
Make it possible to support an embedded GLib
Diffstat (limited to 'transfer')
| -rw-r--r-- | transfer/Makefile.am | 14 | ||||
| -rw-r--r-- | transfer/main.c | 3 |
2 files changed, 5 insertions, 12 deletions
diff --git a/transfer/Makefile.am b/transfer/Makefile.am index 97b9cc0d..61b61f82 100644 --- a/transfer/Makefile.am +++ b/transfer/Makefile.am @@ -8,24 +8,16 @@ endif servicedir = $(libdir)/bluetooth -if GLIB -glib_cflags = @GLIB_CFLAGS@ -glib_ldadd = @GLIB_LIBS@ -else -glib_cflags = -glib_ldadd = -endif - noinst_PROGRAMS = bluetoothd-service-transfer bluetoothd_service_transfer_SOURCES = \ main.c session.h session.c -LDADD = $(top_builddir)/common/libhelper.a $(glib_ldadd) \ - @DBUS_LIBS@ @OPENOBEX_LIBS@ @BLUEZ_LIBS@ +LDADD = $(top_builddir)/common/libhelper.a \ + @GLIB_LIBS@ @DBUS_LIBS@ @OPENOBEX_LIBS@ @BLUEZ_LIBS@ endif -AM_CFLAGS = @BLUEZ_CFLAGS@ @OPENOBEX_CFLAGS@ @DBUS_CFLAGS@ $(glib_cflags) +AM_CFLAGS = @BLUEZ_CFLAGS@ @OPENOBEX_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ INCLUDES = -I$(top_srcdir)/common diff --git a/transfer/main.c b/transfer/main.c index 39bd9248..416b871e 100644 --- a/transfer/main.c +++ b/transfer/main.c @@ -25,13 +25,14 @@ #include <config.h> #endif +#include <stdlib.h> #include <string.h> #include <signal.h> #include <sys/stat.h> #include <dbus/dbus.h> -#include "glib-ectomy.h" +#include <glib.h> #include "logging.h" #include "dbus.h" |