From 7ca701a6120778fb65905f02305963b79ff6d8de Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Mon, 10 Dec 2012 22:56:05 +0100 Subject: [PATCH] build: Put hid2hci udev rules next to the source code --- .gitignore | 2 +- Makefile.am | 12 +++++------- .../bluetooth-hid2hci.rules => tools/hid2hci.rules | 0 3 files changed, 6 insertions(+), 8 deletions(-) rename scripts/bluetooth-hid2hci.rules => tools/hid2hci.rules (100%) diff --git a/.gitignore b/.gitignore index 078c4ac7e..b0ab485fc 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,7 @@ bluez.pc lib/bluetooth src/builtin.h src/bluetoothd -scripts/97-bluetooth-hid2hci.rules +tools/97-hid2hci.rules profiles/sap/sap.c profiles/cups/bluetooth diff --git a/Makefile.am b/Makefile.am index b91d97944..1df98e3ad 100644 --- a/Makefile.am +++ b/Makefile.am @@ -177,21 +177,19 @@ EXTRA_DIST += src/genbuiltin src/bluetooth.conf src/org.bluez.service \ include Makefile.tools include Makefile.obexd -if DATAFILES rulesdir = @UDEV_DIR@/rules.d udev_files = if HID2HCI -udev_files += scripts/bluetooth-hid2hci.rules +udev_files += tools/hid2hci.rules endif -rules_DATA = $(foreach file,$(udev_files), scripts/97-$(notdir $(file))) -endif +EXTRA_DIST += tools/hid2hci.rules -CLEANFILES += $(rules_DATA) +rules_DATA = $(foreach file,$(udev_files), tools/97-$(notdir $(file))) -EXTRA_DIST += scripts/bluetooth-hid2hci.rules +CLEANFILES += $(rules_DATA) EXTRA_DIST += doc/adapter-api.txt doc/device-api.txt doc/profile-api.txt \ doc/service-api.txt doc/agent-api.txt doc/attribute-api.txt \ @@ -270,7 +268,7 @@ SED_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ src/builtin.h: src/genbuiltin $(builtin_sources) $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@ -scripts/%.rules: +tools/%.rules: $(AM_V_GEN)cp $(subst 97-,,$@) $@ $(lib_libbluetooth_la_OBJECTS): $(local_headers) diff --git a/scripts/bluetooth-hid2hci.rules b/tools/hid2hci.rules similarity index 100% rename from scripts/bluetooth-hid2hci.rules rename to tools/hid2hci.rules -- 2.47.3