diff options
| author | Jan Engelhardt <jengelh@inai.de> | 2018-11-25 10:20:06 +0100 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2018-11-26 11:24:34 +0200 |
| commit | bfede2a0861ee7a14f023e7c31d7a59be1d52efc (patch) | |
| tree | 797bd1e4db0f51529694ba61d3fdea8d39045c7f /Makefile.obexd | |
| parent | 3a74874c6de4ec0cf59f4a6d251697bbf2d61a97 (diff) | |
| download | bluez-bfede2a0861ee7a14f023e7c31d7a59be1d52efc.tar.gz | |
build: change @foo@ to $(foo) in automake makefiles
When using automake, all AC_SUBSTed variables are made available as
make variables, so that they can also be set at make time. Therefore,
they need not use the @harcoded@ style.
Diffstat (limited to 'Makefile.obexd')
| -rw-r--r-- | Makefile.obexd | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.obexd b/Makefile.obexd index cd3ace425..9180d7eea 100644 --- a/Makefile.obexd +++ b/Makefile.obexd @@ -1,8 +1,8 @@ if SYSTEMD -systemduserunitdir = @SYSTEMD_USERUNITDIR@ +systemduserunitdir = $(SYSTEMD_USERUNITDIR) systemduserunit_DATA = obexd/src/obex.service -dbussessionbusdir = @DBUS_SESSIONBUSDIR@ +dbussessionbusdir = $(DBUS_SESSIONBUSDIR) dbussessionbus_DATA = obexd/src/org.bluez.obex.service endif @@ -79,12 +79,12 @@ obexd_src_obexd_SOURCES = $(btio_sources) $(gobex_sources) \ obexd/src/map_ap.h obexd_src_obexd_LDADD = lib/libbluetooth-internal.la \ gdbus/libgdbus-internal.la \ - @ICAL_LIBS@ @DBUS_LIBS@ @GLIB_LIBS@ -ldl + $(ICAL_LIBS) $(DBUS_LIBS) $(GLIB_LIBS) -ldl obexd_src_obexd_LDFLAGS = -Wl,--export-dynamic -obexd_src_obexd_CFLAGS = $(AM_CFLAGS) @GLIB_CFLAGS@ @DBUS_CFLAGS@ \ - @ICAL_CFLAGS@ -DOBEX_PLUGIN_BUILTIN \ +obexd_src_obexd_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \ + $(ICAL_CFLAGS) -DOBEX_PLUGIN_BUILTIN \ -DPLUGINDIR=\""$(obex_plugindir)"\" \ -fPIC -D_FILE_OFFSET_BITS=64 |