mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-28 09:50:09 +01:00
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:
parent
430151d6c2
commit
263c05118b
1 changed files with 7 additions and 4 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue