summaryrefslogtreecommitdiff
path: root/src/devices/bluetooth
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2014-07-25 12:04:04 -0400
committerDan Winship <danw@gnome.org>2014-07-30 15:56:29 -0400
commit8aa3b9859b24a909973f9a8d8f607868e8fabef8 (patch)
tree453e2017d3d1cd8350dfd4dcbad68f5e445a5696 /src/devices/bluetooth
parent5432ef5e520b8f7f7f24d126e7b35490be880d85 (diff)
downloadNetworkManager-8aa3b9859b24a909973f9a8d8f607868e8fabef8.tar.gz
core: merge src/config, src/logging, src/posix-signals into src/
Some subdirectories of src/ encapsulate large chunks of functionality, but src/config/, src/logging/, and src/posix-signals/ are really only separated out because they used to be built into separate sub-libraries that were needed either for test programs, or to prevent circular dependencies. Since this is no longer relevant, simplify things by moving their files back into the main source directory.
Diffstat (limited to 'src/devices/bluetooth')
-rw-r--r--src/devices/bluetooth/Makefile.am1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/devices/bluetooth/Makefile.am b/src/devices/bluetooth/Makefile.am
index 41dda9ad13..cfa484e49f 100644
--- a/src/devices/bluetooth/Makefile.am
+++ b/src/devices/bluetooth/Makefile.am
@@ -5,7 +5,6 @@ include $(GLIB_MAKEFILE)
AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_builddir}/src \
- -I${top_srcdir}/src/logging \
-I${top_srcdir}/src/devices \
-I${top_srcdir}/src/settings \
-I${top_srcdir}/src/platform \