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/team | |
| parent | d101696d539cd03172badbcde19e9a13e5707ee1 (diff) | |
| parent | 2bfb3eb7d0323e69affca154395f51d8b577414d (diff) | |
Merge tag 'upstream/1.1.93'
Upstream version 1.1.93
Diffstat (limited to 'src/devices/team')
| -rw-r--r-- | src/devices/team/Makefile.am | 1 | ||||
| -rw-r--r-- | src/devices/team/Makefile.in | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/devices/team/Makefile.am b/src/devices/team/Makefile.am index a6645833..3609ace4 100644 --- a/src/devices/team/Makefile.am +++ b/src/devices/team/Makefile.am @@ -14,7 +14,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/libnm-core \ -DG_LOG_DOMAIN=\""NetworkManager-team"\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) if WITH_TEAMDCTL diff --git a/src/devices/team/Makefile.in b/src/devices/team/Makefile.in index 6dce463e..115a7589 100644 --- a/src/devices/team/Makefile.in +++ b/src/devices/team/Makefile.in @@ -492,8 +492,7 @@ AM_CPPFLAGS = -I${top_srcdir}/src -I${top_builddir}/src \ -I${top_srcdir}/libnm-core \ -DG_LOG_DOMAIN=\""NetworkManager-team"\" \ -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) pkglib_LTLIBRARIES = libnm-device-plugin-team.la SYMBOL_VIS_FILE = $(srcdir)/exports.ver libnm_device_plugin_team_la_SOURCES = \ |