system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-15 12:34:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: merge branch 'th/non-recursive-make-bgo772985'

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=772985
This commit is contained in:
Thomas Haller 2016-10-21 19:17:27 +02:00
parent 068dd41df9 6c90b529a1
commit 67cc67ce46
112 changed files with 4671 additions and 4758 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -8,7 +8,8 @@
*.la
*.gir
*.typelib
*.stamp
**.stamp
.dirstamp
*-enum-types.[ch]
*-glue.h
*.loT

4202
Makefile.am
View file

File diff suppressed because it is too large Load diff

179
Makefile.examples Normal file
View file

@ -0,0 +1,179 @@
###############################################################################
# examples/C/glib
###############################################################################
examples_C_glib_cppflags = \
-I${top_srcdir}/shared \
-I${top_builddir}/shared \
-I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm \
-I${top_builddir}/libnm \
$(GLIB_CFLAGS) \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE
examples_C_glib_cppflags_gdbus = $(examples_C_glib_cppflags)
examples_C_glib_cppflags_libnm = $(examples_C_glib_cppflags)
check_programs_norun += \
examples/C/glib/add-connection-gdbus \
examples/C/glib/add-connection-libnm \
examples/C/glib/get-active-connections-gdbus \
examples/C/glib/get-ap-info-libnm \
examples/C/glib/list-connections-gdbus \
examples/C/glib/list-connections-libnm \
examples/C/glib/monitor-nm-running-gdbus \
examples/C/glib/monitor-nm-state-gdbus
examples_C_glib_add_connection_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus)
examples_C_glib_add_connection_gdbus_LDADD = \
$(GLIB_LIBS) \
$(UUID_LIBS)
examples_C_glib_add_connection_libnm_CPPFLAGS = $(examples_C_glib_cppflags_libnm)
examples_C_glib_add_connection_libnm_LDADD = \
libnm/libnm.la \
$(GLIB_LIBS)
examples_C_glib_get_active_connections_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus)
examples_C_glib_get_active_connections_gdbus_LDADD = \
$(GLIB_LIBS)
examples_C_glib_get_ap_info_libnm_CPPFLAGS = $(examples_C_glib_cppflags_libnm)
examples_C_glib_get_ap_info_libnm_LDADD = \
libnm/libnm.la \
$(GLIB_LIBS)
examples_C_glib_list_connections_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus)
examples_C_glib_list_connections_gdbus_LDADD = \
$(GLIB_LIBS)
examples_C_glib_list_connections_libnm_CPPFLAGS = $(examples_C_glib_cppflags_libnm)
examples_C_glib_list_connections_libnm_LDADD = \
libnm/libnm.la \
$(GLIB_LIBS)
examples_C_glib_monitor_nm_running_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus)
examples_C_glib_monitor_nm_running_gdbus_LDADD = \
$(GLIB_LIBS)
examples_C_glib_monitor_nm_state_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus)
examples_C_glib_monitor_nm_state_gdbus_LDADD = \
$(GLIB_LIBS)
###############################################################################
# examples/C/qt
###############################################################################
if WITH_QT
examples_C_qt_cppflags = \
-I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \
-I${builddir}/examples/C/qt \
$(DBUS_CFLAGS) \
$(QT_CFLAGS)
check_programs_norun += \
examples/C/qt/add-connection-wired \
examples/C/qt/list-connections \
examples/C/qt/change-ipv4-addresses \
examples/C/qt/monitor-nm-running
examples_C_qt_add_connection_wired_SOURCES = examples/C/qt/add-connection-wired.cpp
examples_C_qt_add_connection_wired_CPPFLAGS = $(examples_C_qt_cppflags)
examples_C_qt_add_connection_wired_LDADD = \
$(DBUS_LIBS) \
$(QT_LIBS)
examples_C_qt_list_connections_SOURCES = examples/C/qt/list-connections.cpp
examples_C_qt_list_connections_CPPFLAGS = $(examples_C_qt_cppflags)
examples_C_qt_list_connections_LDADD = \
$(DBUS_LIBS) \
$(QT_LIBS)
examples_C_qt_change_ipv4_addresses_SOURCES = examples/C/qt/change-ipv4-addresses.cpp
examples_C_qt_change_ipv4_addresses_CPPFLAGS = $(examples_C_qt_cppflags)
examples_C_qt_change_ipv4_addresses_LDADD = \
$(DBUS_LIBS) \
$(QT_LIBS)
examples_C_qt_monitor_nm_running_SOURCES = examples/C/qt/monitor-nm-running.cpp
examples_C_qt_monitor_nm_running_CPPFLAGS = $(examples_C_qt_cppflags)
examples_C_qt_monitor_nm_running_LDADD = \
$(DBUS_LIBS) \
$(QT_LIBS)
examples/C/qt/monitor-nm-running.moc: examples/C/qt/monitor-nm-running.cpp
$(AM_V_GEN) $(MOC) -i $< -o $@
BUILT_SOURCES += \
examples/C/qt/monitor-nm-running.moc
endif
EXTRA_DIST += \
examples/C/qt/add-connection-wired.cpp \
examples/C/qt/list-connections.cpp \
examples/C/qt/change-ipv4-addresses.cpp \
examples/C/qt/monitor-nm-running.cpp
###############################################################################
# examples
###############################################################################
EXTRA_DIST += \
examples/dispatcher/10-ifcfg-rh-routes.sh \
examples/dispatcher/70-wifi-wired-exclusive.sh \
\
examples/lua/lgi/add-connection.lua \
examples/lua/lgi/list-connections.lua \
examples/lua/lgi/list-devices.lua \
examples/lua/lgi/show-wifi-networks.lua \
examples/lua/lgi/get-basic-nm-info.lua \
examples/lua/lgi/get-ips.lua \
examples/lua/lgi/change-vpn-username.lua \
examples/lua/lgi/deactivate-all.lua \
\
examples/python/dbus/nm-state.py \
examples/python/dbus/add-connection.py \
examples/python/dbus/add-connection-compat.py \
examples/python/dbus/add-wifi-eap-connection.py \
examples/python/dbus/add-wifi-psk-connection.py \
examples/python/dbus/vpn.py \
examples/python/dbus/update-secrets.py \
examples/python/dbus/list-connections.py \
examples/python/dbus/show-bssids.py \
examples/python/dbus/disconnect-device.py \
examples/python/dbus/get-active-connection-uuids.py \
examples/python/dbus/list-devices.py \
examples/python/dbus/update-ip4-method.py \
examples/python/dbus/is-wwan-default.py \
examples/python/dbus/wifi-hotspot.py \
examples/python/dbus/create-bond.py \
examples/python/dbus/wifi-active-ap.py\
\
examples/python/gi/list-connections.py \
examples/python/gi/device-state-ip4config.py \
examples/python/gi/firewall-zone.py \
examples/python/gi/show-wifi-networks.py \
examples/python/gi/get_ips.py \
examples/python/gi/add_connection.py \
examples/python/gi/get-active-connections.py \
examples/python/gi/update-ip4-method.py \
examples/python/gi/deactivate-all.py \
examples/python/gi/README \
\
examples/python/python-networkmanager/README \
\
examples/ruby/add-connection.rb \
examples/ruby/get-basic-nm-info.rb \
examples/ruby/list-devices.rb \
\
examples/shell/nm-logging.sh \
examples/shell/get-hostname.sh \
examples/shell/list-devices.sh \
examples/shell/disconnect-device.sh \
examples/shell/active-wifi.sh \
\
$(NULL)

5
vapi/Makefile.vapigen → Makefile.vapigen
View file

@ -43,8 +43,6 @@ _vapigen_silent_opts = $(_vapigen_silent_opts_$(V))
_vapigen_silent_opts_ = $(_vapigen_silent_opts_$(AM_DEFAULT_VERBOSITY))
_vapigen_silent_opts_0 = --quiet
$(if $(VAPIGEN),,$(error You must define VAPIGEN))
_vapi_name = $(subst /,_,$(subst -,_,$(subst .,_,$(1))))
define vapigen
@ -57,7 +55,8 @@ $(1): $$($(_vapi_name)_GIR)
$(foreach _vapi_dir_name,$(if $($(_vapi_name)_VAPIDIRS),$($(_vapi_name)_VAPIDIRS),$(VAPIGEN_VAPIDIRS)),--vapidir $(_vapi_dir_name)) \
$(foreach _vapi_gir_dir,$(if $($(_vapi_name)_GIRDIRS),$($(_vapi_name)_GIRDIRS),$(VAPIGEN_GIRDIRS)),--girdir $(_vapi_gir_dir)) \
$(foreach _vapi_dep_name,$(if $($(_vapi_name)_DEPS),$($(_vapi_name)_DEPS),$(VAPIGEN_DEPS)),--pkg $(_vapi_dep_name)) \
$$($(_vapi_name)_FILES)
$$($(_vapi_name)_FILES) && \
touch $(1)
endef
$(foreach vapi,$(VAPIGEN_VAPIS),$(eval $(call vapigen,$(vapi))))

25
clients/Makefile.am
View file

@ -1,25 +0,0 @@
SUBDIRS = cli tui
AM_CPPFLAGS = \
-I${top_srcdir}/shared \
-I$(top_builddir)/shared \
-I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm \
-I${top_builddir}/libnm \
$(GLIB_CFLAGS) \
-DNMLOCALEDIR=\"$(datadir)/locale\"
bin_PROGRAMS = nm-online
nm_online_SOURCES = nm-online.c
nm_online_CPPFLAGS = \
-DG_LOG_DOMAIN=\""nm-online"\" \
$(AM_CPPFLAGS)
nm_online_LDFLAGS = \
-Wl,--version-script="$(top_srcdir)/linker-script-binary.ver"
nm_online_LDADD = \
$(top_builddir)/libnm/libnm.la \
$(GLIB_LIBS)

81
clients/cli/Makefile.am
View file

@ -1,81 +0,0 @@
if BUILD_NMCLI
bin_PROGRAMS = \
nmcli
AM_CPPFLAGS = \
-I${top_srcdir} \
-I${top_builddir} \
-I${top_srcdir}/shared \
-I$(top_builddir)/shared \
-I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm \
-I${top_builddir}/libnm \
-I${top_srcdir}/clients/common \
$(GLIB_CFLAGS) \
-DG_LOG_DOMAIN=\""nmcli"\" \
-DNMCLI_LOCALEDIR=\"$(datadir)/locale\"
nmcli_SOURCES = \
agent.c \
agent.h \
common.c \
common.h \
connections.c \
connections.h \
devices.c \
devices.h \
general.c \
general.h \
settings.c \
settings.h \
nmcli.c \
nmcli.h \
utils.c \
utils.h \
polkit-agent.c \
polkit-agent.h \
\
$(srcdir)/../common/nm-secret-agent-simple.c \
$(srcdir)/../common/nm-secret-agent-simple.h \
$(srcdir)/../common/nm-vpn-helpers.c \
$(srcdir)/../common/nm-vpn-helpers.h \
$(NULL)
nmcli_LDADD = \
$(GLIB_LIBS) \
$(READLINE_LIBS) \
$(top_builddir)/libnm/libnm.la
if WITH_POLKIT_AGENT
AM_CPPFLAGS += $(POLKIT_CFLAGS)
nmcli_SOURCES += $(srcdir)/../common/nm-polkit-listener.c $(srcdir)/../common/nm-polkit-listener.h
nmcli_LDADD += $(POLKIT_LIBS)
endif
nmcli_LDFLAGS = \
-Wl,--version-script="$(top_srcdir)/linker-script-binary.ver"
if BUILD_SETTING_DOCS
settings-docs.c: settings-docs.xsl $(top_builddir)/libnm/nm-property-docs.xml
$(AM_V_GEN) xsltproc --output $@ $^
BUILT_SOURCES = settings-docs.c
CLEANFILES = settings-docs.c
endif
EXTRA_DIST = settings-docs.c settings-docs.xsl
completiondir = $(datadir)/bash-completion/completions
install-data-hook:
$(mkinstalldirs) $(DESTDIR)$(completiondir)
$(INSTALL_DATA) $(srcdir)/nmcli-completion $(DESTDIR)$(completiondir)/nmcli
uninstall-hook:
rm -f $(DESTDIR)$(completiondir)/nmcli
EXTRA_DIST += nmcli-completion
endif

133
clients/tui/Makefile.am
View file

@ -1,133 +0,0 @@
if BUILD_NMTUI
SUBDIRS = newt .
AM_CPPFLAGS= \
-I$(top_srcdir) \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(top_srcdir)/libnm \
-I$(top_builddir)/libnm \
-I$(srcdir)/newt \
-I$(top_srcdir)/clients/common \
$(GLIB_CFLAGS) \
$(NEWT_CFLAGS) \
$(GUDEV_CFLAGS) \
-DG_LOG_DOMAIN=\""nmtui"\" \
-DLOCALEDIR=\""$(localedir)"\" \
$(NULL)
bin_PROGRAMS = nmtui
links = nmtui-edit nmtui-connect nmtui-hostname
install-exec-hook:
for link in $(links); do \
$(LN_S) -f nmtui "$(DESTDIR)$(bindir)/$$link"; \
done
uninstall-hook:
for link in $(links); do \
rm -f "$(DESTDIR)$(bindir)/$$link"; \
done
nmtui_SOURCES = \
nmtui.c \
nmtui.h \
nmtui-connect.c \
nmtui-connect.h \
nmtui-edit.c \
nmtui-edit.h \
nmtui-hostname.c \
nmtui-hostname.h \
\
nm-editor-bindings.c \
nm-editor-bindings.h \
nm-editor-utils.c \
nm-editor-utils.h \
\
nmt-address-list.c \
nmt-address-list.h \
nmt-connect-connection-list.c \
nmt-connect-connection-list.h \
nmt-device-entry.c \
nmt-device-entry.h \
nmt-edit-connection-list.c \
nmt-edit-connection-list.h \
nmt-editor-grid.c \
nmt-editor-grid.h \
nmt-editor-page.c \
nmt-editor-page.h \
nmt-editor-page-device.c \
nmt-editor-page-device.h \
nmt-editor-section.c \
nmt-editor-section.h \
nmt-editor.c \
nmt-editor.h \
nmt-ip-entry.c \
nmt-ip-entry.h \
nmt-mac-entry.c \
nmt-mac-entry.h \
nmt-mtu-entry.c \
nmt-mtu-entry.h \
nmt-page-bond.c \
nmt-page-bond.h \
nmt-page-bridge.c \
nmt-page-bridge.h \
nmt-page-bridge-port.c \
nmt-page-bridge-port.h \
nmt-page-dsl.c \
nmt-page-dsl.h \
nmt-page-ethernet.c \
nmt-page-ethernet.h \
nmt-page-infiniband.c \
nmt-page-infiniband.h \
nmt-page-ip4.c \
nmt-page-ip4.h \
nmt-page-ip6.c \
nmt-page-ip6.h \
nmt-page-ppp.c \
nmt-page-ppp.h \
nmt-page-team.c \
nmt-page-team.h \
nmt-page-team-port.c \
nmt-page-team-port.h \
nmt-page-vlan.c \
nmt-page-vlan.h \
nmt-page-wifi.c \
nmt-page-wifi.h \
nmt-password-dialog.c \
nmt-password-dialog.h \
nmt-password-fields.c \
nmt-password-fields.h \
nmt-route-editor.c \
nmt-route-editor.h \
nmt-route-entry.c \
nmt-route-entry.h \
nmt-route-table.c \
nmt-route-table.h \
nmt-slave-list.c \
nmt-slave-list.h \
nmt-utils.c \
nmt-utils.h \
nmt-widget-list.c \
nmt-widget-list.h \
$(srcdir)/../common/nm-secret-agent-simple.c \
$(srcdir)/../common/nm-secret-agent-simple.h \
$(srcdir)/../common/nm-vpn-helpers.c \
$(srcdir)/../common/nm-vpn-helpers.h \
$(NULL)
nmtui_LDFLAGS = \
-Wl,--version-script="$(top_srcdir)/linker-script-binary.ver"
nmtui_LDADD = \
$(top_builddir)/libnm/libnm.la \
$(builddir)/newt/libnmt-newt.a \
$(GUDEV_LIBS) \
$(NEWT_LIBS) \
$(GLIB_LIBS) \
$(NULL)
endif

56
clients/tui/newt/Makefile.am
View file

@ -1,56 +0,0 @@
AM_CPPFLAGS= \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-DG_LOG_DOMAIN=\""nmtui"\" \
$(GLIB_CFLAGS) \
$(NEWT_CFLAGS) \
$(NULL)
noinst_LIBRARIES = libnmt-newt.a
libnmt_newt_a_SOURCES = \
nmt-newt.h \
nmt-newt-types.h \
nmt-newt-button.c \
nmt-newt-button.h \
nmt-newt-button-box.c \
nmt-newt-button-box.h \
nmt-newt-checkbox.c \
nmt-newt-checkbox.h \
nmt-newt-component.c \
nmt-newt-component.h \
nmt-newt-container.c \
nmt-newt-container.h \
nmt-newt-entry.c \
nmt-newt-entry.h \
nmt-newt-entry-numeric.c \
nmt-newt-entry-numeric.h \
nmt-newt-form.c \
nmt-newt-form.h \
nmt-newt-grid.c \
nmt-newt-grid.h \
nmt-newt-hacks.c \
nmt-newt-hacks.h \
nmt-newt-label.c \
nmt-newt-label.h \
nmt-newt-listbox.c \
nmt-newt-listbox.h \
nmt-newt-popup.c \
nmt-newt-popup.h \
nmt-newt-section.c \
nmt-newt-section.h \
nmt-newt-separator.c \
nmt-newt-separator.h \
nmt-newt-stack.c \
nmt-newt-stack.h \
nmt-newt-textbox.c \
nmt-newt-textbox.h \
nmt-newt-toggle-button.c \
nmt-newt-toggle-button.h \
nmt-newt-utils.c \
nmt-newt-utils.h \
nmt-newt-widget.c \
nmt-newt-widget.h \
$(NULL)

73
configure.ac
View file

@ -1043,6 +1043,7 @@ dnl Vala bindings
dnl -------------------------
VAPIGEN_CHECK(0.17.1.24)
AC_CONFIG_COMMANDS([vapi], [$MKDIR_P vapi])
# Tests, utilities and documentation
AC_ARG_ENABLE(tests, AS_HELP_STRING([--enable-tests=root|yes|no], [Build NetworkManager tests (default: yes)]))
@ -1069,10 +1070,7 @@ else
with_valgrind_suppressions='$(top_srcdir)/valgrind.suppressions'
fi
fi
AS_IF([test "$with_valgrind" != "no"],
AC_SUBST(VALGRIND_RULES, 'LOG_COMPILER = "$(top_srcdir)/tools/run-test-valgrind.sh" --called-from-make "$(LIBTOOL)" "$(with_valgrind)" '"$with_valgrind_suppressions"),
AC_SUBST(VALGRIND_RULES, []))
AM_CONDITIONAL(WITH_VALGRIND, test "${with_valgrind}" != "no")
AC_SUBST(NM_LOG_COMPILER, 'LOG_COMPILER = "$(top_srcdir)/tools/run-nm-test.sh" --called-from-make "$(LIBTOOL)" "$(with_valgrind)" "'"$with_valgrind_suppressions"'" --launch-dbus=auto'),
GTK_DOC_CHECK(1.0)
@ -1137,66 +1135,13 @@ AM_CONDITIONAL(SETTING_DOCS_AVAILABLE, test "$build_setting_docs" = "yes" -o "$h
AC_CONFIG_FILES([
Makefile
shared/nm-version-macros.h
src/Makefile
src/tests/Makefile
src/tests/config/Makefile
src/dhcp-manager/Makefile
src/dhcp-manager/tests/Makefile
src/dnsmasq-manager/tests/Makefile
src/supplicant-manager/tests/Makefile
src/supplicant-manager/tests/certs/Makefile
src/ppp-manager/Makefile
src/settings/plugins/Makefile
src/settings/plugins/ifupdown/Makefile
src/settings/plugins/ifupdown/tests/Makefile
src/settings/plugins/ifnet/Makefile
src/settings/plugins/ifnet/tests/Makefile
src/settings/plugins/ifcfg-rh/Makefile
src/settings/plugins/ifcfg-rh/tests/Makefile
src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile
src/settings/plugins/ibft/Makefile
src/settings/plugins/ibft/tests/Makefile
src/settings/plugins/keyfile/Makefile
src/settings/plugins/keyfile/tests/Makefile
src/settings/plugins/keyfile/tests/keyfiles/Makefile
src/platform/Makefile
src/platform/tests/Makefile
src/rdisc/Makefile
src/rdisc/tests/Makefile
src/devices/Makefile
src/devices/tests/Makefile
src/devices/adsl/Makefile
src/devices/bluetooth/Makefile
src/devices/team/Makefile
src/devices/wifi/Makefile
src/devices/wifi/tests/Makefile
src/devices/wwan/Makefile
libnm-core/Makefile
libnm-core/tests/Makefile
libnm/libnm.pc
libnm/Makefile
libnm/tests/Makefile
libnm-util/libnm-util.pc
libnm-util/Makefile
libnm-util/tests/Makefile
libnm-glib/libnm-glib.pc
libnm-glib/libnm-glib-vpn.pc
libnm-glib/Makefile
libnm-glib/tests/Makefile
dispatcher/Makefile
dispatcher/tests/Makefile
tools/Makefile
clients/Makefile
clients/cli/Makefile
clients/tui/Makefile
clients/tui/newt/Makefile
introspection/Makefile
man/Makefile
man/common.ent
po/Makefile.in
policy/org.freedesktop.NetworkManager.policy.in
data/Makefile
docs/Makefile
docs/api/Makefile
docs/api/version.xml
docs/libnm-glib/Makefile
@ -1206,20 +1151,6 @@ docs/libnm-util/version.xml
docs/libnm/Makefile
docs/libnm/version.xml
NetworkManager.pc
examples/Makefile
examples/shell/Makefile
examples/python/Makefile
examples/python/dbus/Makefile
examples/python/gi/Makefile
examples/python/python-networkmanager/Makefile
examples/ruby/Makefile
examples/lua/Makefile
examples/lua/lgi/Makefile
examples/C/Makefile
examples/C/glib/Makefile
examples/C/qt/Makefile
examples/dispatcher/Makefile
vapi/Makefile
])
AC_CONFIG_SUBDIRS([libndp])
AC_OUTPUT

2
contrib/fedora/rpm/NetworkManager.spec
View file

@ -487,7 +487,7 @@ cp valgrind.suppressions %{buildroot}%{_prefix}/src/debug/NetworkManager-%{real_
%check
%if %{with test}
make check
make %{?_smp_mflags} check
%endif

2
contrib/travis/travis-check.sh
View file

@ -8,7 +8,7 @@ print_test_logs() {
echo ">>>> PRINT TEST LOGS $1 (done)"
}
if ! make check -k ; then
if ! make check -j 4 -k ; then
print_test_logs "first-test"

71
data/Makefile.am
View file

@ -1,71 +0,0 @@
if HAVE_SYSTEMD
systemdsystemunit_DATA = \
NetworkManager.service \
NetworkManager-wait-online.service \
NetworkManager-dispatcher.service
NetworkManager.service: NetworkManager.service.in
$(edit) $< >$@
if HAVE_SYSTEMD_200
NetworkManager-wait-online.service: NetworkManager-wait-online.service.in
$(edit) $< >$@
else
NetworkManager-wait-online.service: NetworkManager-wait-online-systemd-pre200.service.in
$(edit) $< >$@
endif
NetworkManager-dispatcher.service: NetworkManager-dispatcher.service.in
$(edit) $< >$@
servicedir = $(datadir)/dbus-1/system-services
service_in_files = org.freedesktop.NetworkManager.service.in
service_DATA = $(service_in_files:.service.in=.service)
$(service_DATA): $(service_in_files) Makefile
$(edit) $< >$@
install-exec-local:
install -d $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants
ln -sf $(systemdsystemunitdir)/NetworkManager-wait-online.service $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants
endif
examplesdir = $(docdir)/examples
examples_DATA = server.conf
if WITH_UDEV_DIR
udevrulesdir = $(UDEV_DIR)/rules.d
udevrules_DATA = \
84-nm-drivers.rules \
85-nm-unmanaged.rules
endif
server.conf: server.conf.in
$(edit) $< >$@
edit = sed \
-e 's|@bindir[@]|$(bindir)|g' \
-e 's|@sbindir[@]|$(sbindir)|g' \
-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
-e 's|@localstatedir[@]|$(localstatedir)|g' \
-e 's|@libexecdir[@]|$(libexecdir)|g' \
-e 's|@DISTRO_NETWORK_SERVICE[@]|$(DISTRO_NETWORK_SERVICE)|g'
EXTRA_DIST = \
NetworkManager.service.in \
NetworkManager-wait-online.service.in \
NetworkManager-wait-online-systemd-pre200.service.in \
NetworkManager-dispatcher.service.in \
org.freedesktop.NetworkManager.service.in \
84-nm-drivers.rules \
85-nm-unmanaged.rules \
server.conf.in
CLEANFILES = \
NetworkManager.service \
NetworkManager-wait-online.service \
NetworkManager-dispatcher.service \
org.freedesktop.NetworkManager.service \
server.conf

105
dispatcher/Makefile.am
View file

@ -1,105 +0,0 @@
SUBDIRS = . tests
libexec_PROGRAMS = \
nm-dispatcher
noinst_LTLIBRARIES = \
libnm-dispatcher-core.la \
libnmdbus-dispatcher.la
AM_CPPFLAGS = \
-I${top_srcdir}/shared \
-I${top_builddir}/shared \
-I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \
$(GLIB_CFLAGS) \
-DNETWORKMANAGER_COMPILATION \
-DNMCONFDIR=\"$(nmconfdir)\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DLIBEXECDIR=\"$(libexecdir)\"
###############################################################################
dbusservicedir = $(DBUS_SYS_DIR)
dbusservice_DATA = \
nm-dispatcher.conf
###############################################################################
libnm_dispatcher_core_la_SOURCES = \
$(top_srcdir)/shared/nm-dispatcher-api.h \
nm-dispatcher-utils.c \
nm-dispatcher-utils.h
libnm_dispatcher_core_la_LIBADD = \
$(top_builddir)/libnm/libnm.la \
$(GLIB_LIBS)
###############################################################################
nm_dispatcher_SOURCES = \
$(top_srcdir)/shared/nm-dispatcher-api.h \
nm-dispatcher.c
nm_dispatcher_LDFLAGS = \
-Wl,--version-script="$(top_srcdir)/linker-script-binary.ver"
nm_dispatcher_LDADD = \
$(top_builddir)/libnm/libnm.la \
libnm-dispatcher-core.la \
libnmdbus-dispatcher.la \
$(GLIB_LIBS)
###############################################################################
nodist_libnmdbus_dispatcher_la_SOURCES = \
nmdbus-dispatcher.c \
nmdbus-dispatcher.h
libnmdbus_dispatcher_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(AM_CPPFLAGS))
nmdbus-dispatcher.h: nm-dispatcher.xml
$(AM_V_GEN) gdbus-codegen \
--generate-c-code $(basename $@) \
--c-namespace NMDBus \
--interface-prefix org.freedesktop \
$<
nmdbus-dispatcher.c: nmdbus-dispatcher.h
@true
BUILT_SOURCES = nmdbus-dispatcher.h nmdbus-dispatcher.c
###############################################################################
dbusactivationdir = $(datadir)/dbus-1/system-services
dbusactivation_in_files = org.freedesktop.nm_dispatcher.service.in
dbusactivation_DATA = $(dbusactivation_in_files:.service.in=.service)
%.service: %.service.in
$(edit) $< >$@
edit = @sed \
-e 's|@sbindir[@]|$(sbindir)|g' \
-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
-e 's|@localstatedir[@]|$(localstatedir)|g' \
-e 's|@libexecdir[@]|$(libexecdir)|g'
dispatcherdir=$(sysconfdir)/NetworkManager/dispatcher.d
install-data-hook:
$(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)
$(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)/pre-down.d
$(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)/pre-up.d
$(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)/no-wait.d
###############################################################################
CLEANFILES = \
$(BUILT_SOURCES) \
$(dbusactivation_DATA)
EXTRA_DIST = \
$(dbusservice_DATA) \
$(dbusactivation_in_files) \
nm-dispatcher.xml

41
dispatcher/tests/Makefile.am
View file

@ -1,41 +0,0 @@
if ENABLE_TESTS
AM_CPPFLAGS = \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(top_srcdir)/dispatcher \
-I$(top_builddir)/dispatcher \
-DNETWORKMANAGER_COMPILATION \
-DSRCDIR=\"$(abs_srcdir)\" \
$(GLIB_CFLAGS)
noinst_PROGRAMS = \
test-dispatcher-envp
###############################################################################
test_dispatcher_envp_SOURCES = \
test-dispatcher-envp.c
test_dispatcher_envp_LDADD = \
$(top_builddir)/libnm/libnm.la \
$(top_builddir)/dispatcher/libnm-dispatcher-core.la \
$(GLIB_LIBS)
###############################################################################
@VALGRIND_RULES@
TESTS = test-dispatcher-envp
endif
EXTRA_DIST= \
dispatcher-connectivity-full \
dispatcher-connectivity-unknown \
dispatcher-down \
dispatcher-external \
dispatcher-up \
dispatcher-vpn-down \
dispatcher-vpn-up

7
docs/Makefile.am
View file

@ -1,7 +0,0 @@
SUBDIRS = libnm api
if WITH_LEGACY_LIBRARIES
SUBDIRS += \
libnm-util \
libnm-glib
endif

5
examples/C/Makefile.am
View file

@ -1,5 +0,0 @@
SUBDIRS= glib
if WITH_QT
SUBDIRS += qt
endif

55
examples/C/glib/Makefile.am
View file

@ -1,55 +0,0 @@
AM_CPPFLAGS = \
-I${top_srcdir}/shared \
-I$(top_builddir)/shared \
-I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm \
-I${top_builddir}/libnm \
$(GLIB_CFLAGS) \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE
noinst_PROGRAMS = \
add-connection-gdbus \
add-connection-libnm \
get-active-connections-gdbus \
get-ap-info-libnm \
list-connections-gdbus \
list-connections-libnm \
monitor-nm-running-gdbus \
monitor-nm-state-gdbus
add_connection_gdbus_SOURCES = add-connection-gdbus.c
add_connection_gdbus_LDADD = \
$(GLIB_LIBS) \
$(UUID_LIBS)
add_connection_libnm_SOURCES = add-connection-libnm.c
add_connection_libnm_LDADD = \
$(top_builddir)/libnm/libnm.la \
$(GLIB_LIBS)
get_active_connections_gdbus_SOURCES = get-active-connections-gdbus.c
get_active_connections_gdbus_LDADD = \
$(GLIB_LIBS)
get_ap_info_libnm_SOURCES = get-ap-info-libnm.c
get_ap_info_libnm_LDADD = \
$(top_builddir)/libnm/libnm.la \
$(GLIB_LIBS)
list_connections_gdbus_SOURCES = list-connections-gdbus.c
list_connections_gdbus_LDADD = \
$(GLIB_LIBS)
list_connections_libnm_SOURCES = list-connections-libnm.c
list_connections_libnm_LDADD = \
$(top_builddir)/libnm/libnm.la \
$(GLIB_LIBS)
monitor_nm_running_gdbus_SOURCES = monitor-nm-running-gdbus.c
monitor_nm_running_gdbus_LDADD = \
$(GLIB_LIBS)
monitor_nm_state_gdbus_SOURCES = monitor-nm-state-gdbus.c
monitor_nm_state_gdbus_LDADD = \
$(GLIB_LIBS)

46
examples/C/qt/Makefile.am
View file

@ -1,46 +0,0 @@
AM_CPPFLAGS = \
-I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \
$(DBUS_CFLAGS) \
$(QT_CFLAGS)
noinst_PROGRAMS = \
add-connection-wired \
list-connections \
change-ipv4-addresses \
monitor-nm-running
add_connection_wired_SOURCES = add-connection-wired.cpp
add_connection_wired_LDADD = \
$(DBUS_LIBS) \
$(QT_LIBS)
list_connections_SOURCES = list-connections.cpp
list_connections_LDADD = \
$(DBUS_LIBS) \
$(QT_LIBS)
change_ipv4_addresses_SOURCES = change-ipv4-addresses.cpp
change_ipv4_addresses_LDADD = \
$(DBUS_LIBS) \
$(QT_LIBS)
monitor_nm_running_SOURCES = monitor-nm-running.cpp
monitor_nm_running_LDADD = \
$(DBUS_LIBS) \
$(QT_LIBS)
monitor-nm-running.moc: monitor-nm-running.cpp
$(AM_V_GEN) $(MOC) -i $< -o $@
BUILT_SOURCES = \
monitor-nm-running.moc
EXTRA_DIST = \
add-connection-wired.cpp \
list-connections.cpp \
change-ipv4-addresses.cpp \
monitor-nm-running.cpp
CLEANFILES = $(BUILT_SOURCES)

7
examples/Makefile.am
View file

@ -1,7 +0,0 @@
SUBDIRS= \
shell \
python \
ruby \
lua \
C \
dispatcher

4
examples/dispatcher/Makefile.am
View file

@ -1,4 +0,0 @@
EXTRA_DIST = \
10-ifcfg-rh-routes.sh \
70-wifi-wired-exclusive.sh

2
examples/lua/Makefile.am
View file

@ -1,2 +0,0 @@
SUBDIRS= lgi

9
examples/lua/lgi/Makefile.am
View file

@ -1,9 +0,0 @@
EXTRA_DIST = \
add-connection.lua \
list-connections.lua \
list-devices.lua \
show-wifi-networks.lua \
get-basic-nm-info.lua \
get-ips.lua \
change-vpn-username.lua \
deactivate-all.lua

2
examples/python/Makefile.am
View file

@ -1,2 +0,0 @@
SUBDIRS= dbus gi python-networkmanager

18
examples/python/dbus/Makefile.am
View file

@ -1,18 +0,0 @@
EXTRA_DIST = \
nm-state.py \
add-connection.py \
add-connection-compat.py \
add-wifi-eap-connection.py \
add-wifi-psk-connection.py \
vpn.py \
update-secrets.py \
list-connections.py \
show-bssids.py \
disconnect-device.py \
get-active-connection-uuids.py \
list-devices.py \
update-ip4-method.py \
is-wwan-default.py \
wifi-hotspot.py \
create-bond.py \
wifi-active-ap.py

11
examples/python/gi/Makefile.am
View file

@ -1,11 +0,0 @@
EXTRA_DIST = \
list-connections.py \
device-state-ip4config.py \
firewall-zone.py \
show-wifi-networks.py \
get_ips.py \
add_connection.py \
get-active-connections.py \
update-ip4-method.py \
deactivate-all.py \
README

2
examples/python/python-networkmanager/Makefile.am
View file

@ -1,2 +0,0 @@
EXTRA_DIST = \
README

4
examples/ruby/Makefile.am
View file

@ -1,4 +0,0 @@
EXTRA_DIST = \
add-connection.rb \
get-basic-nm-info.rb \
list-devices.rb

6
examples/shell/Makefile.am
View file

@ -1,6 +0,0 @@
EXTRA_DIST = \
nm-logging.sh \
get-hostname.sh \
list-devices.sh \
disconnect-device.sh \
active-wifi.sh

180
introspection/Makefile.am
View file

@ -1,180 +0,0 @@
noinst_LTLIBRARIES = \
libnmdbus.la
# gdbus-codegen 2.38 will emit code that requires glib 2.38, which
# will then cause availability warnings if we define
# GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32.
#
# This is fixed in GLib 2.40 (it emits code that takes
# GLIB_VERSION_MAX_ALLOWED into account), so this workaround can go
# away when we depend on that.
AM_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(GLIB_CFLAGS))
nodist_libnmdbus_la_SOURCES = \
nmdbus-access-point.c \
nmdbus-access-point.h \
nmdbus-active-connection.c \
nmdbus-active-connection.h \
nmdbus-agent-manager.c \
nmdbus-agent-manager.h \
nmdbus-checkpoint.c \
nmdbus-checkpoint.h \
nmdbus-device-adsl.c \
nmdbus-device-adsl.h \
nmdbus-device-bond.c \
nmdbus-device-bond.h \
nmdbus-device-bridge.c \
nmdbus-device-bridge.h \
nmdbus-device-bt.c \
nmdbus-device-bt.h \
nmdbus-device-ethernet.c \
nmdbus-device-ethernet.h \
nmdbus-device.c \
nmdbus-device.h \
nmdbus-device-generic.c \
nmdbus-device-generic.h \
nmdbus-device-infiniband.c \
nmdbus-device-infiniband.h \
nmdbus-device-ip-tunnel.c \
nmdbus-device-ip-tunnel.h \
nmdbus-device-macvlan.c \
nmdbus-device-macvlan.h \
nmdbus-device-modem.c \
nmdbus-device-modem.h \
nmdbus-device-olpc-mesh.c \
nmdbus-device-olpc-mesh.h \
nmdbus-device-statistics.c \
nmdbus-device-statistics.h \
nmdbus-device-team.c \
nmdbus-device-team.h \
nmdbus-device-tun.c \
nmdbus-device-tun.h \
nmdbus-device-veth.c \
nmdbus-device-veth.h \
nmdbus-device-vlan.c \
nmdbus-device-vlan.h \
nmdbus-device-vxlan.c \
nmdbus-device-vxlan.h \
nmdbus-device-wifi.c \
nmdbus-device-wifi.h \
nmdbus-device-wimax.c \
nmdbus-device-wimax.h \
nmdbus-dhcp4-config.c \
nmdbus-dhcp4-config.h \
nmdbus-dhcp6-config.c \
nmdbus-dhcp6-config.h \
nmdbus-ip4-config.c \
nmdbus-ip4-config.h \
nmdbus-ip6-config.c \
nmdbus-ip6-config.h \
nmdbus-manager.c \
nmdbus-manager.h \
nmdbus-ppp-manager.c \
nmdbus-ppp-manager.h \
nmdbus-secret-agent.c \
nmdbus-secret-agent.h \
nmdbus-settings-connection.c \
nmdbus-settings-connection.h \
nmdbus-settings.c \
nmdbus-settings.h \
nmdbus-vpn-connection.c \
nmdbus-vpn-connection.h \
nmdbus-vpn-plugin.c \
nmdbus-vpn-plugin.h
DBUS_INTERFACE_DOCS = \
nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml \
nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml \
nmdbus-checkpoint-org.freedesktop.NetworkManager.Checkpoint.xml \
nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml \
nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml \
nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml \
nmdbus-manager-org.freedesktop.NetworkManager.xml \
nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml \
nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml \
nmdbus-device-org.freedesktop.NetworkManager.Device.xml \
nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml \
nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml \
nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml \
nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml \
nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml \
nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml \
nmdbus-ppp-manager-org.freedesktop.NetworkManager.PPP.xml \
nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml \
nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml \
nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml \
nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml \
nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml \
nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml \
nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml \
nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml \
nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml \
nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml \
nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml \
nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml \
nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml \
nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml \
nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml \
nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml \
nmdbus-device-statistics-org.freedesktop.NetworkManager.Device.Statistics.xml
define _make_nmdbus_rule
$(1): $(patsubst nmdbus-%.c,nm-%.xml,$(1))
$$(AM_V_GEN) gdbus-codegen \
--generate-c-code $$(basename $$@) \
--generate-docbook $$(basename $$@) \
--c-namespace NMDBus \
--interface-prefix org.freedesktop.NetworkManager \
$$<
$(filter $(basename $(1))-org.freedesktop.NetworkManager.%,$(DBUS_INTERFACE_DOCS)): $(1)
@true
$(basename $(1)).h: $(1)
@true
endef
$(foreach f,$(filter %.c,$(nodist_libnmdbus_la_SOURCES)),$(eval $(call _make_nmdbus_rule,$f)))
BUILT_SOURCES = $(nodist_libnmdbus_la_SOURCES) $(DBUS_INTERFACE_DOCS)
CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = \
nm-access-point.xml \
nm-active-connection.xml \
nm-agent-manager.xml \
nm-checkpoint.xml \
nm-device-adsl.xml \
nm-device-bond.xml \
nm-device-bridge.xml \
nm-device-bt.xml \
nm-device-ethernet.xml \
nm-device-generic.xml \
nm-device-infiniband.xml \
nm-device-ip-tunnel.xml \
nm-device-macvlan.xml \
nm-device-modem.xml \
nm-device-olpc-mesh.xml \
nm-device-statistics.xml \
nm-device-team.xml \
nm-device-tun.xml \
nm-device-veth.xml \
nm-device-vlan.xml \
nm-device-vxlan.xml \
nm-device-wifi.xml \
nm-device-wimax.xml \
nm-device.xml \
nm-dhcp4-config.xml \
nm-dhcp6-config.xml \
nm-ip4-config.xml \
nm-ip6-config.xml \
nm-manager.xml \
nm-ppp-manager.xml \
nm-secret-agent.xml \
nm-settings-connection.xml \
nm-settings.xml \
nm-vpn-connection.xml \
nm-vpn-plugin.xml \
nm-wimax-nsp.xml

66
libnm-core/Makefile.am
View file

@ -1,66 +0,0 @@
include $(GLIB_MAKEFILE)
@GNOME_CODE_COVERAGE_RULES@
SUBDIRS = . tests
AM_CPPFLAGS = \
-I${top_srcdir}/shared \
-I${top_builddir}/shared \
-DG_LOG_DOMAIN=\""libnm"\" \
-DLOCALEDIR=\"$(datadir)/locale\" \
-DNMCONFDIR=\"$(nmconfdir)\" \
-DNMLIBDIR=\"$(nmlibdir)\" \
-DNMPLUGINDIR=\"$(pkglibdir)\" \
-DLIBEXECDIR=\"$(libexecdir)\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
$(GLIB_CFLAGS) \
$(CODE_COVERAGE_CFLAGS) \
$(JANSSON_CFLAGS)
noinst_LTLIBRARIES = libnm-core.la
# header/source defines are in Makefile.libnm-core, so they can be shared
# with libnm/Makefile.am
include Makefile.libnm-core
libnmincludedir = $(includedir)/libnm
libnminclude_HEADERS = $(libnm_core_headers)
libnm_core_la_SOURCES = \
$(libnm_core_sources) \
$(libnm_core_private_headers)
GLIB_GENERATED = nm-core-enum-types.h nm-core-enum-types.c
nm_core_enum_types_sources = $(filter-out %nm-core-enum-types.h,$(libnminclude_HEADERS))
GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
libnm_core_la_LIBADD = \
$(GLIB_LIBS) \
$(UUID_LIBS) \
$(JANSSON_LIBS)
libnm_core_la_LDFLAGS = \
$(CODE_COVERAGE_LDFLAGS)
if WITH_GNUTLS
AM_CPPFLAGS += $(GNUTLS_CFLAGS)
libnm_core_la_SOURCES += crypto_gnutls.c
libnm_core_la_LIBADD += $(GNUTLS_LIBS)
endif
if WITH_NSS
AM_CPPFLAGS += $(NSS_CFLAGS)
libnm_core_la_SOURCES += crypto_nss.c
libnm_core_la_LIBADD += $(NSS_LIBS)
endif
nm-vpn-dbus-types.xml: nm-vpn-dbus-interface.h $(top_srcdir)/tools/enums-to-docbook.pl
$(AM_V_GEN) @PERL@ $(top_srcdir)/tools/enums-to-docbook.pl 'nm-vpn-dbus-types' 'VPN Plugin D-Bus API Types' $^ >$@
nm-dbus-types.xml: nm-dbus-interface.h $(top_srcdir)/tools/enums-to-docbook.pl
$(AM_V_GEN) @PERL@ $(top_srcdir)/tools/enums-to-docbook.pl 'nm-dbus-types' 'NetworkManager D-Bus API Types' $^ >$@
BUILT_SOURCES = $(GLIB_GENERATED) nm-vpn-dbus-types.xml nm-dbus-types.xml
CLEANFILES = $(BUILT_SOURCES)

115
libnm-core/Makefile.libnm-core
View file

@ -1,115 +0,0 @@
# In order for this to work correctly from both libnm-core/ and libnm/,
# we have to specify full pathnames. (We can't just use $(addprefix) from
# libnm/, because that's incompatible with the Makefile.introspection rules.)
core = $(top_srcdir)/libnm-core
core_build = $(top_builddir)/libnm-core
libnm_core_headers = \
$(top_builddir)/shared/nm-version-macros.h \
$(core_build)/nm-core-enum-types.h \
$(core)/nm-connection.h \
$(core)/nm-core-types.h \
$(core)/nm-dbus-interface.h \
$(core)/nm-errors.h \
$(core)/nm-setting-8021x.h \
$(core)/nm-setting-adsl.h \
$(core)/nm-setting-bluetooth.h \
$(core)/nm-setting-bond.h \
$(core)/nm-setting-bridge-port.h \
$(core)/nm-setting-bridge.h \
$(core)/nm-setting-cdma.h \
$(core)/nm-setting-connection.h \
$(core)/nm-setting-dcb.h \
$(core)/nm-setting-generic.h \
$(core)/nm-setting-gsm.h \
$(core)/nm-setting-infiniband.h \
$(core)/nm-setting-ip-config.h \
$(core)/nm-setting-ip-tunnel.h \
$(core)/nm-setting-ip4-config.h \
$(core)/nm-setting-ip6-config.h \
$(core)/nm-setting-macvlan.h \
$(core)/nm-setting-olpc-mesh.h \
$(core)/nm-setting-ppp.h \
$(core)/nm-setting-pppoe.h \
$(core)/nm-setting-proxy.h \
$(core)/nm-setting-serial.h \
$(core)/nm-setting-team-port.h \
$(core)/nm-setting-team.h \
$(core)/nm-setting-tun.h \
$(core)/nm-setting-vlan.h \
$(core)/nm-setting-vpn.h \
$(core)/nm-setting-vxlan.h \
$(core)/nm-setting-wimax.h \
$(core)/nm-setting-wired.h \
$(core)/nm-setting-wireless-security.h \
$(core)/nm-setting-wireless.h \
$(core)/nm-setting.h \
$(core)/nm-simple-connection.h \
$(core)/nm-utils.h \
$(core)/nm-version.h \
$(core)/nm-vpn-dbus-interface.h \
$(core)/nm-vpn-editor-plugin.h \
$(core)/nm-vpn-plugin-info.h
libnm_core_private_headers = \
$(top_builddir)/shared/nm-utils/nm-shared-utils.h \
$(core)/crypto.h \
$(core)/nm-connection-private.h \
$(core)/nm-core-internal.h \
$(core)/nm-core-types-internal.h \
$(core)/nm-keyfile-internal.h \
$(core)/nm-keyfile-utils.h \
$(core)/nm-property-compare.h \
$(core)/nm-setting-private.h \
$(core)/nm-utils-private.h
libnm_core_sources = \
$(top_builddir)/shared/nm-utils/nm-shared-utils.c \
$(core_build)/nm-core-enum-types.c \
$(core)/crypto.c \
$(core)/nm-connection.c \
$(core)/nm-dbus-utils.c \
$(core)/nm-errors.c \
$(core)/nm-keyfile-reader.c \
$(core)/nm-keyfile-utils.c \
$(core)/nm-keyfile-writer.c \
$(core)/nm-property-compare.c \
$(core)/nm-setting-8021x.c \
$(core)/nm-setting-adsl.c \
$(core)/nm-setting-bluetooth.c \
$(core)/nm-setting-bond.c \
$(core)/nm-setting-bridge-port.c \
$(core)/nm-setting-bridge.c \
$(core)/nm-setting-cdma.c \
$(core)/nm-setting-connection.c \
$(core)/nm-setting-dcb.c \
$(core)/nm-setting-generic.c \
$(core)/nm-setting-gsm.c \
$(core)/nm-setting-infiniband.c \
$(core)/nm-setting-ip-config.c \
$(core)/nm-setting-ip-tunnel.c \
$(core)/nm-setting-ip4-config.c \
$(core)/nm-setting-ip6-config.c \
$(core)/nm-setting-macvlan.c \
$(core)/nm-setting-olpc-mesh.c \
$(core)/nm-setting-ppp.c \
$(core)/nm-setting-pppoe.c \
$(core)/nm-setting-proxy.c \
$(core)/nm-setting-serial.c \
$(core)/nm-setting-team-port.c \
$(core)/nm-setting-team.c \
$(core)/nm-setting-tun.c \
$(core)/nm-setting-vlan.c \
$(core)/nm-setting-vpn.c \
$(core)/nm-setting-vxlan.c \
$(core)/nm-setting-wimax.c \
$(core)/nm-setting-wired.c \
$(core)/nm-setting-wireless-security.c \
$(core)/nm-setting-wireless.c \
$(core)/nm-setting.c \
$(core)/nm-simple-connection.c \
$(core)/nm-utils.c \
$(core)/nm-vpn-editor-plugin.c \
$(core)/nm-vpn-plugin-info.c

74
libnm-core/tests/Makefile.am
View file

@ -1,74 +0,0 @@
include $(GLIB_MAKEFILE)
GLIB_GENERATED = nm-core-tests-enum-types.h nm-core-tests-enum-types.c
nm_core_tests_enum_types_sources = test-general-enums.h
GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
BUILT_SOURCES = $(GLIB_GENERATED)
if ENABLE_TESTS
AM_CPPFLAGS = \
-I${top_srcdir}/shared \
-I${top_builddir}/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-DNETWORKMANAGER_COMPILATION \
$(GLIB_CFLAGS) \
-DTEST_CERT_DIR=\"$(abs_srcdir)/certs\"
noinst_PROGRAMS = \
test-compare \
test-crypto \
test-general \
test-keyfile \
test-secrets \
test-setting-8021x \
test-setting-bond \
test-setting-dcb \
test-settings-defaults
LDADD = \
$(top_builddir)/libnm-core/libnm-core.la \
$(GLIB_LIBS)
@VALGRIND_RULES@
TESTS = $(noinst_PROGRAMS)
test_general_SOURCES = \
test-general.c \
test-general-enums.h \
nm-core-tests-enum-types.c \
nm-core-tests-enum-types.h
endif
# test-cert.p12 created with:
#
# openssl pkcs12 -export \
# -in test_key_and_cert.pem \
# -inkey test_key_and_cert.pem \
# -certfile test_ca_cert.pem \
# -name "test-pkcs12" \
# -out test-cert.p12
EXTRA_DIST = \
certs/ca-no-ending-newline.pem \
certs/pkcs8-decrypted.der \
certs/pkcs8-enc-key.pem \
certs/pkcs8-noenc-key.pem \
certs/test2_ca_cert.pem \
certs/test2-cert.p12 \
certs/test2_key_and_cert.pem \
certs/test-aes-key.pem \
certs/test_ca_cert.der \
certs/test_ca_cert.pem \
certs/test-ca-cert.pem \
certs/test-cert.p12 \
certs/test_key_and_cert.pem \
certs/test-key-and-cert.pem \
certs/test-key-only-decrypted.der \
certs/test-key-only-decrypted.pem \
certs/test-key-only.pem

226
libnm-glib/Makefile.am
View file

@ -1,226 +0,0 @@
include $(GLIB_MAKEFILE)
SUBDIRS = . tests
AM_CPPFLAGS = \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \
-DG_LOG_DOMAIN=\""libnm-glib"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
$(DBUS_CFLAGS) \
$(GLIB_CFLAGS)
BUILT_SOURCES = \
nm-vpn-plugin-glue.h \
nm-secret-agent-glue.h
noinst_LTLIBRARIES = \
libdeprecated-nm-glib.la
#####################################################
# Deprecated original libnm_glib bits
#####################################################
libdeprecated_nm_glib_la_SOURCES = \
libnm_glib.h \
libnm_glib.c
libdeprecated_nm_glib_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-Wno-deprecated-declarations \
-Wno-deprecated
libdeprecated_nm_glib_la_LIBADD = \
$(DBUS_LIBS) \
$(GLIB_LIBS)
libdeprecateddir = $(includedir)/libnm-glib
libdeprecated_HEADERS = libnm_glib.h
#####################################################
# Real libnm-glib stuff
#####################################################
lib_LTLIBRARIES = libnm-glib.la libnm-glib-vpn.la
libnm_glib_la_CFLAGS = \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
$(GUDEV_CFLAGS) \
-DNMRUNDIR=\"$(nmrundir)\"
libnmincludedir = $(includedir)/libnm-glib
libnmvpndir = $(includedir)/libnm-glib
libnminclude_HEADERS = \
nm-object.h \
nm-client.h \
nm-device.h \
nm-device-ethernet.h \
nm-device-infiniband.h \
nm-device-adsl.h \
nm-device-wifi.h \
nm-device-bt.h \
nm-device-olpc-mesh.h \
nm-device-bond.h \
nm-device-team.h \
nm-device-bridge.h \
nm-device-vlan.h \
nm-device-generic.h \
nm-access-point.h \
nm-ip4-config.h \
nm-device-modem.h \
nm-vpn-connection.h \
nm-types.h \
nm-active-connection.h \
nm-dhcp4-config.h \
nm-ip6-config.h \
nm-dhcp6-config.h \
nm-remote-connection.h \
nm-remote-settings.h \
nm-secret-agent.h \
nm-device-wimax.h \
nm-wimax-nsp.h \
nm-glib-enum-types.h
libnmvpn_HEADERS = \
nm-vpn-plugin.h \
nm-vpn-plugin-ui-interface.h \
nm-vpn-plugin-utils.h \
nm-vpn-enum-types.h
libnm_glib_la_csources = \
nm-object.c \
nm-dbus-helpers.c \
nm-client.c \
nm-device.c \
nm-device-ethernet.c \
nm-device-infiniband.c \
nm-device-adsl.c \
nm-device-wifi.c \
nm-device-bt.c \
nm-device-olpc-mesh.c \
nm-device-bond.c \
nm-device-team.c \
nm-device-bridge.c \
nm-device-vlan.c \
nm-device-generic.c \
nm-access-point.c \
nm-ip4-config.c \
nm-device-modem.c \
nm-vpn-connection.c \
nm-types.c \
nm-object-cache.c \
nm-active-connection.c \
nm-dhcp4-config.c \
nm-ip6-config.c \
nm-dhcp6-config.c \
nm-remote-connection.c \
nm-remote-settings.c \
nm-secret-agent.c \
nm-device-wimax.c \
nm-wimax-nsp.c \
nm-glib-enum-types.c
libnm_glib_la_private_headers = \
nm-object-private.h \
nm-device-private.h \
nm-types-private.h \
nm-object-cache.h \
nm-remote-connection-private.h \
nm-dbus-helpers-private.h
libnm_glib_la_SOURCES = \
$(libnm_glib_la_csources) \
$(libnm_glib_la_private_headers)
GLIB_GENERATED = nm-glib-enum-types.h nm-glib-enum-types.c
nm_glib_enum_types_sources = $(libnminclude_HEADERS)
GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
libnm_glib_la_LIBADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(builddir)/libdeprecated-nm-glib.la \
$(GLIB_LIBS) \
$(DBUS_LIBS) \
$(GUDEV_LIBS)
SYMBOL_VIS_FILE=$(srcdir)/libnm-glib.ver
libnm_glib_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \
-version-info "13:0:9"
noinst_PROGRAMS = libnm-glib-test
libnm_glib_test_SOURCES = libnm-glib-test.c
libnm_glib_test_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
libnm_glib_test_LDADD = libnm-glib.la $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS)
libnm_glib_vpn_la_SOURCES = \
nm-vpn-plugin.c \
nm-vpn-plugin-ui-interface.c \
nm-vpn-plugin-utils.c \
nm-vpn-enum-types.c
GLIB_GENERATED += nm-vpn-enum-types.h nm-vpn-enum-types.c
nm_vpn_enum_types_sources = $(libnmvpn_HEADERS)
libnm_glib_vpn_la_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
libnm_glib_vpn_la_LIBADD = $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS)
libnm_glib_vpn_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-glib-vpn.ver \
-version-info "3:0:2"
BUILT_SOURCES += $(GLIB_GENERATED)
#####################################################
nm-vpn-plugin-glue.h: $(top_srcdir)/introspection/nm-vpn-plugin.xml
$(AM_V_GEN) dbus-binding-tool --prefix=nm_vpn_plugin --mode=glib-server --output=$@ $<
nm-secret-agent-glue.h: $(top_srcdir)/introspection/nm-secret-agent.xml
$(AM_V_GEN) dbus-binding-tool --prefix=nm_secret_agent --mode=glib-server --output=$@ $<
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libnm-glib.pc libnm-glib-vpn.pc
DISTCLEANFILES = libnm-glib.pc libnm-glib.pc
EXTRA_DIST = libnm-glib.pc.in libnm-glib-vpn.pc.in libnm-glib.ver libnm-glib-vpn.ver
CLEANFILES = $(BUILT_SOURCES)
-include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS =
INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/libnm-util
# Pass SANITIZER_ENV where a command that uses built libraries is
# executed, to suppress possible errors
INTROSPECTION_SCANNER_ENV = $(SANITIZER_ENV)
if HAVE_INTROSPECTION
introspection_sources = $(libnminclude_HEADERS) $(libnm_glib_la_csources)
NMClient-1.0.gir: libnm-glib.la
NMClient_1_0_gir_INCLUDES = Gio-2.0 DBusGLib-1.0
NMClient_1_0_gir_PACKAGES = gio-2.0 dbus-glib-1 gudev-1.0
NMClient_1_0_gir_EXPORT_PACKAGES = libnm-glib libnm-glib-vpn
NMClient_1_0_gir_CFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/libnm-glib -I$(top_srcdir)/libnm-util
NMClient_1_0_gir_LIBS = libnm-glib.la $(top_builddir)/libnm-util/libnm-util.la
NMClient_1_0_gir_FILES = $(introspection_sources)
NMClient_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm --include-uninstalled=$(top_builddir)/libnm-util/NetworkManager-1.0.gir
INTROSPECTION_GIRS += NMClient-1.0.gir
girdir = $(datadir)/gir-1.0
gir_DATA = $(INTROSPECTION_GIRS)
typelibdir = $(libdir)/girepository-1.0
typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
CLEANFILES += $(gir_DATA) $(typelib_DATA)
endif
check-local:
$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-glib.so $(SYMBOL_VIS_FILE)

51
libnm-glib/tests/Makefile.am
View file

@ -1,51 +0,0 @@
if ENABLE_TESTS
AM_CPPFLAGS = \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \
-I$(top_srcdir)/libnm-glib \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
-DTEST_NM_SERVICE=\"$(abs_top_srcdir)/tools/test-networkmanager-service.py\" \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS)
noinst_PROGRAMS = $(TESTS)
if WITH_VALGRIND
@VALGRIND_RULES@ --launch-dbus
else
LOG_COMPILER = $(top_srcdir)/tools/run-test-dbus-session.sh
endif
TESTS = test-nm-client test-remote-settings-client
####### NMClient and non-settings tests #######
test_nm_client_SOURCES = \
$(top_builddir)/shared/nm-test-utils-impl.c \
$(top_builddir)/shared/nm-test-libnm-utils.h \
test-nm-client.c
test_nm_client_LDADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(top_builddir)/libnm-glib/libnm-glib.la \
$(GLIB_LIBS) \
$(DBUS_LIBS)
####### remote settings client test #######
test_remote_settings_client_SOURCES = \
$(top_builddir)/shared/nm-test-utils-impl.c \
$(top_builddir)/shared/nm-test-libnm-utils.h \
test-remote-settings-client.c
test_remote_settings_client_LDADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(top_builddir)/libnm-glib/libnm-glib.la \
$(GLIB_LIBS) \
$(DBUS_LIBS)
###########################################
endif

200
libnm-util/Makefile.am
View file

@ -1,200 +0,0 @@
include $(GLIB_MAKEFILE)
SUBDIRS = . tests
AM_CPPFLAGS = \
-I${top_srcdir} \
-I${top_srcdir}/shared \
-I$(top_builddir)/shared \
-DG_LOG_DOMAIN=\""libnm-util"\" \
-DLOCALEDIR=\"$(datadir)/locale\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
$(UUID_CFLAGS)
if WITH_GNUTLS
AM_CPPFLAGS += $(GNUTLS_CFLAGS)
endif
if WITH_NSS
AM_CPPFLAGS += $(NSS_CFLAGS)
endif
lib_LTLIBRARIES=libnm-util.la
libnm_util_include_HEADERS = \
$(top_builddir)/shared/nm-version-macros.h \
NetworkManager.h \
NetworkManagerVPN.h \
nm-connection.h \
nm-setting.h \
nm-setting-8021x.h \
nm-setting-adsl.h \
nm-setting-bluetooth.h \
nm-setting-bond.h \
nm-setting-team.h \
nm-setting-team-port.h \
nm-setting-bridge.h \
nm-setting-bridge-port.h \
nm-setting-connection.h \
nm-setting-dcb.h \
nm-setting-infiniband.h \
nm-setting-ip4-config.h \
nm-setting-vlan.h \
nm-setting-ip6-config.h \
nm-setting-ppp.h \
nm-setting-pppoe.h \
nm-setting-serial.h \
nm-setting-generic.h \
nm-setting-gsm.h \
nm-setting-cdma.h \
nm-setting-olpc-mesh.h \
nm-setting-wimax.h \
nm-setting-wired.h \
nm-setting-wireless.h \
nm-setting-wireless-security.h \
nm-setting-vpn.h \
nm-utils.h \
nm-version.h
nodist_libnm_util_include_HEADERS = \
nm-utils-enum-types.h
libnm_util_la_private_headers = \
$(top_builddir)/shared/nm-utils/nm-shared-utils.h \
crypto.h \
nm-dbus-glib-types.h \
nm-gvaluearray-compat.h \
nm-param-spec-specialized.h \
nm-setting-private.h \
nm-utils-private.h
libnm_util_la_csources = \
$(top_builddir)/shared/nm-utils/nm-shared-utils.c \
crypto.c \
nm-connection.c \
nm-param-spec-specialized.c \
nm-setting.c \
nm-setting-8021x.c \
nm-setting-adsl.c \
nm-setting-bluetooth.c \
nm-setting-bond.c \
nm-setting-team.c \
nm-setting-team-port.c \
nm-setting-bridge.c \
nm-setting-bridge-port.c \
nm-setting-connection.c \
nm-setting-dcb.c \
nm-setting-infiniband.c \
nm-setting-ip4-config.c \
nm-setting-vlan.c \
nm-setting-ip6-config.c \
nm-setting-ppp.c \
nm-setting-pppoe.c \
nm-setting-serial.c \
nm-setting-generic.c \
nm-setting-gsm.c \
nm-setting-cdma.c \
nm-setting-olpc-mesh.c \
nm-setting-wimax.c \
nm-setting-wired.c \
nm-setting-wireless.c \
nm-setting-wireless-security.c \
nm-setting-vpn.c \
nm-utils-enum-types.c \
nm-utils.c \
nm-value-transforms.c
libnm_util_la_SOURCES = \
$(libnm_util_la_csources) \
$(libnm_util_la_private_headers)
GLIB_GENERATED = nm-utils-enum-types.h nm-utils-enum-types.c
BUILT_SOURCES = $(GLIB_GENERATED)
nm_utils_enum_types_sources = $(filter-out NetworkManager%,$(libnm_util_include_HEADERS))
GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
libnm_util_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS) $(UUID_LIBS)
SYMBOL_VIS_FILE=$(srcdir)/libnm-util.ver
libnm_util_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \
-version-info "9:0:7"
if WITH_GNUTLS
libnm_util_la_SOURCES += crypto_gnutls.c
libnm_util_la_LIBADD += $(GNUTLS_LIBS)
endif
if WITH_NSS
libnm_util_la_SOURCES += crypto_nss.c
libnm_util_la_LIBADD += $(NSS_LIBS)
endif
libnm_util_includedir=$(includedir)/NetworkManager
###########################################
# Crypto test library
###########################################
noinst_LTLIBRARIES = libtest-crypto.la
libtest_crypto_la_SOURCES = crypto.c
libtest_crypto_la_LIBADD = \
$(GLIB_LIBS)
if WITH_GNUTLS
libtest_crypto_la_SOURCES += crypto_gnutls.c
libtest_crypto_la_LIBADD += $(GNUTLS_LIBS)
endif
if WITH_NSS
libtest_crypto_la_SOURCES += crypto_nss.c
libtest_crypto_la_LIBADD += $(NSS_LIBS)
endif
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libnm-util.pc
DISTCLEANFILES = libnm-util.pc
EXTRA_DIST = libnm-util.pc.in libnm-util.ver
-include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS =
INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
# Pass SANITIZER_ENV where a command that uses built libraries is
# executed, to suppress possible errors
INTROSPECTION_SCANNER_ENV = $(SANITIZER_ENV)
if HAVE_INTROSPECTION
introspection_sources = $(libnm_util_include_HEADERS) $(nodist_libnm_util_include_HEADERS) $(libnm_util_la_csources)
NetworkManager-1.0.gir: libnm-util.la
NetworkManager_1_0_gir_INCLUDES = GObject-2.0 DBusGLib-1.0
NetworkManager_1_0_gir_PACKAGES = gobject-2.0 dbus-glib-1
NetworkManager_1_0_gir_EXPORT_PACKAGES = libnm-util
NetworkManager_1_0_gir_CFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/libnm-util
NetworkManager_1_0_gir_LIBS = libnm-util.la
NetworkManager_1_0_gir_FILES = $(introspection_sources)
NetworkManager_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm
INTROSPECTION_GIRS += NetworkManager-1.0.gir
girdir = $(datadir)/gir-1.0
gir_DATA = $(INTROSPECTION_GIRS)
typelibdir = $(libdir)/girepository-1.0
typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
CLEANFILES = $(gir_DATA) $(typelib_DATA)
endif
check-local:
$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-util.so $(SYMBOL_VIS_FILE)

85
libnm-util/tests/Makefile.am
View file

@ -1,85 +0,0 @@
if ENABLE_TESTS
AM_CPPFLAGS = \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
-DBUILD_DIR=\"$(abs_builddir)\" \
-DTEST_CERT_DIR=\"$(abs_top_srcdir)/libnm-core/tests/certs\"
@VALGRIND_RULES@
TESTS = \
test-settings-defaults \
test-crypto \
test-secrets \
test-general \
test-setting-8021x \
test-setting-dcb
noinst_PROGRAMS = \
$(TESTS) \
test-libnm-linking
test_settings_defaults_SOURCES = \
test-settings-defaults.c
test_settings_defaults_LDADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(GLIB_LIBS) \
$(DBUS_LIBS)
test_crypto_SOURCES = \
test-crypto.c
test_crypto_LDADD = \
$(top_builddir)/libnm-util/libtest-crypto.la \
$(top_builddir)/libnm-util/libnm-util.la \
$(GLIB_LIBS)
test_secrets_SOURCES = \
test-secrets.c
test_secrets_LDADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(GLIB_LIBS) \
$(DBUS_LIBS)
test_general_SOURCES = \
test-general.c
test_general_LDADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(GLIB_LIBS) \
$(DBUS_LIBS)
test_general_DEPENDENCIES = test-libnm-linking
test_setting_8021x_SOURCES = \
test-setting-8021x.c
test_setting_8021x_LDADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(GLIB_LIBS) \
$(DBUS_LIBS)
test_setting_dcb_SOURCES = \
test-setting-dcb.c
test_setting_dcb_LDADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(GLIB_LIBS) \
$(DBUS_LIBS)
test_libnm_linking_SOURCES = \
test-libnm-linking.c
test_libnm_linking_LDADD = \
$(top_builddir)/libnm/libnm.la \
$(top_builddir)/libnm-util/libnm-util.la \
$(GLIB_LIBS) \
$(DBUS_LIBS)
endif

254
libnm/Makefile.am
View file

@ -1,254 +0,0 @@
include $(GLIB_MAKEFILE)
include $(top_srcdir)/nm.mk
@GNOME_CODE_COVERAGE_RULES@
SUBDIRS = . tests
AM_CPPFLAGS = \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_builddir)/introspection \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(top_srcdir)/libnm \
-I$(top_builddir)/libnm \
-DG_LOG_DOMAIN=\""libnm"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
$(GLIB_CFLAGS) \
$(GUDEV_CFLAGS) \
-DNMRUNDIR=\"$(nmrundir)\" \
$(CODE_COVERAGE_CFLAGS)
include $(top_srcdir)/libnm-core/Makefile.libnm-core
# libnm
lib_LTLIBRARIES = libnm.la
libnmincludedir = $(includedir)/libnm
libnminclude_hfiles = \
$(top_builddir)/shared/nm-version-macros.h \
NetworkManager.h \
nm-access-point.h \
nm-active-connection.h \
nm-client.h \
nm-device-adsl.h \
nm-device-bond.h \
nm-device-bridge.h \
nm-device-bt.h \
nm-device-ethernet.h \
nm-device-generic.h \
nm-device-infiniband.h \
nm-device-ip-tunnel.h \
nm-device-macvlan.h \
nm-device-modem.h \
nm-device-olpc-mesh.h \
nm-device-team.h \
nm-device-tun.h \
nm-device-vlan.h \
nm-device-vxlan.h \
nm-device-wifi.h \
nm-device-wimax.h \
nm-device.h \
nm-dhcp-config.h \
nm-enum-types.h \
nm-ip-config.h \
nm-object.h \
nm-remote-connection.h \
nm-types.h \
nm-vpn-connection.h \
nm-vpn-editor.h \
nm-wimax-nsp.h
libnminclude_nointrospect_hfiles = \
nm-secret-agent-old.h \
nm-vpn-plugin-old.h \
nm-vpn-service-plugin.h
libnminclude_HEADERS = \
$(libnminclude_hfiles) \
$(libnminclude_nointrospect_hfiles)
libnm_la_private_headers = \
nm-dbus-helpers.h \
nm-device-private.h \
nm-dhcp4-config.h \
nm-dhcp6-config.h \
nm-ip4-config.h \
nm-ip6-config.h \
nm-manager.h \
nm-object-cache.h \
nm-object-private.h \
nm-remote-connection-private.h \
nm-remote-settings.h
libnm_la_csources = \
nm-access-point.c \
nm-active-connection.c \
nm-client.c \
nm-dbus-helpers.c \
nm-device-adsl.c \
nm-device-bond.c \
nm-device-bridge.c \
nm-device-bt.c \
nm-device-ethernet.c \
nm-device-generic.c \
nm-device-infiniband.c \
nm-device-ip-tunnel.c \
nm-device-macvlan.c \
nm-device-modem.c \
nm-device-olpc-mesh.c \
nm-device-team.c \
nm-device-tun.c \
nm-device-vlan.c \
nm-device-vxlan.c \
nm-device-wifi.c \
nm-device-wimax.c \
nm-device.c \
nm-dhcp-config.c \
nm-dhcp4-config.c \
nm-dhcp6-config.c \
nm-enum-types.c \
nm-ip-config.c \
nm-ip4-config.c \
nm-ip6-config.c \
nm-manager.c \
nm-object-cache.c \
nm-object.c \
nm-remote-connection.c \
nm-remote-settings.c \
nm-secret-agent-old.c \
nm-vpn-connection.c \
nm-vpn-plugin-old.c \
nm-vpn-editor.c \
nm-vpn-service-plugin.c \
nm-wimax-nsp.c
libnm_la_SOURCES = \
$(libnm_la_csources) \
$(libnm_la_private_headers)
GLIB_GENERATED = nm-enum-types.h nm-enum-types.c
nm_enum_types_sources = $(libnminclude_HEADERS)
GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include <nm-core-enum-types.h>\n'
GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n'
EXTRA_libnm_la_DEPENDENCIES = \
libnm.ver
libnm_la_LIBADD = \
$(top_builddir)/libnm-core/libnm-core.la \
$(top_builddir)/introspection/libnmdbus.la \
$(DL_LIBS) \
$(GLIB_LIBS) \
$(UUID_LIBS) \
$(GUDEV_LIBS)
SYMBOL_VIS_FILE=$(srcdir)/libnm.ver
libnm_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \
$(CODE_COVERAGE_LDFLAGS) \
-version-info "1:0:1"
###
BUILT_SOURCES = $(GLIB_GENERATED)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libnm.pc
DISTCLEANFILES = libnm.pc
EXTRA_DIST = libnm.pc.in libnm.ver
CLEANFILES = $(BUILT_SOURCES)
-include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS =
INTROSPECTION_COMPILER_ARGS = \
--includedir=$(top_srcdir)/libnm-core \
--includedir=$(top_builddir)/libnm-core \
--includedir=$(top_srcdir)/libnm \
--includedir=$(top_builddir)/libnm
# Pass SANITIZER_ENV where a command that uses built libraries is
# executed, to suppress possible errors
INTROSPECTION_SCANNER_ENV = $(SANITIZER_ENV)
if HAVE_INTROSPECTION
introspection_sources = \
$(libnm_core_headers) \
$(libnminclude_hfiles) \
$(libnm_core_sources) \
$(libnm_la_csources)
NM-1.0.gir: libnm.la
NM_1_0_gir_INCLUDES = Gio-2.0
NM_1_0_gir_PACKAGES = gio-2.0 gudev-1.0
NM_1_0_gir_EXPORT_PACKAGES = libnm
NM_1_0_gir_CFLAGS = $(AM_CPPFLAGS)
NM_1_0_gir_LIBS = libnm.la
NM_1_0_gir_FILES = $(introspection_sources)
NM_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm
INTROSPECTION_GIRS += NM-1.0.gir
girdir = $(datadir)/gir-1.0
gir_DATA = $(INTROSPECTION_GIRS)
typelibdir = $(libdir)/girepository-1.0
typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
CLEANFILES += $(gir_DATA) $(typelib_DATA)
endif
check-local:
$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm.so $(SYMBOL_VIS_FILE)
if BUILD_SETTING_DOCS
noinst_DATA = \
nm-property-docs.xml \
nm-setting-docs-overrides.xml \
nm-setting-docs.xml \
nm-keyfile-docs.xml \
nm-ifcfg-rh-docs.xml
docs_sources = $(filter-out %/nm-core-enum-types.c,$(libnm_core_sources))
nm-setting-docs-overrides.xml: generate-plugin-docs.pl $(docs_sources)
$(srcdir)/generate-plugin-docs.pl dbus $(top_srcdir)/libnm-core $@
# When the python scripts loads libnm and the address sanitizers is
# enabled, we must LD_PRELOAD libasan otherwise it will complain that
# it was not loaded as initial library.
nm-property-docs.xml: generate-setting-docs.py $(docs_sources) | NM-1.0.gir NM-1.0.typelib libnm.la
export GI_TYPELIB_PATH=$(abs_builddir)$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}; \
export LD_LIBRARY_PATH=$(abs_builddir)/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}; \
$(call set_sanitizer_env,$(abs_builddir)/.libs/libnm.so); \
$(srcdir)/generate-setting-docs.py \
--gir $(builddir)/NM-1.0.gir \
--output $@
nm-setting-docs.xml: generate-setting-docs.py $(docs_sources) nm-setting-docs-overrides.xml | NM-1.0.gir NM-1.0.typelib libnm.la
export GI_TYPELIB_PATH=$(abs_builddir)$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}; \
export LD_LIBRARY_PATH=$(abs_builddir)/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}; \
$(call set_sanitizer_env,$(abs_builddir)/.libs/libnm.so); \
$(srcdir)/generate-setting-docs.py \
--gir $(builddir)/NM-1.0.gir \
--overrides $(builddir)/nm-setting-docs-overrides.xml \
--output $@
nm-keyfile-docs.xml: generate-plugin-docs.pl $(docs_sources)
$(srcdir)/generate-plugin-docs.pl keyfile $(top_srcdir)/libnm-core $@
nm-ifcfg-rh-docs.xml: generate-plugin-docs.pl $(docs_sources)
$(srcdir)/generate-plugin-docs.pl ifcfg-rh $(top_srcdir)/libnm-core $@
CLEANFILES += $(noinst_DATA)
EXTRA_DIST += $(noinst_DATA)
endif
EXTRA_DIST += generate-setting-docs.py generate-plugin-docs.pl

8
libnm/generate-plugin-docs.pl
View file

@ -60,12 +60,12 @@ my $start_tag = "---$plugin---\\s*\$";
my $end_tag = '---end---';
# get source files to scan for documentation comments (nm-setting-<something>.c)
my $file = "$srcdir/Makefile.libnm-core";
my $file = "$srcdir/Makefile.am";
open my $fh, '<', $file or die "Can't open $file: $!";
while (my $line = <$fh>) {
chomp $line;
my @strings = $line =~ /\/(nm-setting-[^.]*\.c)(?:\s|$)/g;
push @source_files, @strings
if ($line =~ /^\t*(libnm-core\/nm-setting-[^.]*\.c)( \\)?$/g) {
push @source_files, $1;
}
}
close $fh;

65
libnm/tests/Makefile.am
View file

@ -1,65 +0,0 @@
if ENABLE_TESTS
AM_CPPFLAGS = \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm \
-I$(top_builddir)/libnm \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
-DTEST_NM_SERVICE=\"$(abs_top_srcdir)/tools/test-networkmanager-service.py\" \
$(GLIB_CFLAGS)
LDADD = \
$(top_builddir)/libnm/libnm.la \
$(GLIB_LIBS)
noinst_PROGRAMS = $(TESTS)
if WITH_VALGRIND
@VALGRIND_RULES@ --launch-dbus
else
LOG_COMPILER = $(top_srcdir)/tools/run-test-dbus-session.sh
endif
TESTS = test-nm-client test-remote-settings-client test-secret-agent
test_nm_client_SOURCES = \
$(top_builddir)/shared/nm-test-utils-impl.c \
$(top_builddir)/shared/nm-test-libnm-utils.h \
test-nm-client.c
test_remote_settings_client_SOURCES = \
$(top_builddir)/shared/nm-test-utils-impl.c \
$(top_builddir)/shared/nm-test-libnm-utils.h \
test-remote-settings-client.c
test_secret_agent_SOURCES = \
$(top_builddir)/shared/nm-test-utils-impl.c \
$(top_builddir)/shared/nm-test-libnm-utils.h \
test-secret-agent.c
endif
###############################################################################
noinst_LTLIBRARIES = \
libnm-vpn-plugin-utils-test.la
libnm_vpn_plugin_utils_test_la_SOURCES = \
$(top_srcdir)/shared/nm-utils/nm-vpn-plugin-utils.c \
$(top_srcdir)/shared/nm-utils/nm-vpn-plugin-utils.h \
$(NULL)
libnm_vpn_plugin_utils_test_la_CFLAGS = \
$(GLIB_CFLAGS) \
-I$(top_srcdir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_srcdir)/libnm \
$(NULL)
libnm_vpn_plugin_utils_test_la_LIBADD = \
$(GLIB_LIBS) \
$(NULL)
###############################################################################

126
man/Makefile.am
View file

@ -1,126 +0,0 @@
man_MANS =
CLEANFILES =
EXTRA_DIST =
XSLTPROC = xsltproc
XSLTPROC_FLAGS = --xinclude --nonet
XSLTPROC_MAN_FLAGS = \
$(XSLTPROC_FLAGS) \
--stringparam man.output.quietly 1 \
--stringparam funcsynopsis.style ansi \
--stringparam man.th.extra1.suppress 1 \
--stringparam man.authors.section.enabled 0 \
--stringparam man.copyright.section.enabled 0 \
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
if ENABLE_GTK_DOC
%.1: %.xml common.ent
$(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $<
%.5: %.xml common.ent
$(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $<
%.7: %.xml common.ent
$(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $<
%.8: %.xml common.ent
$(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $<
endif
if BUILD_SETTING_DOCS
nm-settings.xml: nm-settings.xsl $(top_builddir)/libnm/nm-setting-docs.xml
$(AM_V_GEN) xsltproc --output $@ $^
nm-settings-keyfile.xml: nm-settings-keyfile.xsl $(top_builddir)/libnm/nm-keyfile-docs.xml
$(AM_V_GEN) xsltproc --output $@ $^
nm-settings-ifcfg-rh.xml: nm-settings-ifcfg-rh.xsl $(top_builddir)/libnm/nm-ifcfg-rh-docs.xml
$(AM_V_GEN) xsltproc --output $@ $^
CLEANFILES += \
nm-settings.xml \
nm-settings-keyfile.xml \
nm-settings-ifcfg-rh.xml
endif
man_pages = \
nmcli.1 \
nmtui.1 \
nm-online.1 \
NetworkManager.conf.5 \
nmcli-examples.7 \
NetworkManager.8
autogenerated_man_pages = \
nm-settings.5 \
nm-settings-keyfile.5
if CONFIG_PLUGIN_IFCFG_RH
autogenerated_man_pages += nm-settings-ifcfg-rh.5
else
EXTRA_DIST += nm-settings-ifcfg-rh.5
endif
EXTRA_DIST += \
nm-settings.xml \
nm-settings.xsl \
nm-settings-keyfile.xml \
nm-settings-keyfile.xsl \
nm-settings-ifcfg-rh.xml \
nm-settings-ifcfg-rh.xsl \
$(addsuffix .xml,$(basename $(man_pages))) \
$(man_pages) \
$(autogenerated_man_pages)
nmtui_links = nmtui-edit nmtui-connect nmtui-hostname
NetworkManager_conf_links = nm-system-settings.conf
# Implement a || condition
if INSTALL_PREGEN_MANPAGES
install_manpages = true
else
if ENABLE_GTK_DOC
install_manpages = true
endif
endif
install-data-hook:
if test -n "$(install_manpages)"; then \
for link in $(nmtui_links); do \
ln -f $(DESTDIR)$(mandir)/man1/nmtui.1 $(DESTDIR)$(mandir)/man1/$$link.1; \
done; \
for link in $(NetworkManager_conf_links); do \
ln -f $(DESTDIR)$(mandir)/man5/NetworkManager.conf.5 $(DESTDIR)$(mandir)/man5/$$link.5; \
done; \
fi
uninstall-hook:
if test -n "$(install_manpages)"; then \
for link in $(nmtui_links); do \
rm -f $(DESTDIR)$(mandir)/man1/$$link.1; \
done; \
for link in $(NetworkManager_conf_links); do \
rm -f $(DESTDIR)$(mandir)/man5/$$link.5; \
done; \
fi
if ENABLE_GTK_DOC
man_MANS += $(man_pages)
CLEANFILES += $(man_pages)
if SETTING_DOCS_AVAILABLE
man_MANS += $(autogenerated_man_pages)
CLEANFILES += $(autogenerated_man_pages)
endif
else
if INSTALL_PREGEN_MANPAGES
man_MANS += \
$(man_pages) \
$(autogenerated_man_pages)
endif
endif

11
nm.mk
View file

@ -1,11 +0,0 @@
# NetworkManager Makefile helpers
set_sanitizer_env = \
[ -n "$(SANITIZER_ENV)" ] && export $(SANITIZER_ENV) ; \
if [ -n "$(1)" ] && echo $(CFLAGS) | grep -e -fsanitize=address ; then \
export LD_PRELOAD="$${LD_PRELOAD}:$$(ldd $(1) | grep libasan\.so\.. -o | head -n 1)"; \
fi
check_so_symbols = \
$(call set_sanitizer_env,$(1)); \
LD_BIND_NOW=1 LD_PRELOAD=$${LD_PRELOAD}:$(1) $(top_builddir)/src/NetworkManager --version >/dev/null

637
src/Makefile.am
View file

@ -1,637 +0,0 @@
include $(GLIB_MAKEFILE)
@GNOME_CODE_COVERAGE_RULES@
SUBDIRS = \
. \
dhcp-manager \
ppp-manager \
settings/plugins \
devices/adsl
if WITH_MODEM_MANAGER_1
SUBDIRS += devices/wwan devices/bluetooth
endif
if WITH_WIFI
SUBDIRS += devices/wifi
endif
if WITH_TEAMDCTL
SUBDIRS += devices/team
endif
if ENABLE_TESTS
SUBDIRS += \
dhcp-manager/tests \
dnsmasq-manager/tests \
platform \
devices \
rdisc \
supplicant-manager/tests \
tests
endif
AM_CPPFLAGS = \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_builddir)/introspection \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
\
$(foreach d,$(sort $(dir $(libNetworkManager_la_SOURCES))),-I$(top_srcdir)/src/$d) \
\
-DPREFIX=\"$(prefix)\" \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
\
-DBINDIR=\"$(bindir)\" \
-DDATADIR=\"$(datadir)\" \
-DLIBEXECDIR=\"$(libexecdir)\" \
-DLOCALSTATEDIR=\"$(localstatedir)\" \
-DRUNSTATEDIR=\"$(runstatedir)\" \
-DSBINDIR=\"$(sbindir)\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DRUNDIR=\"$(rundir)\" \
\
-DNMCONFDIR=\"$(nmconfdir)\" \
-DNMLOCALEDIR=\"$(datadir)/locale\" \
-DNMPLUGINDIR=\"$(pkglibdir)\" \
-DNMRUNDIR=\"$(nmrundir)\" \
-DNMSTATEDIR=\"$(nmstatedir)\" \
-DNMLIBDIR=\"$(nmlibdir)\" \
\
-DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \
-DDHCPCD_PATH=\"$(DHCPCD_PATH)\" \
-DPPPD_PLUGIN_DIR=\"$(PPPD_PLUGIN_DIR)\" \
\
$(GLIB_CFLAGS) \
$(GUDEV_CFLAGS) \
$(LIBNL_CFLAGS) \
$(LIBNDP_CFLAGS) \
$(LIBSOUP_CFLAGS) \
$(SELINUX_CFLAGS) \
$(LIBAUDIT_CFLAGS) \
$(SYSTEMD_LOGIN_CFLAGS) \
$(SYSTEMD_JOURNAL_CFLAGS) \
$(CODE_COVERAGE_CFLAGS) \
\
$(NULL)
AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
sbin_PROGRAMS = \
NetworkManager
libexec_PROGRAMS = \
nm-iface-helper
noinst_LTLIBRARIES = \
libNetworkManagerBase.la \
libNetworkManager.la \
libNetworkManagerTest.la \
libsystemd-nm.la
###############################################################################
libsystemd_nm_la_SOURCES = \
systemd/nm-sd.c \
systemd/nm-sd.h \
systemd/sd-adapt/nm-sd-adapt.c \
systemd/sd-adapt/nm-sd-adapt.h \
systemd/sd-adapt/build.h \
systemd/sd-adapt/cgroup-util.h \
systemd/sd-adapt/condition.h \
systemd/sd-adapt/conf-parser.h \
systemd/sd-adapt/def.h \
systemd/sd-adapt/dirent-util.h \
systemd/sd-adapt/formats-util.h \
systemd/sd-adapt/gunicode.h \
systemd/sd-adapt/libudev.h \
systemd/sd-adapt/missing.h \
systemd/sd-adapt/mkdir.h \
systemd/sd-adapt/process-util.h \
systemd/sd-adapt/sd-daemon.h \
systemd/sd-adapt/stat-util.h \
systemd/sd-adapt/udev-util.h \
systemd/sd-adapt/udev.h \
systemd/sd-adapt/user-util.h \
systemd/sd-adapt/virt.h \
systemd/src/basic/alloc-util.c \
systemd/src/basic/alloc-util.h \
systemd/src/basic/async.h \
systemd/src/basic/escape.c \
systemd/src/basic/escape.h \
systemd/src/basic/ether-addr-util.c \
systemd/src/basic/ether-addr-util.h \
systemd/src/basic/extract-word.c \
systemd/src/basic/extract-word.h \
systemd/src/basic/fd-util.c \
systemd/src/basic/fd-util.h \
systemd/src/basic/fileio.c \
systemd/src/basic/fileio.h \
systemd/src/basic/fs-util.c \
systemd/src/basic/fs-util.h \
systemd/src/basic/hash-funcs.c \
systemd/src/basic/hash-funcs.h \
systemd/src/basic/hashmap.c \
systemd/src/basic/hashmap.h \
systemd/src/basic/hexdecoct.c \
systemd/src/basic/hexdecoct.h \
systemd/src/basic/hostname-util.c \
systemd/src/basic/hostname-util.h \
systemd/src/basic/in-addr-util.c \
systemd/src/basic/in-addr-util.h \
systemd/src/basic/io-util.c \
systemd/src/basic/io-util.h \
systemd/src/basic/list.h \
systemd/src/basic/log.h \
systemd/src/basic/macro.h \
systemd/src/basic/mempool.c \
systemd/src/basic/mempool.h \
systemd/src/basic/parse-util.c \
systemd/src/basic/parse-util.h \
systemd/src/basic/path-util.c \
systemd/src/basic/path-util.h \
systemd/src/basic/prioq.c \
systemd/src/basic/prioq.h \
systemd/src/basic/random-util.c \
systemd/src/basic/random-util.h \
systemd/src/basic/refcnt.h \
systemd/src/basic/set.h \
systemd/src/basic/signal-util.h \
systemd/src/basic/siphash24.c \
systemd/src/basic/siphash24.h \
systemd/src/basic/socket-util.c \
systemd/src/basic/socket-util.h \
systemd/src/basic/sparse-endian.h \
systemd/src/basic/stdio-util.h \
systemd/src/basic/string-table.c \
systemd/src/basic/string-table.h \
systemd/src/basic/string-util.c \
systemd/src/basic/string-util.h \
systemd/src/basic/strv.c \
systemd/src/basic/strv.h \
systemd/src/basic/time-util.c \
systemd/src/basic/time-util.h \
systemd/src/basic/umask-util.h \
systemd/src/basic/unaligned.h \
systemd/src/basic/utf8.c \
systemd/src/basic/utf8.h \
systemd/src/basic/util.c \
systemd/src/basic/util.h \
systemd/src/libsystemd-network/arp-util.c \
systemd/src/libsystemd-network/arp-util.h \
systemd/src/libsystemd-network/dhcp-identifier.c \
systemd/src/libsystemd-network/dhcp-identifier.h \
systemd/src/libsystemd-network/dhcp-internal.h \
systemd/src/libsystemd-network/dhcp-lease-internal.h \
systemd/src/libsystemd-network/dhcp-network.c \
systemd/src/libsystemd-network/dhcp-option.c \
systemd/src/libsystemd-network/dhcp-packet.c \
systemd/src/libsystemd-network/dhcp-protocol.h \
systemd/src/libsystemd-network/dhcp6-internal.h \
systemd/src/libsystemd-network/dhcp6-lease-internal.h \
systemd/src/libsystemd-network/dhcp6-network.c \
systemd/src/libsystemd-network/dhcp6-option.c \
systemd/src/libsystemd-network/dhcp6-protocol.h \
systemd/src/libsystemd-network/lldp-internal.h \
systemd/src/libsystemd-network/lldp-neighbor.c \
systemd/src/libsystemd-network/lldp-neighbor.h \
systemd/src/libsystemd-network/lldp-network.c \
systemd/src/libsystemd-network/lldp-network.h \
systemd/src/libsystemd-network/network-internal.c \
systemd/src/libsystemd-network/network-internal.h \
systemd/src/libsystemd-network/sd-dhcp-client.c \
systemd/src/libsystemd-network/sd-dhcp-lease.c \
systemd/src/libsystemd-network/sd-dhcp6-client.c \
systemd/src/libsystemd-network/sd-dhcp6-lease.c \
systemd/src/libsystemd-network/sd-ipv4acd.c \
systemd/src/libsystemd-network/sd-ipv4ll.c \
systemd/src/libsystemd-network/sd-lldp.c \
systemd/src/libsystemd/sd-event/sd-event.c \
systemd/src/libsystemd/sd-id128/id128-util.c \
systemd/src/libsystemd/sd-id128/id128-util.h \
systemd/src/libsystemd/sd-id128/sd-id128.c \
systemd/src/shared/dns-domain.c \
systemd/src/shared/dns-domain.h \
systemd/src/systemd/_sd-common.h \
systemd/src/systemd/sd-dhcp-client.h \
systemd/src/systemd/sd-dhcp-lease.h \
systemd/src/systemd/sd-dhcp6-client.h \
systemd/src/systemd/sd-dhcp6-lease.h \
systemd/src/systemd/sd-event.h \
systemd/src/systemd/sd-id128.h \
systemd/src/systemd/sd-ipv4acd.h \
systemd/src/systemd/sd-ipv4ll.h \
systemd/src/systemd/sd-lldp.h \
systemd/src/systemd/sd-ndisc.h
libsystemd_nm_la_CPPFLAGS = \
-I$(top_srcdir)/shared/ \
-I$(top_builddir)/shared/ \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src/systemd/sd-adapt/ \
-I$(top_srcdir)/src/systemd/src/systemd/ \
-I$(top_srcdir)/src/systemd/src/basic/ \
-I$(top_srcdir)/src/systemd/src/shared/ \
-I$(top_srcdir)/src/systemd/src/libsystemd-network/ \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \
$(GLIB_CFLAGS)
libsystemd_nm_la_LIBADD = \
$(GLIB_LIBS)
###############################################################################
libNetworkManagerBase_la_SOURCES = \
nm-core-utils.c \
nm-core-utils.h \
nm-logging.c \
nm-logging.h
libNetworkManagerBase_la_LIBADD = \
$(top_builddir)/libnm-core/libnm-core.la \
$(GLIB_LIBS) \
$(SYSTEMD_JOURNAL_LIBS) \
$(NULL)
###############################################################################
libNetworkManager_la_SOURCES = \
\
nm-checkpoint-manager.c \
nm-checkpoint-manager.h \
nm-checkpoint.c \
nm-checkpoint.h \
\
devices/nm-device.c \
devices/nm-device.h \
devices/nm-lldp-listener.c \
devices/nm-lldp-listener.h \
devices/nm-arping-manager.c \
devices/nm-arping-manager.h \
devices/nm-device-ethernet-utils.c \
devices/nm-device-ethernet-utils.h \
devices/nm-device-factory.c \
devices/nm-device-factory.h \
devices/nm-device-generic.c \
devices/nm-device-generic.h \
devices/nm-device-logging.h \
devices/nm-device-private.h \
\
devices/nm-device-bond.c \
devices/nm-device-bond.h \
devices/nm-device-bridge.c \
devices/nm-device-bridge.h \
devices/nm-device-ethernet.c \
devices/nm-device-ethernet.h \
devices/nm-device-infiniband.c \
devices/nm-device-infiniband.h \
devices/nm-device-ip-tunnel.c \
devices/nm-device-ip-tunnel.h \
devices/nm-device-macvlan.c \
devices/nm-device-macvlan.h \
devices/nm-device-tun.c \
devices/nm-device-tun.h \
devices/nm-device-veth.c \
devices/nm-device-veth.h \
devices/nm-device-vlan.c \
devices/nm-device-vlan.h \
devices/nm-device-vxlan.c \
devices/nm-device-vxlan.h \
\
dhcp-manager/nm-dhcp-client.c \
dhcp-manager/nm-dhcp-client.h \
dhcp-manager/nm-dhcp-client-logging.h \
dhcp-manager/nm-dhcp-utils.c \
dhcp-manager/nm-dhcp-manager.c \
dhcp-manager/nm-dhcp-manager.h \
dhcp-manager/nm-dhcp-utils.h \
dhcp-manager/nm-dhcp-dhclient.c \
dhcp-manager/nm-dhcp-dhcpcd.c \
dhcp-manager/nm-dhcp-systemd.c \
dhcp-manager/nm-dhcp-helper-api.h \
dhcp-manager/nm-dhcp-listener.c \
dhcp-manager/nm-dhcp-listener.h \
dhcp-manager/nm-dhcp-dhclient-utils.c \
dhcp-manager/nm-dhcp-dhclient-utils.h \
\
dns-manager/nm-dns-dnsmasq.c \
dns-manager/nm-dns-dnsmasq.h \
dns-manager/nm-dns-systemd-resolved.c \
dns-manager/nm-dns-systemd-resolved.h \
dns-manager/nm-dns-unbound.c \
dns-manager/nm-dns-unbound.h \
dns-manager/nm-dns-manager.c \
dns-manager/nm-dns-manager.h \
dns-manager/nm-dns-plugin.c \
dns-manager/nm-dns-plugin.h \
\
dnsmasq-manager/nm-dnsmasq-manager.c \
dnsmasq-manager/nm-dnsmasq-manager.h \
dnsmasq-manager/nm-dnsmasq-utils.c \
dnsmasq-manager/nm-dnsmasq-utils.h \
\
platform/nmp-netns.c \
platform/nmp-netns.h \
platform/nmp-object.c \
platform/nmp-object.h \
platform/nm-platform-utils.c \
platform/nm-platform-utils.h \
platform/nm-platform.c \
platform/nm-platform.h \
platform/nm-linux-platform.c \
platform/nm-linux-platform.h \
platform/wifi/wifi-utils-nl80211.c \
platform/wifi/wifi-utils-nl80211.h \
platform/wifi/wifi-utils-private.h \
platform/wifi/wifi-utils.c \
platform/wifi/wifi-utils.h \
\
rdisc/nm-lndp-rdisc.c \
rdisc/nm-lndp-rdisc.h \
rdisc/nm-rdisc.c \
rdisc/nm-rdisc.h \
rdisc/nm-rdisc-private.h \
\
ppp-manager/nm-ppp-manager.c \
ppp-manager/nm-ppp-manager.h \
ppp-manager/nm-ppp-status.h \
\
settings/nm-agent-manager.c \
settings/nm-agent-manager.h \
settings/nm-inotify-helper.c \
settings/nm-inotify-helper.h \
settings/nm-secret-agent.c \
settings/nm-secret-agent.h \
settings/nm-settings-connection.c \
settings/nm-settings-connection.h \
settings/nm-settings-plugin.c \
settings/nm-settings-plugin.h \
settings/nm-settings.c \
settings/nm-settings.h \
\
settings/plugins/keyfile/nms-keyfile-connection.c \
settings/plugins/keyfile/nms-keyfile-connection.h \
settings/plugins/keyfile/nms-keyfile-plugin.c \
settings/plugins/keyfile/nms-keyfile-plugin.h \
settings/plugins/keyfile/nms-keyfile-reader.c \
settings/plugins/keyfile/nms-keyfile-reader.h \
settings/plugins/keyfile/nms-keyfile-utils.c \
settings/plugins/keyfile/nms-keyfile-utils.h \
settings/plugins/keyfile/nms-keyfile-writer.c \
settings/plugins/keyfile/nms-keyfile-writer.h \
\
supplicant-manager/nm-supplicant-config.c \
supplicant-manager/nm-supplicant-config.h \
supplicant-manager/nm-supplicant-interface.c \
supplicant-manager/nm-supplicant-interface.h \
supplicant-manager/nm-supplicant-manager.c \
supplicant-manager/nm-supplicant-manager.h \
supplicant-manager/nm-supplicant-settings-verify.c \
supplicant-manager/nm-supplicant-settings-verify.h \
supplicant-manager/nm-supplicant-types.h \
\
vpn-manager/nm-vpn-connection.c \
vpn-manager/nm-vpn-connection.h \
vpn-manager/nm-vpn-manager.c \
vpn-manager/nm-vpn-manager.h \
\
nm-act-request.c \
nm-act-request.h \
nm-active-connection.c \
nm-active-connection.h \
nm-audit-manager.c \
nm-audit-manager.h \
nm-bus-manager.c \
nm-bus-manager.h \
nm-config.c \
nm-config.h \
nm-config-data.c \
nm-config-data.h \
nm-connectivity.c \
nm-connectivity.h \
nm-dcb.c \
nm-dcb.h \
nm-route-manager.c \
nm-route-manager.h \
nm-default-route-manager.c \
nm-default-route-manager.h \
nm-dhcp4-config.c \
nm-dhcp4-config.h \
nm-dhcp6-config.c \
nm-dhcp6-config.h \
nm-dispatcher.c \
nm-dispatcher.h \
nm-enum-types.c \
nm-enum-types.h \
nm-exported-object.c \
nm-exported-object.h \
nm-firewall-manager.c \
nm-firewall-manager.h \
nm-proxy-config.c \
nm-proxy-config.h \
nm-ip4-config.c \
nm-ip4-config.h \
nm-ip6-config.c \
nm-ip6-config.h \
nm-auth-manager.c \
nm-auth-manager.h \
nm-auth-subject.c \
nm-auth-subject.h \
nm-auth-utils.c \
nm-auth-utils.h \
nm-manager.c \
nm-manager.h \
nm-multi-index.c \
nm-multi-index.h \
nm-pacrunner-manager.c \
nm-pacrunner-manager.h \
nm-policy.c \
nm-policy.h \
nm-rfkill-manager.c \
nm-rfkill-manager.h \
nm-session-monitor.h \
nm-session-monitor.c \
nm-sleep-monitor.c \
nm-sleep-monitor.h \
nm-types.h \
NetworkManagerUtils.c \
NetworkManagerUtils.h \
$(NULL)
if WITH_WEXT
libNetworkManager_la_SOURCES += \
platform/wifi/wifi-utils-wext.c \
platform/wifi/wifi-utils-wext.h
endif
libNetworkManager_la_LIBADD = \
$(top_builddir)/libnm-core/libnm-core.la \
$(top_builddir)/introspection/libnmdbus.la \
libNetworkManagerBase.la \
libsystemd-nm.la \
$(GLIB_LIBS) \
$(GUDEV_LIBS) \
$(LIBNL_LIBS) \
$(SYSTEMD_LOGIN_LIBS) \
$(LIBNDP_LIBS) \
$(DL_LIBS) \
$(LIBM) \
$(SELINUX_LIBS) \
$(LIBAUDIT_LIBS)
if WITH_LIBSOUP
libNetworkManager_la_LIBADD += $(LIBSOUP_LIBS)
endif
###############################################################################
libNetworkManagerTest_la_SOURCES = \
rdisc/nm-fake-rdisc.c \
rdisc/nm-fake-rdisc.h \
platform/nm-fake-platform.c \
platform/nm-fake-platform.h
libNetworkManagerTest_la_LIBADD = \
libNetworkManager.la
###############################################################################
EXTRA_NetworkManager_DEPENDENCIES = \
NetworkManager.ver
NetworkManager_SOURCES = \
main-utils.c \
main-utils.h \
main.c
NetworkManager_LDADD = \
libNetworkManager.la
NetworkManager_LDFLAGS = \
-rdynamic \
-Wl,--version-script="$(srcdir)/NetworkManager.ver"
###############################################################################
nm_iface_helper_CFLAGS = \
-DNM_DHCP_INTERNAL_ONLY
nm_iface_helper_SOURCES = \
\
dhcp-manager/nm-dhcp-client.c \
dhcp-manager/nm-dhcp-client.h \
dhcp-manager/nm-dhcp-client-logging.h \
dhcp-manager/nm-dhcp-utils.c \
dhcp-manager/nm-dhcp-utils.h \
dhcp-manager/nm-dhcp-manager.c \
dhcp-manager/nm-dhcp-manager.h \
dhcp-manager/nm-dhcp-systemd.c \
\
platform/nmp-netns.c \
platform/nmp-netns.h \
platform/nmp-object.c \
platform/nmp-object.h \
platform/nm-platform-utils.c \
platform/nm-platform-utils.h \
platform/nm-platform.c \
platform/nm-platform.h \
platform/nm-linux-platform.c \
platform/nm-linux-platform.h \
platform/wifi/wifi-utils-nl80211.c \
platform/wifi/wifi-utils-nl80211.h \
platform/wifi/wifi-utils-private.h \
platform/wifi/wifi-utils.c \
platform/wifi/wifi-utils.h \
\
nm-pacrunner-manager.c \
nm-pacrunner-manager.h \
\
rdisc/nm-lndp-rdisc.c \
rdisc/nm-lndp-rdisc.h \
rdisc/nm-rdisc.c \
rdisc/nm-rdisc.h \
\
nm-route-manager.c \
nm-route-manager.h \
\
nm-exported-object.c \
nm-exported-object.h \
nm-proxy-config.c \
nm-proxy-config.h \
nm-ip4-config.c \
nm-ip4-config.h \
nm-ip6-config.c \
nm-ip6-config.h \
\
nm-enum-types.c \
nm-enum-types.h \
nm-multi-index.c \
nm-multi-index.h \
NetworkManagerUtils.c \
NetworkManagerUtils.h \
\
nm-iface-helper.c \
main-utils.c \
main-utils.h
if WITH_WEXT
nm_iface_helper_SOURCES += \
platform/wifi/wifi-utils-wext.c \
platform/wifi/wifi-utils-wext.h
endif
nm_iface_helper_LDADD = \
$(top_builddir)/libnm-core/libnm-core.la \
$(top_builddir)/introspection/libnmdbus.la \
libNetworkManagerBase.la \
libsystemd-nm.la \
$(GLIB_LIBS) \
$(GUDEV_LIBS) \
$(LIBNL_LIBS) \
$(LIBNDP_LIBS) \
$(DL_LIBS) \
$(LIBM)
nm_iface_helper_LDFLAGS = \
-Wl,--version-script="$(top_srcdir)/linker-script-binary.ver"
###############################################################################
GLIB_GENERATED = nm-enum-types.h nm-enum-types.c
GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include <nm-core-enum-types.h>\n'
GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n'
nm_enum_types_sources = $(filter-out \
%/nm-device-private.h \
%/nm-rdisc-private.h \
%/wifi-utils-private.h \
%/nm-dhcp-client-logging.h \
%/nm-device-logging.h \
, $(libNetworkManager_la_SOURCES))
BUILT_SOURCES = $(GLIB_GENERATED)
###############################################################################
dbusservicedir = $(DBUS_SYS_DIR)
dbusservice_DATA = org.freedesktop.NetworkManager.conf
EXTRA_DIST = \
$(dbusservice_DATA) \
$(NetworkManager_DATA) \
nm-test-utils-core.h \
NetworkManager.ver
rundir=$(runstatedir)/NetworkManager
statedir=$(localstatedir)/lib/NetworkManager
install-data-hook:
$(mkinstalldirs) -m 0755 $(DESTDIR)$(rundir)
$(mkinstalldirs) -m 0700 $(DESTDIR)$(statedir)
$(mkinstalldirs) -m 0755 $(DESTDIR)$(pkglibdir)
CLEANFILES = \
$(BUILT_SOURCES)

1
src/devices/Makefile.am
View file

@ -1 +0,0 @@
SUBDIRS = tests

38
src/devices/adsl/Makefile.am
View file

@ -1,38 +0,0 @@
include $(GLIB_MAKEFILE)
include $(top_srcdir)/nm.mk
@GNOME_CODE_COVERAGE_RULES@
AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_builddir}/src \
-I${top_srcdir}/src/devices \
-I${top_srcdir}/src/platform \
-I${top_builddir}/introspection \
-I${top_srcdir}/shared \
-I$(top_builddir)/shared \
-I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GUDEV_CFLAGS)
pkglib_LTLIBRARIES = libnm-device-plugin-adsl.la
libnm_device_plugin_adsl_la_SOURCES = \
nm-atm-manager.c \
nm-device-adsl.c \
nm-device-adsl.h
libnm_device_plugin_adsl_la_LDFLAGS = \
-module -avoid-version \
-Wl,--version-script="$(top_srcdir)/linker-script-devices.ver"
libnm_device_plugin_adsl_la_LIBADD = \
$(top_builddir)/introspection/libnmdbus.la \
$(GUDEV_LIBS)
check-local:
$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-device-plugin-adsl.so "$(top_srcdir)/linker-script-devices.ver"
$(call check_so_symbols,$(builddir)/.libs/libnm-device-plugin-adsl.so)

2
src/devices/adsl/nm-device-adsl.c
View file

@ -33,7 +33,7 @@
#include <string.h>
#include "nm-device-private.h"
#include "nm-enum-types.h"
#include "nm-src-enum-types.h"
#include "nm-platform.h"
#include "ppp-manager/nm-ppp-manager.h"
#include "ppp-manager/nm-ppp-status.h"

75
src/devices/bluetooth/Makefile.am
View file

@ -1,75 +0,0 @@
include $(GLIB_MAKEFILE)
include $(top_srcdir)/nm.mk
@GNOME_CODE_COVERAGE_RULES@
AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_builddir}/src \
-I${top_srcdir}/src/devices \
-I${top_srcdir}/src/settings \
-I${top_srcdir}/src/platform \
-I${top_srcdir}/src/devices/wwan \
-I${top_builddir}/introspection \
-I${top_srcdir}/shared \
-I$(top_builddir)/shared \
-I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS)
GLIB_GENERATED = nm-bt-enum-types.h nm-bt-enum-types.c
GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
nm_bt_enum_types_sources = $(srcdir)/nm-bt-error.h
BUILT_SOURCES = $(GLIB_GENERATED)
pkglib_LTLIBRARIES = libnm-device-plugin-bluetooth.la
libnm_device_plugin_bluetooth_la_SOURCES = \
nm-bluez-manager.c \
nm-bluez-common.h \
nm-bluez-device.c \
nm-bluez-device.h \
nm-bluez4-adapter.c \
nm-bluez4-adapter.h \
nm-bluez4-manager.c \
nm-bluez4-manager.h \
nm-bluez5-manager.c \
nm-bluez5-manager.h \
nm-bt-error.h \
nm-bt-error.c \
\
nm-device-bt.c \
nm-device-bt.h \
\
$(BUILT_SOURCES)
libnm_device_plugin_bluetooth_la_LDFLAGS = \
-module -avoid-version \
-Wl,--version-script="$(top_srcdir)/linker-script-devices.ver"
libnm_device_plugin_bluetooth_la_LIBADD = \
$(top_builddir)/introspection/libnmdbus.la \
$(top_builddir)/src/devices/wwan/libnm-wwan.la \
$(GLIB_LIBS) \
$(GUDEV_LIBS)
if WITH_BLUEZ5_DUN
AM_CPPFLAGS += $(BLUEZ5_CFLAGS)
libnm_device_plugin_bluetooth_la_SOURCES += \
nm-bluez5-dun.c \
nm-bluez5-dun.h
libnm_device_plugin_bluetooth_la_LIBADD += $(BLUEZ5_LIBS)
endif
CLEANFILES = $(BUILT_SOURCES)
check-local:
$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-device-plugin-bluetooth.so "$(top_srcdir)/linker-script-devices.ver"
$(call check_so_symbols,$(builddir)/.libs/libnm-device-plugin-bluetooth.so)

2
src/devices/nm-device-bond.c
View file

@ -28,7 +28,7 @@
#include "NetworkManagerUtils.h"
#include "nm-device-private.h"
#include "nm-platform.h"
#include "nm-enum-types.h"
#include "nm-src-enum-types.h"
#include "nm-device-factory.h"
#include "nm-core-internal.h"
#include "nm-ip4-config.h"

2
src/devices/nm-device-bridge.c
View file

@ -26,7 +26,7 @@
#include "NetworkManagerUtils.h"
#include "nm-device-private.h"
#include "nm-enum-types.h"
#include "nm-src-enum-types.h"
#include "nm-platform.h"
#include "nm-device-factory.h"
#include "nm-core-internal.h"

2
src/devices/nm-device-ethernet.c
View file

@ -40,7 +40,7 @@
#include "nm-supplicant-config.h"
#include "ppp-manager/nm-ppp-manager.h"
#include "ppp-manager/nm-ppp-status.h"
#include "nm-enum-types.h"
#include "nm-src-enum-types.h"
#include "nm-platform.h"
#include "nm-platform-utils.h"
#include "nm-dcb.h"

2
src/devices/nm-device-generic.c
View file

@ -23,7 +23,7 @@
#include "nm-device-generic.h"
#include "nm-device-private.h"
#include "nm-enum-types.h"
#include "nm-src-enum-types.h"
#include "nm-platform.h"
#include "nm-core-internal.h"

2
src/devices/nm-device-infiniband.c
View file

@ -26,7 +26,7 @@
#include "NetworkManagerUtils.h"
#include "nm-device-private.h"
#include "nm-enum-types.h"
#include "nm-src-enum-types.h"
#include "nm-act-request.h"
#include "nm-ip4-config.h"
#include "nm-platform.h"

2
src/devices/nm-device-vlan.c
View file

@ -28,7 +28,7 @@
#include "nm-utils.h"
#include "NetworkManagerUtils.h"
#include "nm-device-private.h"
#include "nm-enum-types.h"
#include "nm-src-enum-types.h"
#include "nm-settings.h"
#include "nm-act-request.h"
#include "nm-ip4-config.h"

2
src/devices/nm-device.c
View file

@ -53,7 +53,7 @@
#include "nm-dhcp6-config.h"
#include "nm-rfkill-manager.h"
#include "nm-firewall-manager.h"
#include "nm-enum-types.h"
#include "nm-src-enum-types.h"
#include "nm-settings-connection.h"
#include "nm-settings.h"
#include "nm-auth-utils.h"

48
src/devices/team/Makefile.am
View file

@ -1,48 +0,0 @@
include $(GLIB_MAKEFILE)
include $(top_srcdir)/nm.mk
@GNOME_CODE_COVERAGE_RULES@
AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_builddir}/src \
-I${top_srcdir}/src/devices \
-I${top_srcdir}/src/platform \
-I${top_srcdir}/src/settings \
-I${top_builddir}/introspection \
-I${top_srcdir}/shared \
-I$(top_builddir)/shared \
-I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS)
if WITH_TEAMDCTL
AM_CPPFLAGS += ${LIBTEAMDCTL_CFLAGS}
endif
pkglib_LTLIBRARIES = libnm-device-plugin-team.la
libnm_device_plugin_team_la_SOURCES = \
nm-team-factory.c \
nm-device-team.c \
nm-device-team.h
libnm_device_plugin_team_la_LDFLAGS = \
-module -avoid-version \
-Wl,--version-script="$(top_srcdir)/linker-script-devices.ver"
libnm_device_plugin_team_la_LIBADD = \
$(top_builddir)/introspection/libnmdbus.la \
$(GLIB_LIBS) \
$(GUDEV_LIBS)
if WITH_TEAMDCTL
libnm_device_plugin_team_la_LIBADD += $(LIBTEAMDCTL_LIBS)
endif
check-local:
$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-device-plugin-team.so "$(top_srcdir)/linker-script-devices.ver"
$(call check_so_symbols,$(builddir)/.libs/libnm-device-plugin-team.so)

2
src/devices/team/nm-device-team.c
View file

@ -32,7 +32,7 @@
#include "NetworkManagerUtils.h"
#include "nm-device-private.h"
#include "nm-platform.h"
#include "nm-enum-types.h"
#include "nm-src-enum-types.h"
#include "nm-core-internal.h"
#include "nm-ip4-config.h"
#include "nm-dbus-compat.h"

52
src/devices/tests/Makefile.am
View file

@ -1,52 +0,0 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/devices \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS)
AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
AM_LDFLAGS = $(GLIB_LIBS) $(CODE_COVERAGE_LDFLAGS)
DEVICES_LDADD = \
$(top_builddir)/src/libNetworkManager.la
@GNOME_CODE_COVERAGE_RULES@
noinst_PROGRAMS = \
test-lldp \
test-arping
test_lldp_SOURCES = \
test-lldp.c \
../nm-lldp-listener.c \
$(top_srcdir)/src/platform/tests/test-common.c
test_lldp_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(top_srcdir)/src/platform/tests \
-DSETUP=nm_linux_platform_setup
test_lldp_LDADD = $(DEVICES_LDADD)
test_arping_SOURCES = \
test-arping.c \
../nm-arping-manager.c \
$(top_srcdir)/src/platform/tests/test-common.c
test_arping_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(top_srcdir)/src/platform/tests \
-DSETUP=nm_linux_platform_setup
test_arping_LDADD = $(DEVICES_LDADD)
@VALGRIND_RULES@
TESTS = \
test-lldp \
test-arping

2
src/devices/tests/test-arping.c
View file

@ -125,6 +125,8 @@ fixture_teardown (test_fixture *fixture, gconstpointer user_data)
nm_platform_link_delete (NM_PLATFORM_GET, fixture->ifindex1);
}
NMTstpSetupFunc const _nmtstp_setup_platform_func = nm_linux_platform_setup;
void
_nmtstp_init_tests (int *argc, char ***argv)
{

2
src/devices/tests/test-lldp.c
View file

@ -432,6 +432,8 @@ _test_recv_fixture_teardown (TestRecvFixture *fixture, gconstpointer user_data)
/*****************************************************************************/
NMTstpSetupFunc const _nmtstp_setup_platform_func = nm_linux_platform_setup;
void
_nmtstp_init_tests (int *argc, char ***argv)
{

49
src/devices/wifi/Makefile.am
View file

@ -1,49 +0,0 @@
include $(GLIB_MAKEFILE)
include $(top_srcdir)/nm.mk
@GNOME_CODE_COVERAGE_RULES@
SUBDIRS=. tests
AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_builddir}/src \
-I${top_srcdir}/src/devices \
-I${top_srcdir}/src/settings \
-I${top_srcdir}/src/platform \
-I${top_srcdir}/src/supplicant-manager \
-I${top_builddir}/introspection \
-I${top_srcdir}/shared \
-I$(top_builddir)/shared \
-I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS)
pkglib_LTLIBRARIES = libnm-device-plugin-wifi.la
libnm_device_plugin_wifi_la_SOURCES = \
nm-wifi-factory.c \
nm-device-wifi.c \
nm-device-wifi.h \
nm-wifi-ap.c \
nm-wifi-ap.h \
nm-wifi-utils.c \
nm-wifi-utils.h \
nm-device-olpc-mesh.c \
nm-device-olpc-mesh.h
libnm_device_plugin_wifi_la_LDFLAGS = \
-module -avoid-version \
-Wl,--version-script="$(top_srcdir)/linker-script-devices.ver"
libnm_device_plugin_wifi_la_LIBADD = \
$(top_builddir)/introspection/libnmdbus.la \
$(GLIB_LIBS) \
$(GUDEV_LIBS)
check-local:
$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-device-plugin-wifi.so "$(top_srcdir)/linker-script-devices.ver"
$(call check_so_symbols,$(builddir)/.libs/libnm-device-plugin-wifi.so)

2
src/devices/wifi/nm-device-olpc-mesh.c
View file

@ -46,7 +46,7 @@
#include "nm-setting-connection.h"
#include "nm-setting-olpc-mesh.h"
#include "nm-manager.h"
#include "nm-enum-types.h"
#include "nm-src-enum-types.h"
#include "nm-platform.h"
/* This is a bug; but we can't really change API now... */

2
src/devices/wifi/nm-device-wifi.c
View file

@ -48,7 +48,7 @@
#include "nm-auth-utils.h"
#include "nm-settings-connection.h"
#include "nm-settings.h"
#include "nm-enum-types.h"
#include "nm-src-enum-types.h"
#include "nm-core-internal.h"
#include "nm-config.h"

31
src/devices/wifi/tests/Makefile.am
View file

@ -1,31 +0,0 @@
if ENABLE_TESTS
AM_CPPFLAGS = \
-I$(top_builddir)/introspection \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I${top_srcdir}/src/platform \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/devices/wifi \
-I$(top_builddir)/src \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS)
noinst_PROGRAMS = test-general
test_general_SOURCES = \
test-general.c \
$(srcdir)/../nm-wifi-ap.c \
$(srcdir)/../nm-wifi-ap.h \
$(srcdir)/../nm-wifi-utils.c \
$(srcdir)/../nm-wifi-utils.h
test_general_LDADD = $(top_builddir)/src/libNetworkManager.la
@VALGRIND_RULES@
TESTS = test-general
endif

90
src/devices/wwan/Makefile.am
View file

@ -1,90 +0,0 @@
include $(GLIB_MAKEFILE)
include $(top_srcdir)/nm.mk
@GNOME_CODE_COVERAGE_RULES@
AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_builddir}/src \
-I${top_srcdir}/src/devices \
-I${top_srcdir}/src/settings \
-I${top_srcdir}/src/platform \
-I${top_builddir}/introspection \
-I${top_srcdir}/shared \
-I$(top_builddir)/shared \
-I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
$(LIBSYSTEMD_CFLAGS) \
$(MM_GLIB_CFLAGS)
BUILT_SOURCES = $(null)
pkglib_LTLIBRARIES = libnm-wwan.la libnm-device-plugin-wwan.la
###########################################################
GLIB_GENERATED = nm-modem-enum-types.h nm-modem-enum-types.c
GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n'
nm_modem_enum_types_sources = $(srcdir)/nm-modem.h
BUILT_SOURCES += $(GLIB_GENERATED)
libnm_wwan_la_SOURCES = \
nm-modem-broadband.c \
nm-modem-broadband.h \
nm-modem-manager.c \
nm-modem-manager.h \
nm-modem.c \
nm-modem.h \
\
$(GLIB_GENERATED)
if WITH_OFONO
libnm_wwan_la_SOURCES += \
nm-modem-ofono.c \
nm-modem-ofono.h \
$(NULL)
endif
libnm_wwan_la_LDFLAGS = \
-avoid-version \
-Wl,--version-script="$(srcdir)/libnm-wwan.ver"
libnm_wwan_la_LIBADD = \
$(top_builddir)/introspection/libnmdbus.la \
$(GLIB_LIBS) \
$(LIBSYSTEMD_LIBS) \
$(MM_GLIB_LIBS)
###########################################################
libnm_device_plugin_wwan_la_SOURCES = \
nm-wwan-factory.c \
nm-device-modem.c \
nm-device-modem.h
libnm_device_plugin_wwan_la_LDFLAGS = \
-module -avoid-version \
-Wl,--version-script="$(top_srcdir)/linker-script-devices.ver"
libnm_device_plugin_wwan_la_LIBADD = \
$(top_builddir)/introspection/libnmdbus.la \
libnm-wwan.la \
$(GLIB_LIBS)
###########################################################
CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = \
libnm-wwan.ver
check-local:
$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-device-plugin-wwan.so "$(top_srcdir)/linker-script-devices.ver"
$(call check_so_symbols,$(builddir)/.libs/libnm-device-plugin-wwan.so)
$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-wwan.so "$(srcdir)/libnm-wwan.ver"
$(call check_so_symbols,$(builddir)/.libs/libnm-wwan.so)

20
src/dhcp-manager/Makefile.am
View file

@ -1,20 +0,0 @@
libexec_PROGRAMS = nm-dhcp-helper
nm_dhcp_helper_SOURCES = \
nm-dhcp-helper.c \
nm-dhcp-helper-api.h \
$(NULL)
nm_dhcp_helper_CPPFLAGS = \
$(GLIB_CFLAGS) \
-I$(top_srcdir)/shared \
-I${top_builddir}/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-DG_LOG_DOMAIN=\""nm-dhcp-helper"\" \
-DNMRUNDIR=\"$(nmrundir)\"
nm_dhcp_helper_LDFLAGS = \
-Wl,--version-script="$(top_srcdir)/linker-script-binary.ver"
nm_dhcp_helper_LDADD = $(GLIB_LIBS)

50
src/dhcp-manager/tests/Makefile.am
View file

@ -1,50 +0,0 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/shared \
-I${top_builddir}/shared \
-I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \
-I$(top_srcdir)/src/dhcp-manager \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/platform \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
-DTESTDIR="\"$(abs_srcdir)\""
noinst_PROGRAMS = \
test-dhcp-dhclient \
test-dhcp-utils
####### dhclient leases test #######
test_dhcp_dhclient_SOURCES = \
$(top_srcdir)/src/dhcp-manager/nm-dhcp-dhclient-utils.h \
$(top_srcdir)/src/dhcp-manager/nm-dhcp-dhclient-utils.c \
$(top_srcdir)/src/dhcp-manager/nm-dhcp-utils.h \
$(top_srcdir)/src/dhcp-manager/nm-dhcp-utils.c \
test-dhcp-dhclient.c
test_dhcp_dhclient_LDADD = \
$(top_builddir)/src/libNetworkManager.la
####### DHCP utils test #######
test_dhcp_utils_SOURCES = \
test-dhcp-utils.c
test_dhcp_utils_LDADD = \
$(top_builddir)/src/libNetworkManager.la
#################################
@VALGRIND_RULES@
TESTS = test-dhcp-dhclient test-dhcp-utils
EXTRA_DIST = \
test-dhclient-duid.leases \
test-dhclient-commented-duid.leases \
leases/basic.leases \
leases/malformed1.leases \
leases/malformed2.leases \
leases/malformed3.leases

24
src/dnsmasq-manager/tests/Makefile.am
View file

@ -1,24 +0,0 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/shared \
-I${top_builddir}/shared \
-I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \
-I$(top_srcdir)/src/dnsmasq-manager \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/platform \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
-DTESTDIR="\"$(abs_srcdir)\""
noinst_PROGRAMS = test-dnsmasq-utils
test_dnsmasq_utils_SOURCES = \
test-dnsmasq-utils.c
test_dnsmasq_utils_LDADD = \
$(top_builddir)/src/libNetworkManager.la
@VALGRIND_RULES@
TESTS = test-dnsmasq-utils

2
src/nm-auth-subject.c
View file

@ -34,7 +34,7 @@
#include <stdlib.h>
#include "nm-bus-manager.h"
#include "nm-enum-types.h"
#include "nm-src-enum-types.h"
#include "NetworkManagerUtils.h"
enum {

2
src/nm-config.c
View file

@ -29,7 +29,7 @@
#include "nm-utils.h"
#include "nm-device.h"
#include "NetworkManagerUtils.h"
#include "nm-enum-types.h"
#include "nm-src-enum-types.h"
#include "nm-core-internal.h"
#include "nm-keyfile-internal.h"

25
src/nm-core-utils.c
View file

@ -3135,6 +3135,19 @@ _set_stable_privacy (guint8 stable_type,
return TRUE;
}
gboolean
nm_utils_ipv6_addr_set_stable_privacy_impl (guint8 stable_type,
struct in6_addr *addr,
const char *ifname,
const char *network_id,
guint dad_counter,
guint8 *secret_key,
gsize key_len,
GError **error)
{
return _set_stable_privacy (stable_type, addr, ifname, network_id, dad_counter, secret_key, key_len, error);
}
#define RFC7217_IDGEN_RETRIES 3
/**
* nm_utils_ipv6_addr_set_stable_privacy:
@ -3287,6 +3300,18 @@ _hw_addr_gen_stable_eth (NMUtilsStableType stable_type,
return nm_utils_hwaddr_ntoa (&bin_addr, ETH_ALEN);
}
char *
nm_utils_hw_addr_gen_stable_eth_impl (NMUtilsStableType stable_type,
const char *stable_id,
const guint8 *secret_key,
gsize key_len,
const char *ifname,
const char *current_mac_address,
const char *generate_mac_address_mask)
{
return _hw_addr_gen_stable_eth (stable_type, stable_id, secret_key, key_len, ifname, current_mac_address, generate_mac_address_mask);
}
char *
nm_utils_hw_addr_gen_stable_eth (NMUtilsStableType stable_type,
const char *stable_id,

17
src/nm-core-utils.h
View file

@ -363,6 +363,16 @@ typedef enum { /*< skip >*/
NM_UTILS_STABLE_TYPE_STABLE_ID = 1,
} NMUtilsStableType;
gboolean nm_utils_ipv6_addr_set_stable_privacy_impl (guint8 stable_type,
struct in6_addr *addr,
const char *ifname,
const char *network_id,
guint dad_counter,
guint8 *secret_key,
gsize key_len,
GError **error);
gboolean nm_utils_ipv6_addr_set_stable_privacy (NMUtilsStableType id_type,
struct in6_addr *addr,
const char *ifname,
@ -372,6 +382,13 @@ gboolean nm_utils_ipv6_addr_set_stable_privacy (NMUtilsStableType id_type,
char *nm_utils_hw_addr_gen_random_eth (const char *current_mac_address,
const char *generate_mac_address_mask);
char *nm_utils_hw_addr_gen_stable_eth_impl (NMUtilsStableType stable_type,
const char *stable_id,
const guint8 *secret_key,
gsize key_len,
const char *ifname,
const char *current_mac_address,
const char *generate_mac_address_mask);
char *nm_utils_hw_addr_gen_stable_eth (NMUtilsStableType stable_type,
const char *stable_id,
const char *ifname,

2
src/nm-manager.c
View file

@ -43,7 +43,7 @@
#include "nm-auth-manager.h"
#include "NetworkManagerUtils.h"
#include "nm-device-factory.h"
#include "nm-enum-types.h"
#include "nm-src-enum-types.h"
#include "nm-sleep-monitor.h"
#include "nm-connectivity.h"
#include "nm-policy.h"

1
src/platform/Makefile.am
View file

@ -1 +0,0 @@
SUBDIRS = tests

2
src/platform/nm-platform.c
View file

@ -37,7 +37,7 @@
#include "nm-core-internal.h"
#include "nm-core-utils.h"
#include "nm-enum-types.h"
#include "nm-src-enum-types.h"
#include "nm-platform-utils.h"
#include "nmp-object.h"
#include "nmp-netns.h"

132
src/platform/tests/Makefile.am
View file

@ -1,132 +0,0 @@
AM_CPPFLAGS = \
-I${top_srcdir} \
-I${top_srcdir}/shared \
-I${top_builddir}/shared \
-I${top_srcdir}/src \
-I${top_builddir}/src \
-I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \
-I${srcdir}/.. \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
$(GUDEV_CFLAGS) \
$(LIBNL_CFLAGS)
if REQUIRE_ROOT_TESTS
AM_CPPFLAGS += -DREQUIRE_ROOT_TESTS=1
endif
PLATFORM_SOURCES = \
../nm-platform.c \
../nm-fake-platform.c \
../nm-linux-platform.c
TEST_SOURCES = \
test-common.c \
test-common.h \
$(PLATFORM_SOURCES)
AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
AM_LDFLAGS = $(GLIB_LIBS) $(GUDEV_LIBS) $(LIBNL_LIBS) $(CODE_COVERAGE_LDFLAGS)
PLATFORM_LDADD = \
$(top_builddir)/src/libNetworkManagerTest.la
@GNOME_CODE_COVERAGE_RULES@
noinst_PROGRAMS = \
monitor \
test-link-fake \
test-link-linux \
test-address-fake \
test-address-linux \
test-general \
test-nmp-object \
test-route-fake \
test-route-linux \
test-cleanup-fake \
test-cleanup-linux
EXTRA_DIST = test-common.h
monitor_SOURCES = monitor.c $(PLATFORM_SOURCES)
monitor_LDADD = $(PLATFORM_LDADD)
test_link_fake_SOURCES = $(TEST_SOURCES) test-link.c
test_link_fake_CPPFLAGS = \
$(AM_CPPFLAGS) \
-DSETUP=nm_fake_platform_setup \
-DKERNEL_HACKS=0
test_link_fake_LDADD = $(PLATFORM_LDADD)
test_link_linux_SOURCES = $(TEST_SOURCES) test-link.c
test_link_linux_CPPFLAGS = \
$(AM_CPPFLAGS) \
-DSETUP=nm_linux_platform_setup \
-DKERNEL_HACKS=1
test_link_linux_LDADD = $(PLATFORM_LDADD)
test_address_fake_SOURCES = $(TEST_SOURCES) test-address.c
test_address_fake_CPPFLAGS = \
$(AM_CPPFLAGS) \
-DSETUP=nm_fake_platform_setup \
-DKERNEL_HACKS=0
test_address_fake_LDADD = $(PLATFORM_LDADD)
test_address_linux_SOURCES = $(TEST_SOURCES) test-address.c
test_address_linux_CPPFLAGS = \
$(AM_CPPFLAGS) \
-DSETUP=nm_linux_platform_setup \
-DKERNEL_HACKS=1
test_address_linux_LDADD = $(PLATFORM_LDADD)
test_route_fake_SOURCES = $(TEST_SOURCES) test-route.c
test_route_fake_CPPFLAGS = \
$(AM_CPPFLAGS) \
-DSETUP=nm_fake_platform_setup \
-DKERNEL_HACKS=0
test_route_fake_LDADD = $(PLATFORM_LDADD)
test_route_linux_SOURCES = $(TEST_SOURCES) test-route.c
test_route_linux_CPPFLAGS = \
$(AM_CPPFLAGS) \
-DSETUP=nm_linux_platform_setup \
-DKERNEL_HACKS=1
test_route_linux_LDADD = $(PLATFORM_LDADD)
test_cleanup_fake_SOURCES = $(TEST_SOURCES) test-cleanup.c
test_cleanup_fake_CPPFLAGS = \
$(AM_CPPFLAGS) \
-DSETUP=nm_fake_platform_setup \
-DKERNEL_HACKS=0
test_cleanup_fake_LDADD = $(PLATFORM_LDADD)
test_cleanup_linux_SOURCES = $(TEST_SOURCES) test-cleanup.c
test_cleanup_linux_CPPFLAGS = \
$(AM_CPPFLAGS) \
-DSETUP=nm_linux_platform_setup \
-DKERNEL_HACKS=1
test_cleanup_linux_LDADD = $(PLATFORM_LDADD)
test_nmp_object_SOURCES = \
test-nmp-object.c
test_nmp_object_LDADD = \
$(top_builddir)/src/libNetworkManagerTest.la
test_general_SOURCES = \
test-general.c
test_general_LDADD = \
$(top_builddir)/src/libNetworkManagerTest.la
@VALGRIND_RULES@
TESTS = \
test-address-fake \
test-address-linux \
test-cleanup-fake \
test-cleanup-linux \
test-general \
test-link-fake \
test-link-linux \
test-nmp-object \
test-route-fake \
test-route-linux

2
src/platform/tests/test-address.c
View file

@ -354,6 +354,8 @@ test_ip4_address_peer_zero (void)
/*****************************************************************************/
NMTstpSetupFunc const _nmtstp_setup_platform_func = SETUP;
void
_nmtstp_init_tests (int *argc, char ***argv)
{

2
src/platform/tests/test-cleanup.c
View file

@ -106,6 +106,8 @@ test_cleanup_internal (void)
g_array_unref (routes6);
}
NMTstpSetupFunc const _nmtstp_setup_platform_func = SETUP;
void
_nmtstp_init_tests (int *argc, char ***argv)
{

14
src/platform/tests/test-common.c
View file

@ -32,12 +32,18 @@
/*****************************************************************************/
void
nmtstp_setup_platform (void)
{
g_assert (_nmtstp_setup_platform_func);
_nmtstp_setup_platform_func ();
}
gboolean
nmtstp_is_root_test (void)
{
NM_PRAGMA_WARNING_DISABLE("-Wtautological-compare")
return (SETUP == nm_linux_platform_setup);
NM_PRAGMA_WARNING_REENABLE
g_assert (_nmtstp_setup_platform_func);
return _nmtstp_setup_platform_func == nm_linux_platform_setup;
}
gboolean
@ -1663,7 +1669,7 @@ main (int argc, char **argv)
}
}
SETUP ();
nmtstp_setup_platform ();
_nmtstp_setup_tests ();

6
src/platform/tests/test-common.h
View file

@ -207,8 +207,12 @@ void nmtstp_link_del (NMPlatform *platform,
int ifindex,
const char *name);
typedef void (*NMTstpSetupFunc) (void);
extern NMTstpSetupFunc const _nmtstp_setup_platform_func;
void nmtstp_setup_platform (void);
/*****************************************************************************/
void _nmtstp_init_tests (int *argc, char ***argv);
void _nmtstp_setup_tests (void);

5
src/platform/tests/test-link.c
View file

@ -1883,8 +1883,7 @@ _test_netns_setup (gpointer fixture, gconstpointer test_data)
static void
_test_netns_teardown (gpointer fixture, gconstpointer test_data)
{
/* re-create platform instance */
SETUP ();
nmtstp_setup_platform ();
}
static NMPlatform *
@ -2323,6 +2322,8 @@ test_netns_bind_to_path (gpointer fixture, gconstpointer test_data)
/*****************************************************************************/
NMTstpSetupFunc const _nmtstp_setup_platform_func = SETUP;
void
_nmtstp_init_tests (int *argc, char ***argv)
{

2
src/platform/tests/test-route.c
View file

@ -328,6 +328,8 @@ test_ip4_zero_gateway (void)
/*****************************************************************************/
NMTstpSetupFunc const _nmtstp_setup_platform_func = SETUP;
void
_nmtstp_init_tests (int *argc, char ***argv)
{

28
src/ppp-manager/Makefile.am
View file

@ -1,28 +0,0 @@
if WITH_PPP
AM_CPPFLAGS = \
-I${top_srcdir}/shared \
-I${top_builddir}/shared \
-I${top_srcdir}/libnm-core \
-I${top_srcdir}/src \
-I${top_builddir}/libnm-core \
-DG_LOG_DOMAIN=\""nm-pppd-plugin"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS)
pppd_plugindir = $(PPPD_PLUGIN_DIR)
pppd_plugin_LTLIBRARIES = nm-pppd-plugin.la
nm_pppd_plugin_la_SOURCES = \
nm-pppd-plugin.c \
nm-pppd-plugin.h \
nm-ppp-status.h
nm_pppd_plugin_la_LDFLAGS = -module -avoid-version
nm_pppd_plugin_la_LIBADD = \
$(GLIB_LIBS) \
$(DL_LIBS) \
$(NULL)
endif

1
src/rdisc/Makefile.am
View file

@ -1 +0,0 @@
SUBDIRS = tests

36
src/rdisc/tests/Makefile.am
View file

@ -1,36 +0,0 @@
AM_CPPFLAGS = \
-I${top_srcdir} \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I${top_srcdir}/src \
-I${top_srcdir}/src/platform \
-I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \
-I${srcdir}/.. \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
$(LIBNDP_CFLAGS)
AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
AM_LDFLAGS = \
$(GLIB_LIBS) \
$(CODE_COVERAGE_LDFLAGS)
@GNOME_CODE_COVERAGE_RULES@
noinst_PROGRAMS = test-rdisc-linux test-rdisc-fake
test_rdisc_linux_SOURCES = \
test-rdisc-linux.c
test_rdisc_linux_LDADD = \
$(top_builddir)/src/libNetworkManager.la
test_rdisc_fake_SOURCES = \
test-rdisc-fake.c
test_rdisc_fake_LDADD = \
$(top_builddir)/src/libNetworkManagerTest.la
@VALGRIND_RULES@
TESTS = test-rdisc-fake

2
src/settings/nm-agent-manager.c
View file

@ -30,7 +30,7 @@
#include "nm-secret-agent.h"
#include "nm-auth-utils.h"
#include "nm-setting-vpn.h"
#include "nm-enum-types.h"
#include "nm-src-enum-types.h"
#include "nm-auth-manager.h"
#include "nm-bus-manager.h"
#include "nm-session-monitor.h"

19
src/settings/plugins/Makefile.am
View file

@ -1,19 +0,0 @@
SUBDIRS=keyfile
@GNOME_CODE_COVERAGE_RULES@
if CONFIG_PLUGIN_IBFT
SUBDIRS+=ibft
endif
if CONFIG_PLUGIN_IFCFG_RH
SUBDIRS+=ifcfg-rh
endif
if CONFIG_PLUGIN_IFUPDOWN
SUBDIRS+=ifupdown
endif
if CONFIG_PLUGIN_IFNET
SUBDIRS+=ifnet
endif

53
src/settings/plugins/ibft/Makefile.am
View file

@ -1,53 +0,0 @@
SUBDIRS = . tests
@GNOME_CODE_COVERAGE_RULES@
include $(top_srcdir)/nm.mk
pkglib_LTLIBRARIES = libnm-settings-plugin-ibft.la
noinst_LTLIBRARIES = libnms-ibft-core.la
AM_CPPFLAGS = \
-I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DSBINDIR=\"$(sbindir)\"
###############################################################################
libnms_ibft_core_la_SOURCES = \
nms-ibft-reader.c \
nms-ibft-reader.h
###############################################################################
libnm_settings_plugin_ibft_la_SOURCES = \
nms-ibft-plugin.c \
nms-ibft-plugin.h \
nms-ibft-connection.c \
nms-ibft-connection.h
libnm_settings_plugin_ibft_la_LDFLAGS = \
-module -avoid-version \
-Wl,--version-script="$(top_srcdir)/linker-script-settings.ver"
libnm_settings_plugin_ibft_la_LIBADD = \
libnms-ibft-core.la
###############################################################################
check-local:
$(call check_so_symbols,$(builddir)/.libs/libnm-settings-plugin-ibft.so)
###############################################################################
CLEANFILES = $(BUILT_SOURCES)

49
src/settings/plugins/ibft/tests/Makefile.am
View file

@ -1,49 +0,0 @@
if ENABLE_TESTS
@GNOME_CODE_COVERAGE_RULES@
AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(CODE_COVERAGE_CFLAGS) \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings \
-I$(srcdir)/../ \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DTEST_IBFT_DIR=\"$(abs_srcdir)\" \
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/\"
AM_LDFLAGS = \
$(GLIB_LIBS) \
$(CODE_COVERAGE_LDFLAGS)
noinst_PROGRAMS = test-ibft
test_ibft_SOURCES = \
test-ibft.c
test_ibft_LDADD = \
$(top_builddir)/src/settings/plugins/ibft/libnms-ibft-core.la \
$(top_builddir)/src/libNetworkManager.la
@VALGRIND_RULES@
TESTS = test-ibft
endif
EXTRA_DIST = \
iscsiadm-test-dhcp \
iscsiadm-test-static \
iscsiadm-test-bad-ipaddr \
iscsiadm-test-bad-gateway \
iscsiadm-test-bad-dns1 \
iscsiadm-test-bad-dns2 \
iscsiadm-test-bad-entry \
iscsiadm-test-bad-record \
iscsiadm-test-vlan

96
src/settings/plugins/ifcfg-rh/Makefile.am
View file

@ -1,96 +0,0 @@
SUBDIRS = . tests
@GNOME_CODE_COVERAGE_RULES@
include $(top_srcdir)/nm.mk
pkglib_LTLIBRARIES = \
libnm-settings-plugin-ifcfg-rh.la
noinst_LTLIBRARIES = \
libnmdbus-ifcfg-rh.la \
libnms-ifcfg-rh-core.la
AM_CPPFLAGS = \
-I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
$(NSS_CFLAGS) \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DSBINDIR=\"$(sbindir)\"
BUILT_SOURCES = \
nmdbus-ifcfg-rh.h \
nmdbus-ifcfg-rh.c
###############################################################################
nodist_libnmdbus_ifcfg_rh_la_SOURCES = \
nmdbus-ifcfg-rh.c \
nmdbus-ifcfg-rh.h
libnmdbus_ifcfg_rh_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(AM_CPPFLAGS))
nmdbus-ifcfg-rh.h: nm-ifcfg-rh.xml
$(AM_V_GEN) gdbus-codegen \
--generate-c-code $(basename $@) \
--c-namespace NMDBus \
--interface-prefix com.redhat \
$<
nmdbus-ifcfg-rh.c: nmdbus-ifcfg-rh.h
@true
###############################################################################
libnms_ifcfg_rh_core_la_SOURCES = \
nms-ifcfg-rh-common.h \
shvar.c \
shvar.h \
nms-ifcfg-rh-utils.c \
nms-ifcfg-rh-utils.h \
nms-ifcfg-rh-reader.c \
nms-ifcfg-rh-reader.h \
nms-ifcfg-rh-writer.c \
nms-ifcfg-rh-writer.h
###############################################################################
libnm_settings_plugin_ifcfg_rh_la_SOURCES = \
nms-ifcfg-rh-connection.c \
nms-ifcfg-rh-connection.h \
nms-ifcfg-rh-plugin.c \
nms-ifcfg-rh-plugin.h
libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = \
-module -avoid-version \
-Wl,--version-script="$(top_srcdir)/linker-script-settings.ver"
libnm_settings_plugin_ifcfg_rh_la_LIBADD = \
libnms-ifcfg-rh-core.la \
libnmdbus-ifcfg-rh.la
###############################################################################
check-local:
$(call check_so_symbols,$(builddir)/.libs/libnm-settings-plugin-ifcfg-rh.so)
###############################################################################
dbusservicedir = $(DBUS_SYS_DIR)
dbusservice_DATA = nm-ifcfg-rh.conf
EXTRA_DIST = \
$(dbusservice_DATA) \
nm-ifcfg-rh.xml
CLEANFILES = $(BUILT_SOURCES)

41
src/settings/plugins/ifcfg-rh/tests/Makefile.am
View file

@ -1,41 +0,0 @@
if ENABLE_TESTS
SUBDIRS=network-scripts
@GNOME_CODE_COVERAGE_RULES@
AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(CODE_COVERAGE_CFLAGS) \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings \
-I$(srcdir)/../ \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DTEST_IFCFG_DIR=\"$(abs_srcdir)\" \
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/\" \
-DSYSCONFDIR=\"nonexistent\" \
-DSBINDIR=\"nonexistent\"
AM_LDFLAGS = \
$(GLIB_LIBS) \
$(CODE_COVERAGE_LDFLAGS)
noinst_PROGRAMS = test-ifcfg-rh
test_ifcfg_rh_SOURCES = \
test-ifcfg-rh.c
test_ifcfg_rh_LDADD = \
$(top_builddir)/src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \
$(top_builddir)/src/libNetworkManager.la
@VALGRIND_RULES@
TESTS = test-ifcfg-rh
endif

170
src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am
View file

@ -1,170 +0,0 @@
EXTRA_DIST = \
ifcfg-test-minimal \
ifcfg-test-misc-variables \
ifcfg-test-variables-corner-cases-1 \
ifcfg-test-nm-controlled \
ifcfg-test-nm-controlled-unrecognized \
ifcfg-test-unrecognized \
ifcfg-test-wired-static \
ifcfg-test-wired-static-bootproto \
ifcfg-test-wired-dhcp \
ifcfg-test-wired-dhcp-plus-ip \
ifcfg-test-wired-shared-plus-ip \
ifcfg-test-wired-dhcp-send-hostname \
ifcfg-test-wired-dhcp6-only \
ifcfg-test-wired-autoip \
ifcfg-test-wired-global-gateway \
network-test-wired-global-gateway \
ifcfg-test-wired-global-gateway-ignore \
network-test-wired-global-gateway-ignore \
ifcfg-test-wired-obsolete-gateway-n \
ifcfg-test-wired-never-default \
network-test-wired-never-default \
ifcfg-test-wired-defroute-no \
ifcfg-test-wired-defroute-no-gatewaydev-yes \
network-test-wired-defroute-no-gatewaydev-yes \
ifcfg-test-wired-8021x-peap-mschapv2 \
keys-test-wired-8021x-peap-mschapv2 \
ifcfg-test-wired-8021x-tls-agent \
ifcfg-test-wired-8021x-tls-always \
ifcfg-test-wired-802-1X-subj-matches \
ifcfg-test-wired-802-1x-ttls-eapgtc \
ifcfg-test-onboot-no \
ifcfg-test-noip \
ifcfg-test-wifi-open \
ifcfg-test-wifi-open-auto \
ifcfg-test-wifi-open-ssid-quoted \
ifcfg-test-wifi-open-ssid-long-quoted \
ifcfg-test-wifi-open-ssid-hex \
ifcfg-test-wifi-open-ssid-long-hex \
ifcfg-test-wifi-open-ssid-bad-hex \
ifcfg-test-wifi-wep \
keys-test-wifi-wep \
ifcfg-test-wifi-wep-adhoc \
keys-test-wifi-wep-adhoc \
ifcfg-test-wifi-wep-eap-ttls-chap \
keys-test-wifi-wep-eap-ttls-chap \
ifcfg-test-wifi-leap \
keys-test-wifi-leap \
ifcfg-test-wifi-leap-agent \
ifcfg-test-wifi-leap-always-ask \
ifcfg-test-wifi-wpa-psk \
keys-test-wifi-wpa-psk \
ifcfg-test-wifi-wpa-psk-2 \
keys-test-wifi-wpa-psk-2 \
ifcfg-test-wifi-wpa-psk-unquoted \
keys-test-wifi-wpa-psk-unquoted \
ifcfg-test-wifi-wpa-psk-unquoted2 \
keys-test-wifi-wpa-psk-unquoted2 \
ifcfg-test-wifi-wpa-psk-adhoc \
keys-test-wifi-wpa-psk-adhoc \
ifcfg-test-wifi-wpa-psk-hex \
keys-test-wifi-wpa-psk-hex \
ifcfg-test-wifi-wpa-eap-tls \
keys-test-wifi-wpa-eap-tls \
ifcfg-test-wifi-wpa-eap-ttls-tls \
keys-test-wifi-wpa-eap-ttls-tls \
ifcfg-test-wifi-hidden \
ifcfg-test-wifi-band-a \
ifcfg-test-wifi-band-a-channel-mismatch \
ifcfg-test-wifi-band-bg-channel-mismatch \
ifcfg-test-wifi-mac-random-always \
ifcfg-test-wifi-mac-random-never \
ifcfg-test-wifi-mac-random-default \
ifcfg-test-wifi-mac-random-missing \
test_ca_cert.pem \
test1_key_and_cert.pem \
ifcfg-test-ibft \
ifcfg-test-static-routes-legacy \
route-test-static-routes-legacy \
ifcfg-test-sit-ignore \
ifcfg-test-wired-static-routes \
route-test-wired-static-routes \
ifcfg-test-wired-static-routes-legacy \
route-test-wired-static-routes-legacy \
ifcfg-test-wired-ipv4-manual-1 \
ifcfg-test-wired-ipv4-manual-2 \
ifcfg-test-wired-ipv4-manual-3 \
ifcfg-test-wired-ipv4-manual-4 \
ifcfg-test-wired-ipv6-manual \
route6-test-wired-ipv6-manual \
ifcfg-test-wired-static-no-prefix-8 \
ifcfg-test-wired-static-no-prefix-16 \
ifcfg-test-wired-static-no-prefix-24 \
ifcfg-test-wired-ipv6-only \
ifcfg-test-wifi-wep-passphrase \
keys-test-wifi-wep-passphrase \
ifcfg-test-wifi-wep-40-ascii \
keys-test-wifi-wep-40-ascii \
ifcfg-test-wifi-wep-104-ascii \
keys-test-wifi-wep-104-ascii \
ifcfg-test-wired-qeth-static \
ifcfg-test-wired-ctc-static \
ifcfg-test-bridge-main \
ifcfg-test-bridge-component \
ifcfg-test-bridge-missing-stp \
ifcfg-test-vlan-interface \
ifcfg-test-vlan-only-vlanid \
ifcfg-test-vlan-only-device \
ifcfg-test-vlan-physdev \
ifcfg-test-vlan-reorder-hdr-1 \
ifcfg-test-vlan-reorder-hdr-2 \
ifcfg-test-vlan-flags-1 \
ifcfg-test-vlan-flags-2 \
ifcfg-test-wifi-wep-no-keys \
ifcfg-test-permissions \
ifcfg-test-wifi-wep-agent-keys \
ifcfg-test-wifi-dynamic-wep-leap \
keys-test-wifi-dynamic-wep-leap \
ifcfg-test-infiniband \
ifcfg-test-bond-main \
ifcfg-test-bond-slave \
ifcfg-test-bond-slave-ib \
ifcfg-test-bond-mode-numeric \
ifcfg-test-dcb \
ifcfg-test-dcb-default-app-priorities \
ifcfg-test-dcb-bad-booleans \
ifcfg-test-dcb-short-booleans \
ifcfg-test-dcb-bad-uints \
ifcfg-test-dcb-short-uints \
ifcfg-test-dcb-bad-percent \
ifcfg-test-dcb-short-percent \
ifcfg-test-dcb-pgpct-not-100 \
ifcfg-test-fcoe-fabric \
ifcfg-test-fcoe-vn2vn \
ifcfg-test-team-master-1 \
ifcfg-test-team-master-2 \
ifcfg-test-team-master-invalid \
ifcfg-test-team-port-1 \
ifcfg-test-team-port-2 \
ifcfg-test-team-port-empty-config \
ifcfg-test-vlan-trailing-spaces \
ifcfg-test-dns-options \
ifcfg-test-wired-wake-on-lan \
ifcfg-test-wired-ipv6-only-1
# make target dependencies can't have colons in their names, which ends up
# meaning that we can't add the alias files to EXTRA_DIST
ALIAS_FILES = \
ifcfg-aliasem0 \
ifcfg-aliasem0:1 \
ifcfg-aliasem0:2 \
ifcfg-aliasem0:99 \
ifcfg-aliasem1 \
ifcfg-aliasem1:1 \
ifcfg-aliasem2 \
ifcfg-aliasem2:1
dist-hook:
@for f in $(ALIAS_FILES); do \
cp $(abs_srcdir)/$$f $(distdir)/; \
done
check-local:
@for f in $(EXTRA_DIST) $(ALIAS_FILES); do \
chmod 0600 $(abs_srcdir)/$$f; \
done
# Make the special temp dir for some written connections
mkdir -p $(abs_builddir)/tmp

3
src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
View file

@ -8982,6 +8982,9 @@ int main (int argc, char **argv)
{
nmtst_init_assert_logging (&argc, &argv, "INFO", "DEFAULT");
if (g_mkdir_with_parents (TEST_SCRATCH_DIR"/network-scripts/tmp", 0755) != 0)
g_error ("failure to create test directory \"%s\": %s", TEST_SCRATCH_DIR"/network-scripts/tmp", g_strerror (errno));
g_test_add_func (TPATH "svUnescape", test_svUnescape);
g_test_add_func (TPATH "vlan-trailing-spaces", test_read_vlan_trailing_spaces);

57
src/settings/plugins/ifnet/Makefile.am
View file

@ -1,57 +0,0 @@
SUBDIRS = . tests
@GNOME_CODE_COVERAGE_RULES@
include $(top_srcdir)/nm.mk
pkglib_LTLIBRARIES = \
libnm-settings-plugin-ifnet.la
noinst_LTLIBRARIES = \
libnms-ifnet-core.la
AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
-DSYSCONFDIR=\"$(sysconfdir)\"
-DSBINDIR=\"$(sbindir)\"
###############################################################################
libnms_ifnet_core_la_SOURCES = \
nms-ifnet-net-parser.c\
nms-ifnet-net-parser.h\
nms-ifnet-connection-parser.c \
nms-ifnet-connection-parser.h \
nms-ifnet-net-utils.h\
nms-ifnet-net-utils.c\
nms-ifnet-wpa-parser.h\
nms-ifnet-wpa-parser.c
###############################################################################
libnm_settings_plugin_ifnet_la_SOURCES = \
nms-ifnet-connection.c \
nms-ifnet-connection.h \
nms-ifnet-plugin.c \
nms-ifnet-plugin.h
libnm_settings_plugin_ifnet_la_LDFLAGS = \
-module -avoid-version \
-Wl,--version-script="$(top_srcdir)/linker-script-settings.ver"
libnm_settings_plugin_ifnet_la_LIBADD = \
libnms-ifnet-core.la
###############################################################################
check-local:
$(call check_so_symbols,$(builddir)/.libs/libnm-settings-plugin-ifnet.so)

47
src/settings/plugins/ifnet/tests/Makefile.am
View file

@ -1,47 +0,0 @@
if ENABLE_TESTS
@GNOME_CODE_COVERAGE_RULES@
AM_CPPFLAGS= \
-I$(srcdir)/../ \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/src/platform \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(CHECK_CFLAGS) \
$(GLIB_CFLAGS) \
$(CODE_COVERAGE_CFLAGS) \
-DTEST_IFNET_DIR=\"$(abs_srcdir)\" \
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/\" \
-DTEST_WPA_SUPPLICANT_CONF='"$(srcdir)/wpa_supplicant.conf"' \
-DSYSCONFDIR=\"nonexistent\"
noinst_PROGRAMS = test-ifnet
test_ifnet_SOURCES = \
test-ifnet.c
test_ifnet_LDFLAGS = \
$(GLIB_LDFLAGS)
$(CODE_COVERAGE_LDFLAGS)
test_ifnet_LDADD = \
$(top_builddir)/src/settings/plugins/ifnet/libnms-ifnet-core.la \
$(top_builddir)/src/libNetworkManager.la
@VALGRIND_RULES@
TESTS = test-ifnet
endif
EXTRA_DIST = \
net \
net.all \
nm-system-settings.conf \
wpa_supplicant.conf \
test_ca_cert.pem

52
src/settings/plugins/ifupdown/Makefile.am
View file

@ -1,52 +0,0 @@
SUBDIRS = . tests
@GNOME_CODE_COVERAGE_RULES@
include $(top_srcdir)/nm.mk
pkglib_LTLIBRARIES = \
libnm-settings-plugin-ifupdown.la
noinst_LTLIBRARIES = \
libnms-ifupdown-core.la
AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
$(GUDEV_CFLAGS) \
-DSYSCONFDIR=\"$(sysconfdir)\"
###############################################################################
libnms_ifupdown_core_la_SOURCES = \
nms-ifupdown-interface-parser.c \
nms-ifupdown-interface-parser.h \
nms-ifupdown-parser.c \
nms-ifupdown-parser.h
###############################################################################
libnm_settings_plugin_ifupdown_la_SOURCES = \
nms-ifupdown-connection.c \
nms-ifupdown-connection.h \
nms-ifupdown-plugin.c \
nms-ifupdown-plugin.h
libnm_settings_plugin_ifupdown_la_LDFLAGS = \
-module -avoid-version \
-Wl,--version-script="$(top_srcdir)/linker-script-settings.ver"
libnm_settings_plugin_ifupdown_la_LIBADD = \
libnms-ifupdown-core.la
###############################################################################
check-local:
$(call check_so_symbols,$(builddir)/.libs/libnm-settings-plugin-ifupdown.so)

39
src/settings/plugins/ifupdown/tests/Makefile.am
View file

@ -1,39 +0,0 @@
if ENABLE_TESTS
AM_CPPFLAGS = \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/settings \
-I$(srcdir)/../ \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
-DTEST_ENI_DIR=\"$(abs_srcdir)\"
noinst_PROGRAMS = test-ifupdown
test_ifupdown_SOURCES = \
test-ifupdown.c
test_ifupdown_LDFLAGS = \
$(GLIB_LDFLAGS)
$(CODE_COVERAGE_LDFLAGS)
test_ifupdown_LDADD = \
$(top_builddir)/src/settings/plugins/ifupdown/libnms-ifupdown-core.la \
$(top_builddir)/src/libNetworkManager.la
@VALGRIND_RULES@
TESTS = test-ifupdown
endif
EXTRA_DIST = \
test1 test2 test3 test4 test5 test6 test7 test8 test9 test11 test12 \
test13 test14 test15 test16 test17-wired-static-verify-ip4 \
test18-wired-static-verify-ip6 test19-wired-static-verify-ip4-plen \
test20-source-stanza test20-source-stanza.eth0 test20-source-stanza.eth1 \
test21-source-dir-stanza test21-source-dir-stanza.d

1
src/settings/plugins/keyfile/Makefile.am
View file

@ -1 +0,0 @@
SUBDIRS = tests

14
src/settings/plugins/keyfile/nms-keyfile-reader.c
View file

@ -102,14 +102,14 @@ nms_keyfile_reader_from_file (const char *filename, GError **error)
return NULL;
}
if (statbuf.st_mode & 0077) {
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
"File permissions (%o) were insecure",
statbuf.st_mode);
return NULL;
}
if (!NM_FLAGS_HAS (nm_utils_get_testing (), NM_UTILS_TEST_NO_KEYFILE_OWNER_CHECK)) {
if (statbuf.st_mode & 0077) {
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
"File permissions (%o) were insecure",
statbuf.st_mode);
return NULL;
}
if (statbuf.st_uid != 0) {
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
"File owner (%o) is insecure",

38
src/settings/plugins/keyfile/tests/Makefile.am
View file

@ -1,38 +0,0 @@
if ENABLE_TESTS
SUBDIRS=keyfiles
@GNOME_CODE_COVERAGE_RULES@
AM_CPPFLAGS = \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/settings \
-I$(srcdir)/../ \
$(GLIB_CFLAGS) \
$(CODE_COVERAGE_CFLAGS) \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DTEST_KEYFILES_DIR=\"$(abs_srcdir)/keyfiles\" \
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/keyfiles\" \
-DNMCONFDIR=\"nonexistent\"
AM_LDFLAGS = \
$(GLIB_LIBS) \
$(CODE_COVERAGE_LDFLAGS)
noinst_PROGRAMS = test-keyfile
test_keyfile_SOURCES = \
test-keyfile.c
test_keyfile_LDADD = \
$(top_builddir)/src/libNetworkManager.la
@VALGRIND_RULES@
TESTS = test-keyfile
endif

46
src/settings/plugins/keyfile/tests/keyfiles/Makefile.am
View file

@ -1,46 +0,0 @@
KEYFILES = \
Test_Wired_Connection \
Test_GSM_Connection \
Test_Wireless_Connection \
Test_Wired_Connection_MAC_Case \
Test_MAC_Old_Format \
Test_MAC_IB_Old_Format \
Test_Wired_Connection_IP6 \
ATT_Data_Connect_BT \
ATT_Data_Connect_Plain \
Test_String_SSID \
Test_Intlist_SSID \
Test_Intlike_SSID \
Test_Intlike_SSID_2 \
Test_Wired_TLS_Old \
Test_Wired_TLS_New \
Test_Wired_TLS_Blob \
Test_Wired_TLS_Path_Missing \
Test_InfiniBand_Connection \
Test_Bridge_Main \
Test_Bridge_Component \
Test_New_Wired_Group_Name \
Test_New_Wireless_Group_Names \
Test_minimal_1 \
Test_minimal_2 \
Test_minimal_slave_1 \
Test_minimal_slave_2 \
Test_minimal_slave_3 \
Test_minimal_slave_4 \
Test_Missing_Vlan_Setting \
Test_Missing_Vlan_Flags \
Test_Missing_ID_UUID \
Test_Enum_Property \
Test_Flags_Property
CERTS = \
test-ca-cert.pem \
test-key-and-cert.pem
EXTRA_DIST = $(KEYFILES) $(CERTS)
check-local:
@for f in $(KEYFILES); do \
chmod 0600 $(abs_srcdir)/$$f; \
done

6
src/settings/plugins/keyfile/tests/test-keyfile.c
View file

@ -204,7 +204,8 @@ test_read_valid_wired_connection (void)
"*ipv6.routes*semicolon at the end*routes1*");
g_test_expect_message ("NetworkManager", G_LOG_LEVEL_INFO,
"*ipv6.route*semicolon at the end*route6*");
connection = nms_keyfile_reader_from_file (TEST_KEYFILES_DIR "/Test_Wired_Connection", NULL);
connection = nms_keyfile_reader_from_file (TEST_KEYFILES_DIR "/Test_Wired_Connection", &error);
g_assert_no_error (error);
g_test_assert_expected_messages ();
g_assert (connection);
@ -2578,6 +2579,9 @@ int main (int argc, char **argv)
_nm_utils_set_testing (NM_UTILS_TEST_NO_KEYFILE_OWNER_CHECK);
nmtst_init_assert_logging (&argc, &argv, "INFO", "DEFAULT");
if (g_mkdir_with_parents (TEST_SCRATCH_DIR, 0755) != 0)
g_error ("failure to create test directory \"%s\": %s", TEST_SCRATCH_DIR, g_strerror (errno));
/* The tests */
g_test_add_func ("/keyfile/test_read_valid_wired_connection", test_read_valid_wired_connection);
g_test_add_func ("/keyfile/test_write_wired_connection", test_write_wired_connection);

Some files were not shown because too many files have changed in this diff Show more