diff options
| author | Michael Biebl <biebl@debian.org> | 2016-04-06 00:47:13 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-04-06 00:47:13 +0200 |
| commit | 45bb35bff2a8d258aff2c1d9b68cce1787c7da62 (patch) | |
| tree | e9da08b1d189befb839889185b4f3304d389a60f /src/devices/bluetooth | |
| parent | d101696d539cd03172badbcde19e9a13e5707ee1 (diff) | |
| parent | 2bfb3eb7d0323e69affca154395f51d8b577414d (diff) | |
Merge tag 'upstream/1.1.93'
Upstream version 1.1.93
Diffstat (limited to 'src/devices/bluetooth')
| -rw-r--r-- | src/devices/bluetooth/Makefile.am | 1 | ||||
| -rw-r--r-- | src/devices/bluetooth/Makefile.in | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/devices/bluetooth/Makefile.am b/src/devices/bluetooth/Makefile.am index 2054ea0f..2ff9a572 100644 --- a/src/devices/bluetooth/Makefile.am +++ b/src/devices/bluetooth/Makefile.am @@ -16,7 +16,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/libnm-core \ -DG_LOG_DOMAIN=\""NetworkManager-bluetooth"\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) GLIB_GENERATED = nm-bt-enum-types.h nm-bt-enum-types.c diff --git a/src/devices/bluetooth/Makefile.in b/src/devices/bluetooth/Makefile.in index f93f7242..233ad9e8 100644 --- a/src/devices/bluetooth/Makefile.in +++ b/src/devices/bluetooth/Makefile.in @@ -510,8 +510,7 @@ AM_CPPFLAGS = -I${top_srcdir}/src -I${top_builddir}/src \ -I${top_srcdir}/libnm-core \ -DG_LOG_DOMAIN=\""NetworkManager-bluetooth"\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE $(GLIB_CFLAGS) \ - $(am__append_1) + $(GLIB_CFLAGS) $(am__append_1) GLIB_GENERATED = nm-bt-enum-types.h nm-bt-enum-types.c GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM |