diff options
| -rw-r--r-- | Makefile.obexd | 6 | ||||
| -rw-r--r-- | android/Makefile.am | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.obexd b/Makefile.obexd index 22a4977ef..1c1e500fe 100644 --- a/Makefile.obexd +++ b/Makefile.obexd @@ -81,15 +81,15 @@ obexd_src_obexd_LDADD = lib/libbluetooth-internal.la \ gdbus/libgdbus-internal.la \ $(ICAL_LIBS) $(DBUS_LIBS) $(GLIB_LIBS) -ldl -obexd_src_obexd_LDFLAGS = -Wl,--export-dynamic +obexd_src_obexd_LDFLAGS = $(AM_LDFLAGS) -Wl,--export-dynamic -obexd_src_obexd_CPPFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \ +obexd_src_obexd_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \ $(ICAL_CFLAGS) -DOBEX_PLUGIN_BUILTIN \ -DPLUGINDIR=\""$(obex_plugindir)"\" \ -D_FILE_OFFSET_BITS=64 \ -I$(builddir)/lib -I$(builddir)/obexd/src -obexd_src_obexd_CFLAGS = -fPIC +obexd_src_obexd_CFLAGS = $(AM_CFLAGS) -fPIC endif diff --git a/android/Makefile.am b/android/Makefile.am index 5dd1adf9d..a370598a2 100644 --- a/android/Makefile.am +++ b/android/Makefile.am @@ -142,7 +142,7 @@ android_haltest_SOURCES = android/client/haltest.c \ android/hal-utils.h android/hal-utils.c android_haltest_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/android \ -DPLUGINDIR=\""$(android_plugindir)"\" -android_haltest_LDFLAGS = -pthread +android_haltest_LDFLAGS = $(AM_LDFLAGS) -pthread android_haltest_LDADD = -ldl -lm noinst_PROGRAMS += android/android-tester @@ -167,7 +167,7 @@ android_android_tester_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/android \ -DPLUGINDIR=\""$(android_plugindir)"\" android_android_tester_LDADD = lib/libbluetooth-internal.la \ src/libshared-glib.la $(GLIB_LIBS) -ldl -android_android_tester_LDFLAGS = -pthread +android_android_tester_LDFLAGS = $(AM_LDFLAGS) -pthread noinst_PROGRAMS += android/ipc-tester |