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.
This commit is contained in:
Dan Williams
2011-01-06 14:22:17 -06:00
parent 430151d6c2
commit 263c05118b

View File

@@ -234,6 +234,12 @@ NetworkManager_CPPFLAGS = \
-DNMLOCALEDIR=\"$(datadir)/locale\" \ -DNMLOCALEDIR=\"$(datadir)/locale\" \
-DARP_DEBUG -DARP_DEBUG
WIMAX_LIBS=
if WITH_WIMAX
WIMAX_LIBS = ./wimax/libwimax.la
endif
NetworkManager_LDADD = \ NetworkManager_LDADD = \
$(top_builddir)/marshallers/libmarshallers.la \ $(top_builddir)/marshallers/libmarshallers.la \
./logging/libnm-logging.la \ ./logging/libnm-logging.la \
@@ -246,6 +252,7 @@ NetworkManager_LDADD = \
./ppp-manager/libppp-manager.la \ ./ppp-manager/libppp-manager.la \
./modem-manager/libmodem-manager.la \ ./modem-manager/libmodem-manager.la \
./bluez-manager/libbluez-manager.la \ ./bluez-manager/libbluez-manager.la \
$(WIMAX_LIBS) \
./system-settings/libsystem-settings.la \ ./system-settings/libsystem-settings.la \
./backends/libnmbackend.la \ ./backends/libnmbackend.la \
$(top_builddir)/libnm-util/libnm-util.la \ $(top_builddir)/libnm-util/libnm-util.la \
@@ -258,10 +265,6 @@ NetworkManager_LDADD = \
$(LIBM) \ $(LIBM) \
$(LIBDL) $(LIBDL)
if WITH_WIMAX
NetworkManager_LDADD += ./wimax/libwimax.la
endif
NetworkManager_LDFLAGS = -rdynamic NetworkManager_LDFLAGS = -rdynamic
libexec_PROGRAMS = nm-crash-logger libexec_PROGRAMS = nm-crash-logger