about summary refs log tree commit diff
path: root/src/bluez-manager/Makefile.am
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd@luon.net>2014-04-26 20:55:17 +0200
committerSjoerd Simons <sjoerd@luon.net>2014-04-26 20:55:17 +0200
commit0dccbc804e92f56afd9e7d598dce4bcd8716bbcc (patch)
tree1054a65c0cde38dc89e5c692a3a7458160823afa /src/bluez-manager/Makefile.am
parent7df62b86e35a67049a4bc7810c29994d8a7ef175 (diff)
parent59c3714a494c3b3765657c0551ad82842d98a7d2 (diff)
Merge tag 'upstream/0.9.8.10'
Upstream version 0.9.8.10
Diffstat (limited to 'src/bluez-manager/Makefile.am')
-rw-r--r--src/bluez-manager/Makefile.am26
1 files changed, 12 insertions, 14 deletions
diff --git a/src/bluez-manager/Makefile.am b/src/bluez-manager/Makefile.am
index aee27217..fb836abf 100644
--- a/src/bluez-manager/Makefile.am
+++ b/src/bluez-manager/Makefile.am
@@ -1,4 +1,6 @@
-INCLUDES = \
+noinst_LTLIBRARIES = libbluez-manager.la
+
+libbluez_manager_la_CPPFLAGS = \
 	-I${top_srcdir} \
 	-I${top_builddir}/include \
 	-I${top_srcdir}/include \
@@ -7,9 +9,15 @@ INCLUDES = \
 	-I${top_srcdir}/src \
 	-I${top_builddir}/src/generated \
 	-I${top_srcdir}/src/generated \
-	-I${top_srcdir}/src/logging
-
-noinst_LTLIBRARIES = libbluez-manager.la
+	-I${top_srcdir}/src/logging \
+	$(DBUS_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(BLUEZ_CFLAGS) \
+	-DBINDIR=\"$(bindir)\" \
+	-DDATADIR=\"$(datadir)\" \
+	-DSYSCONFDIR=\"$(sysconfdir)\" \
+	-DLIBEXECDIR=\"$(libexecdir)\" \
+	-DLOCALSTATEDIR=\"$(localstatedir)\"
 
 libbluez_manager_la_SOURCES = \
 	nm-bluez-common.h \
@@ -27,16 +35,6 @@ libbluez_manager_la_SOURCES += \
 	nm-bluez-manager.c
 endif
 
-libbluez_manager_la_CPPFLAGS = \
-	$(DBUS_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(BLUEZ_CFLAGS) \
-	-DBINDIR=\"$(bindir)\" \
-	-DDATADIR=\"$(datadir)\" \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DLOCALSTATEDIR=\"$(localstatedir)\"
-
 libbluez_manager_la_LIBADD = \
 	$(top_builddir)/src/generated/libnm-generated.la \
 	$(top_builddir)/src/logging/libnm-logging.la \