summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2013-03-19 17:13:24 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2013-03-19 17:13:24 +0100
commitd8364902b34f1c3980c148d730fe2bc60d189001 (patch)
tree023f8e2db9d2bfddc619b5b8befe9db6967c5bd6
parent148e99c6185ef920438932df3140790572a3f570 (diff)
downloadneard-d8364902b34f1c3980c148d730fe2bc60d189001.tar.gz
neard-d8364902b34f1c3980c148d730fe2bc60d189001.tar.bz2
neard-d8364902b34f1c3980c148d730fe2bc60d189001.zip
build: Install nfctool to @bin@
-rw-r--r--Makefile.am8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 6f86dfd..c5d76a8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,6 +29,8 @@ builtin_sources =
builtin_cflags =
builtin_libadd =
+bin_PROGRAMS =
+
libexecdir = @libexecdir@/nfc
libexec_PROGRAMS = src/neard
@@ -87,7 +89,9 @@ test_SCRIPTS = $(test_scripts)
endif
if TOOLS
-noinst_PROGRAMS = tools/snep-send tools/nfctool/nfctool
+bin_PROGRAMS += tools/nfctool/nfctool
+
+noinst_PROGRAMS = tools/snep-send
tools_snep_send_SOURCES = $(gdbus_sources) src/log.c src/dbus.c \
src/bluetooth.c src/ndef.c \
@@ -146,7 +150,7 @@ src/plugin.$(OBJEXT): src/builtin.h
src/builtin.h: src/genbuiltin $(builtin_sources)
$(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@
-$(src_neard_OBJECTS) $(plugin_objects): $(local_headers)
+$(src_neard_OBJECTS) $(tools_nfctool_nfctool_OBJECTS) $(plugin_objects): $(local_headers)
include/near/version.h: include/version.h
$(AM_V_at)$(MKDIR_P) include/near