diff options
| author | Michael Biebl <biebl@debian.org> | 2016-01-20 16:27:43 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-01-20 16:27:43 +0100 |
| commit | cbb3b57b5b60dbf1eadb795c834ac511f5e1ba21 (patch) | |
| tree | a97e7cf8b8903a2902c34f586661a13da2a9f2ea /src/devices/team/Makefile.am | |
| parent | 5ddbb9de1f57acaeb47a151404bcf5f8c9729276 (diff) | |
| parent | 494f296a3baab08522617b24b1f126d8f9a17502 (diff) | |
Merge tag 'upstream/1.1.90' into experimental
Upstream version 1.1.90
Diffstat (limited to 'src/devices/team/Makefile.am')
| -rw-r--r-- | src/devices/team/Makefile.am | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/src/devices/team/Makefile.am b/src/devices/team/Makefile.am index 46c5fe1d..a6645833 100644 --- a/src/devices/team/Makefile.am +++ b/src/devices/team/Makefile.am @@ -7,32 +7,20 @@ AM_CPPFLAGS = \ -I${top_builddir}/src \ -I${top_srcdir}/src/devices \ -I${top_srcdir}/src/platform \ - -I${top_srcdir}/include \ - -I$(top_builddir)/include \ + -I${top_builddir}/introspection \ + -I${top_srcdir}/shared \ + -I$(top_builddir)/shared \ -I${top_builddir}/libnm-core \ -I${top_srcdir}/libnm-core \ -DG_LOG_DOMAIN=\""NetworkManager-team"\" \ - -DNETWORKMANAGER_COMPILATION \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ - $(DBUS_CFLAGS) + $(GLIB_CFLAGS) if WITH_TEAMDCTL AM_CPPFLAGS += ${LIBTEAMDCTL_CFLAGS} endif -GLIB_GENERATED = nm-team-enum-types.h nm-team-enum-types.c -GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM -GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM -nm_team_enum_types_sources = $(srcdir)/nm-device-team.h - -glue_sources = \ - nm-device-team-glue.h - -%-glue.h: $(top_srcdir)/introspection/%.xml - $(AM_V_GEN) dbus-binding-tool --prefix=$(subst -,_,$(subst -glue.h,,$@)) --mode=glib-server --output=$@ $< - -BUILT_SOURCES = $(GLIB_GENERATED) $(glue_sources) - pkglib_LTLIBRARIES = libnm-device-plugin-team.la SYMBOL_VIS_FILE=$(srcdir)/exports.ver @@ -41,23 +29,21 @@ libnm_device_plugin_team_la_SOURCES = \ nm-device-team.c \ nm-device-team.h \ nm-team-factory.c \ - nm-team-factory.h \ - \ - $(BUILT_SOURCES) + nm-team-factory.h libnm_device_plugin_team_la_LDFLAGS = \ -module -avoid-version \ -Wl,--version-script=$(SYMBOL_VIS_FILE) libnm_device_plugin_team_la_LIBADD = \ - $(DBUS_LIBS) \ + $(top_builddir)/introspection/libnmdbus.la \ + $(GLIB_LIBS) \ $(GUDEV_LIBS) if WITH_TEAMDCTL libnm_device_plugin_team_la_LIBADD += $(LIBTEAMDCTL_LIBS) endif -CLEANFILES = $(BUILT_SOURCES) EXTRA_DIST = $(SYMBOL_VIS_FILE) if ENABLE_TESTS |