From 54dd26500199a54da3b2e99ff50a5d2bfc88b285 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 31 Jul 2012 18:40:55 -0500 Subject: [PATCH] core: don't generate WiMAX glib enums when WiMAX isn't enabled The enum generator stuff apparently includes any #include in source or header files that it's given, which was causing nm-enum-types.c to include files from the Intel WiMAX SDK even when WiMAX wasn't enabled. --- src/generated/Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/generated/Makefile.am b/src/generated/Makefile.am index b7f13b88c6..252973cda1 100644 --- a/src/generated/Makefile.am +++ b/src/generated/Makefile.am @@ -57,9 +57,12 @@ INCLUDES = \ -I$(top_srcdir)/src/firewall-manager \ -I$(top_srcdir)/src/settings \ -I$(top_srcdir)/src/wifi \ - -I$(top_srcdir)/src/wimax \ -I$(top_srcdir)/libnm-util +if WITH_WIMAX +INCLUDES += -I$(top_srcdir)/src/wimax +endif + libnm_generated_la_CPPFLAGS = \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) \