diff options
Diffstat (limited to 'src/generated/Makefile.am')
| -rw-r--r-- | src/generated/Makefile.am | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/src/generated/Makefile.am b/src/generated/Makefile.am index 252973cd..307766e1 100644 --- a/src/generated/Makefile.am +++ b/src/generated/Makefile.am @@ -16,7 +16,6 @@ nm_daemon_all_sources = \ $(top_srcdir)/src/dhcp-manager/*.[ch] \ $(top_srcdir)/src/ip6-manager/*.[ch] \ $(top_srcdir)/src/supplicant-manager/*.[ch] \ - $(top_srcdir)/src/backends/*.[ch] \ $(top_srcdir)/src/ppp-manager/*.[ch] \ $(top_srcdir)/src/dnsmasq-manager/*.[ch] \ $(top_srcdir)/src/modem-manager/*.[ch] \ @@ -28,9 +27,21 @@ if WITH_WIMAX nm_daemon_all_sources += $(top_srcdir)/src/wimax/*.[ch] endif -nm_daemon_sources = \ +nm_daemon_sources_no_bindings = \ $(filter-out %-glue.h %-bindings.h, $(wildcard $(nm_daemon_all_sources))) +if WITH_MODEM_MANAGER_1 +# We filter out this file, which doesn't have any enum, and which clashes +# with ModemManager1-defined symbols +nm_daemon_sources = \ + $(filter-out $(top_srcdir)/src/modem-manager/nm-modem-types.h, $(wildcard $(nm_daemon_sources_no_bindings))) +else +# Don't include ModemManager1-specific headers if we're not compiling with +# ModemManager1 support. +nm_daemon_sources = \ + $(filter-out $(top_srcdir)/src/modem-manager/nm-modem-broadband.h, $(wildcard $(nm_daemon_sources_no_bindings))) +endif + GLIB_GENERATED = nm-enum-types.h nm-enum-types.c nm_enum_types_sources = $(nm_daemon_sources) GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM @@ -49,7 +60,6 @@ INCLUDES = \ -I${top_srcdir}/src/dhcp-manager \ -I${top_srcdir}/src/ip6-manager \ -I${top_srcdir}/src/supplicant-manager \ - -I${top_srcdir}/src/backends \ -I${top_srcdir}/src/ppp-manager \ -I${top_srcdir}/src/dnsmasq-manager \ -I${top_srcdir}/src/modem-manager \ @@ -68,11 +78,14 @@ libnm_generated_la_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(GUDEV_CFLAGS) \ $(LIBNL_CFLAGS) \ - $(GMODULE_CFLAGS) \ $(POLKIT_CFLAGS) \ - $(SYSTEMD_CFLAGS) \ + $(SYSTEMD_LOGIN_CFLAGS) \ $(IWMX_SDK_CFLAGS) +if WITH_MODEM_MANAGER_1 + libnm_generated_la_CPPFLAGS += $(MM_GLIB_CFLAGS) +endif + libnm_generated_la_LIBADD = \ $(GLIB_LIBS) |