diff options
Diffstat (limited to 'src/bluez-manager')
| -rw-r--r-- | src/bluez-manager/Makefile.am | 26 | ||||
| -rw-r--r-- | src/bluez-manager/Makefile.in | 16 |
2 files changed, 20 insertions, 22 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 \ diff --git a/src/bluez-manager/Makefile.in b/src/bluez-manager/Makefile.in index f4dd166f..f72768a6 100644 --- a/src/bluez-manager/Makefile.in +++ b/src/bluez-manager/Makefile.in @@ -224,6 +224,7 @@ DEPDIR = @DEPDIR@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCPCD_PATH = @DHCPCD_PATH@ DLLTOOL = @DLLTOOL@ +DNSMASQ_PATH = @DNSMASQ_PATH@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -246,6 +247,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -430,7 +432,8 @@ with_dhclient = @with_dhclient@ with_dhcpcd = @with_dhcpcd@ with_netconfig = @with_netconfig@ with_resolvconf = @with_resolvconf@ -INCLUDES = \ +noinst_LTLIBRARIES = libbluez-manager.la +libbluez_manager_la_CPPFLAGS = \ -I${top_srcdir} \ -I${top_builddir}/include \ -I${top_srcdir}/include \ @@ -439,13 +442,7 @@ 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 -libbluez_manager_la_SOURCES = nm-bluez-common.h nm-bluez-device.c \ - nm-bluez-device.h nm-bluez-manager.h $(am__append_1) \ - $(am__append_2) -libbluez_manager_la_CPPFLAGS = \ + -I${top_srcdir}/src/logging \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) \ $(BLUEZ_CFLAGS) \ @@ -455,6 +452,9 @@ libbluez_manager_la_CPPFLAGS = \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DLOCALSTATEDIR=\"$(localstatedir)\" +libbluez_manager_la_SOURCES = nm-bluez-common.h nm-bluez-device.c \ + nm-bluez-device.h nm-bluez-manager.h $(am__append_1) \ + $(am__append_2) libbluez_manager_la_LIBADD = \ $(top_builddir)/src/generated/libnm-generated.la \ $(top_builddir)/src/logging/libnm-logging.la \ |