build: Move $(UDEV_CFLAGS) to global $(AM_CFLAGS)

Change-Id: Iffd8d88092266bc4afdecda9da7a9dcb48bc2c78
Signed-off-by: himanshu <h.himanshu@samsung.com>

diff --git a/Makefile.am b/Makefile.am
index 6478775..53bb627 100755 (executable)
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,7 @@ pkgincludedir = $(includedir)/bluetooth
 
 pkginclude_HEADERS =
 
-AM_CFLAGS = $(WARNING_CFLAGS) $(MISC_CFLAGS) $(ell_cflags)
+AM_CFLAGS = $(WARNING_CFLAGS) $(MISC_CFLAGS) $(UDEV_CFLAGS) $(ell_cflags)
 AM_LDFLAGS = $(MISC_LDFLAGS)
 
 if DATAFILES

diff --git a/Makefile.plugins b/Makefile.plugins
index a9e537d..022603c 100755 (executable)
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -169,6 +169,5 @@ plugins_sixaxis_la_SOURCES = plugins/sixaxis.c
 plugins_sixaxis_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version \
                                                -no-undefined
 plugins_sixaxis_la_LIBADD = $(UDEV_LIBS) @LIBXML_LIBS@ @INIPARSER_LIBS@
-plugins_sixaxis_la_CPPFLAGS = $(AM_CPPFLAGS) $(UDEV_CFLAGS)
 plugins_sixaxis_la_CFLAGS = $(AM_CFLAGS) -fvisibility=hidden @LIBXML_CFLAGS@ @INIPARSER_CFLAGS@
 endif

diff --git a/Makefile.tools b/Makefile.tools
index 924624f..e23993d 100755 (executable)
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -41,7 +41,6 @@ monitor_btmon_SOURCES = monitor/main.c monitor/bt.h \
                                monitor/broadcom.h monitor/broadcom.c \
                                monitor/jlink.h monitor/jlink.c \
                                monitor/tty.h
-monitor_btmon_CPPFLAGS = $(AM_CPPFLAGS) $(UDEV_CFLAGS)
 monitor_btmon_LDADD = lib/libbluetooth-internal.la \
                                src/libshared-mainloop.la $(UDEV_LIBS) -ldl
 endif
@@ -193,7 +192,6 @@ tools_hciconfig_SOURCES = tools/hciconfig.c tools/csr.h tools/csr.c
 tools_hciconfig_LDADD = lib/libbluetooth-internal.la
 
 tools_hcitool_SOURCES = tools/hcitool.c src/oui.h src/oui.c
-tools_hcitool_CPPFLAGS = $(AM_CPPFLAGS) $(UDEV_CFLAGS)
 tools_hcitool_LDADD = lib/libbluetooth-internal.la $(UDEV_LIBS)
 
 tools_hcidump_SOURCES = tools/hcidump.c \
@@ -266,7 +264,6 @@ udevdir = $(UDEV_DIR)
 
 udev_PROGRAMS = tools/hid2hci
 
-tools_hid2hci_CPPFLAGS = $(AM_CPPFLAGS) $(UDEV_CFLAGS)
 tools_hid2hci_LDADD = $(UDEV_LIBS)
 
 dist_man_MANS += tools/hid2hci.1
@@ -337,7 +334,6 @@ noinst_PROGRAMS += tools/bdaddr tools/avinfo tools/avtest \
                        tools/test-runner tools/check-selftest
 
 tools_bdaddr_SOURCES = tools/bdaddr.c src/oui.h src/oui.c
-tools_bdaddr_CPPFLAGS = $(AM_CPPFLAGS) $(UDEV_CFLAGS)
 tools_bdaddr_LDADD = lib/libbluetooth-internal.la @UDEV_LIBS@
 
 tools_avinfo_LDADD = lib/libbluetooth-internal.la