From 263c05118be032127f3056b7c7d2a4fbef36fc0d Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 6 Jan 2011 14:22:17 -0600 Subject: [PATCH] build: ensure WiMAX bits are linked before system settings System settings still links to libnm-glib, which also contains an NMDeviceWimax class. We don't care about the libnm-glib class, so link the wimax bits first to ensure they are the ones used. This issue will go away when user settings is removed in the near future. --- src/Makefile.am | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 0bc6a54b0e..55a225caf9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -234,6 +234,12 @@ NetworkManager_CPPFLAGS = \ -DNMLOCALEDIR=\"$(datadir)/locale\" \ -DARP_DEBUG + +WIMAX_LIBS= +if WITH_WIMAX +WIMAX_LIBS = ./wimax/libwimax.la +endif + NetworkManager_LDADD = \ $(top_builddir)/marshallers/libmarshallers.la \ ./logging/libnm-logging.la \ @@ -246,6 +252,7 @@ NetworkManager_LDADD = \ ./ppp-manager/libppp-manager.la \ ./modem-manager/libmodem-manager.la \ ./bluez-manager/libbluez-manager.la \ + $(WIMAX_LIBS) \ ./system-settings/libsystem-settings.la \ ./backends/libnmbackend.la \ $(top_builddir)/libnm-util/libnm-util.la \ @@ -258,10 +265,6 @@ NetworkManager_LDADD = \ $(LIBM) \ $(LIBDL) -if WITH_WIMAX -NetworkManager_LDADD += ./wimax/libwimax.la -endif - NetworkManager_LDFLAGS = -rdynamic libexec_PROGRAMS = nm-crash-logger