diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2016-04-08 18:09:35 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2016-04-13 10:59:23 +0200 |
| commit | b071c0a7136ca3391b764485d416120cdc02ceb7 (patch) | |
| tree | cbd8cfca0bcc981eda55de2a7be30d41aed813fd | |
| parent | 735fa1be484a9006f9cb74a556cf6a1b85b131a6 (diff) | |
| download | NetworkManager-lr/recursive-make-considered-harmful.tar.gz | |
48 files changed, 2034 insertions, 2051 deletions
diff --git a/Makefile.am b/Makefile.am index a79bddca3d..0cc7814f5f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,34 +1,105 @@ +AUTOMAKE_OPTIONS = subdir-objects + include $(GLIB_MAKEFILE) +-include $(INTROSPECTION_MAKEFILE) +include vapi/Makefile.vapigen + +man_MANS = +CLEANFILES = +DISTCLEANFILES = +EXTRA_DIST = +noinst_LTLIBRARIES = +lib_LTLIBRARIES = +GLIB_GENERATED = +INTROSPECTION_GIRS = +INTROSPECTION_SCANNER_ARGS = +INTROSPECTION_COMPILER_ARGS = +SUBDIRS = . +pkgconfig_DATA = +gir_DATA = +typelib_DATA = +libnminclude_HEADERS = +sbin_PROGRAMS = +libexec_PROGRAMS = +dbusservice_DATA = +dbusactivation_DATA = +polkit_policy_DATA = +noinst_DATA = +vapi_DATA = +BUILT_SOURCES = +VAPIGEN_VAPIS = + +INSTALL_DATA_HOOKS = +UNINSTALL_HOOKS = +CHECK_LOCALS = + +pkgconfigdir = $(libdir)/pkgconfig +girdir = $(datadir)/gir-1.0 +typelibdir = $(libdir)/girepository-1.0 +libnmincludedir = $(includedir)/libnm +libnmglibincludedir = $(includedir)/libnm-glib +libnmglibvpndir = $(includedir)/libnm-glib +dbusservicedir = $(DBUS_SYS_DIR) +dbusactivationdir = $(datadir)/dbus-1/system-services +dispatcherdir=$(sysconfdir)/NetworkManager/dispatcher.d +polkit_policydir = $(datadir)/polkit-1/actions +servicedir = $(datadir)/dbus-1/system-services +examplesdir = $(docdir)/examples +udevrulesdir = $(UDEV_DIR)/rules.d +rundir = $(runstatedir)/NetworkManager +statedir = $(localstatedir)/lib/NetworkManager +libnmutilincludedir=$(includedir)/NetworkManager +vapidir = $(datadir)/vala/vapi + +edit = @sed \ + -e 's|@bindir[@]|$(bindir)|g' \ + -e 's|@libexecdir[@]|$(libexecdir)|g' \ + -e 's|@libexecdir[@]|$(libexecdir)|g' \ + -e 's|@localstatedir[@]|$(localstatedir)|g' \ + -e 's|@sbindir[@]|$(sbindir)|g' \ + -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ + -e 's|@DISTRO_NETWORK_SERVICE[@]|$(DISTRO_NETWORK_SERVICE)|g' + +include man/Makemodule.am +include shared/Makemodule.am +include introspection/Makemodule.am +include libnm-core/Makefile.libnm-core +include libnm-core/Makemodule.am +include libnm/Makemodule.am +include src/Makemodule.am +include callouts/Makemodule.am +#include clients/Makemodule.am +include tools/Makemodule.am +include policy/Makemodule.am +include data/Makemodule.am +#include po/Makemodule.am +include examples/Makemodule.am -SUBDIRS = \ - . \ - shared \ - introspection \ - libnm-core \ - libnm \ - src \ - callouts \ - clients \ - tools \ - policy \ - data \ - po \ - man \ - examples +#SUBDIRS += \ +# . \ +# clients \ +# tools \ +# policy \ +# data \ +# po \ +# examples if WITH_LEGACY_LIBRARIES -SUBDIRS += \ - libnm-util \ - libnm-glib +include libnm-util/Makemodule.am +include libnm-glib/Makemodule.am endif -SUBDIRS += \ - docs \ - vapi +#SUBDIRS += \ +# docs \ +# vapi + +include vapi/Makemodule.am @GNOME_CODE_COVERAGE_RULES@ -EXTRA_DIST = \ +@INTLTOOL_POLICY_RULE@ + +EXTRA_DIST += \ CONTRIBUTING \ NetworkManager.pc.in \ intltool-extract.in \ @@ -36,7 +107,8 @@ EXTRA_DIST = \ intltool-update.in \ Makefile.glib \ autogen.sh \ - valgrind.suppressions + valgrind.suppressions \ + $(noinst_DATA) DISTCHECK_CONFIGURE_FLAGS = \ --enable-tests=yes \ @@ -59,14 +131,36 @@ endif dist: dist-check-setting-docs -DISTCLEANFILES = intltool-extract intltool-merge intltool-update +DISTCLEANFILES += \ + intltool-extract \ + intltool-merge \ + intltool-update \ + $(polkit_policy_DATA) \ + $(noinst_DATA) -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = NetworkManager.pc +CLEANFILES += \ + cscope.in.out \ + cscope.out \ + cscope.po.out \ + $(noinst_DATA) \ + $(dbusactivation_DATA) \ + $(gir_DATA) \ + $(typelib_DATA) \ + $(BUILT_SOURCES) \ + $(VAPIGEN_VAPIS) -CLEANFILES = cscope.in.out cscope.out cscope.po.out +pkgconfig_DATA += NetworkManager.pc + +gir_DATA += $(INTROSPECTION_GIRS) + +install-data-hook: $(INSTALL_DATA_HOOKS) +uninstall-hook: $(UNINSTALL_HOOKS) +check-local: $(CHECK_LOCALS) cscope: cscope -b -q -R -sshared -ssrc -slibnm-core -slibnm -slibnm-glib -slibnm-util -sclients; +BUILT_SOURCES += $(GLIB_GENERATED) +AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS) + .PHONY: cscope diff --git a/callouts/Makefile.am b/callouts/Makefile.am deleted file mode 100644 index 5279b2f4a4..0000000000 --- a/callouts/Makefile.am +++ /dev/null @@ -1,105 +0,0 @@ -SUBDIRS = . tests - -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)\" - -########################################### -# Test libraries -########################################### - -noinst_LTLIBRARIES = \ - libtest-dispatcher-envp.la - - -dbusservicedir = $(DBUS_SYS_DIR) -dbusservice_DATA = \ - nm-dispatcher.conf - -libexec_PROGRAMS = \ - nm-dispatcher - - -nm_dispatcher_SOURCES = \ - nm-dispatcher.c \ - nm-dispatcher-api.h \ - nm-dispatcher-utils.c \ - nm-dispatcher-utils.h - -nm_dispatcher_LDADD = \ - $(top_builddir)/libnm/libnm.la \ - libnmdbus-dispatcher.la \ - $(GLIB_LIBS) - -# See note about gdbus-codegen in introspection/Makefile.am - -noinst_LTLIBRARIES += libnmdbus-dispatcher.la - -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 - -########################################### -# dispatcher envp -########################################### - -libtest_dispatcher_envp_la_SOURCES = \ - nm-dispatcher-utils.c \ - nm-dispatcher-utils.h - -libtest_dispatcher_envp_la_CPPFLAGS = \ - $(AM_CPPFLAGS) - -libtest_dispatcher_envp_la_LIBADD = \ - $(top_builddir)/libnm/libnm.la \ - $(GLIB_LIBS) - - -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 = $(nodist_libnmdbus_dispatcher_la_SOURCES) $(dbusactivation_DATA) - -EXTRA_DIST = \ - $(dbusservice_DATA) \ - $(dbusactivation_in_files) \ - nm-dispatcher.xml - diff --git a/callouts/Makemodule.am b/callouts/Makemodule.am new file mode 100644 index 0000000000..362c090ab3 --- /dev/null +++ b/callouts/Makemodule.am @@ -0,0 +1,85 @@ +#SUBDIRS = . tests + +noinst_LTLIBRARIES += \ + callouts/libnmdbus-dispatcher.la \ + callouts/libtest-dispatcher-envp.la + +dbusservice_DATA += \ + callouts/nm-dispatcher.conf + +libexec_PROGRAMS += \ + callouts/nm-dispatcher + +callouts_nm_dispatcher_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)\" + +callouts_nm_dispatcher_SOURCES = \ + callouts/nm-dispatcher.c \ + callouts/nm-dispatcher-api.h \ + callouts/nm-dispatcher-utils.c \ + callouts/nm-dispatcher-utils.h + +callouts_nm_dispatcher_LDADD = \ + $(top_builddir)/libnm/libnm.la \ + callouts/libnmdbus-dispatcher.la \ + $(GLIB_LIBS) + +# See note about gdbus-codegen in introspection/Makefile.am + +nodist_callouts_libnmdbus_dispatcher_la_SOURCES = \ + callouts/nmdbus-dispatcher.c \ + callouts/nmdbus-dispatcher.h + +callouts_libnmdbus_dispatcher_la_CPPFLAGS = \ + $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(callouts_nm_dispatcher_CPPFLAGS)) + +callouts/nmdbus-dispatcher.h: callouts/nm-dispatcher.xml + $(AM_V_GEN) gdbus-codegen \ + --generate-c-code $(basename $@) \ + --c-namespace NMDBus \ + --interface-prefix org.freedesktop \ + $< + +callouts/nmdbus-dispatcher.c: callouts/nmdbus-dispatcher.h + @true + +BUILT_SOURCES += \ + $(nodist_callouts_libnmdbus_dispatcher_la_SOURCES) + +callouts_libtest_dispatcher_envp_la_SOURCES = \ + callouts/nm-dispatcher-utils.c \ + callouts/nm-dispatcher-utils.h + +callouts_libtest_dispatcher_envp_la_CPPFLAGS = \ + $(callouts_nm_dispatcher_CPPFLAGS) + +callouts_libtest_dispatcher_envp_la_LIBADD = \ + $(top_builddir)/libnm/libnm.la \ + $(GLIB_LIBS) + +dbusactivation_in_files = callouts/org.freedesktop.nm_dispatcher.service.in +dbusactivation_DATA += $(dbusactivation_in_files:.service.in=.service) + +%.service: %.service.in + $(edit) $< >$@ + +INSTALL_DATA_HOOKS += install-data-hook-callouts + +install-data-hook-callouts: + $(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 + +EXTRA_DIST += \ + $(dbusservice_DATA) \ + $(dbusactivation_in_files) \ + callouts/nm-dispatcher.xml diff --git a/configure.ac b/configure.ac index 6c15d758ff..216c0b3929 100644 --- a/configure.ac +++ b/configure.ac @@ -1016,12 +1016,9 @@ fi AM_CONDITIONAL(BUILD_SETTING_DOCS, test "$build_setting_docs" = "yes") AM_CONDITIONAL(SETTING_DOCS_AVAILABLE, test "$build_setting_docs" = "yes" -o "$have_setting_docs" = "yes") - AC_CONFIG_FILES([ Makefile -shared/Makefile shared/nm-version-macros.h -src/Makefile src/tests/Makefile src/tests/config/Makefile src/dhcp-manager/Makefile @@ -1055,32 +1052,22 @@ 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 -callouts/Makefile callouts/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/Makefile policy/org.freedesktop.NetworkManager.policy.in -data/Makefile docs/Makefile docs/api/Makefile docs/api/version.xml @@ -1091,20 +1078,8 @@ 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 diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index ce059fcb0f..0000000000 --- a/data/Makefile.am +++ /dev/null @@ -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 - diff --git a/data/Makemodule.am b/data/Makemodule.am new file mode 100644 index 0000000000..611bdbe08b --- /dev/null +++ b/data/Makemodule.am @@ -0,0 +1,60 @@ + +if HAVE_SYSTEMD +systemdsystemunit_DATA = \ + data/NetworkManager.service \ + data/NetworkManager-wait-online.service \ + data/NetworkManager-dispatcher.service + +data/NetworkManager.service: data/NetworkManager.service.in + $(edit) $< >$@ + +if HAVE_SYSTEMD_200 +data/NetworkManager-wait-online.service: data/NetworkManager-wait-online.service.in + $(edit) $< >$@ +else +data/NetworkManager-wait-online.service: data/NetworkManager-wait-online-systemd-pre200.service.in + $(edit) $< >$@ +endif + +data/NetworkManager-dispatcher.service: data/NetworkManager-dispatcher.service.in + $(edit) $< >$@ + +service_in_files = data/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 + +examples_DATA = data/server.conf + +if WITH_UDEV_DIR +udevrules_DATA = \ + data/84-nm-drivers.rules \ + data/85-nm-unmanaged.rules +endif + +data/server.conf: data/server.conf.in + $(edit) $< >$@ + +EXTRA_DIST += \ + data/NetworkManager.service.in \ + data/NetworkManager-wait-online.service.in \ + data/NetworkManager-wait-online-systemd-pre200.service.in \ + data/NetworkManager-dispatcher.service.in \ + data/org.freedesktop.NetworkManager.service.in \ + data/84-nm-drivers.rules \ + data/85-nm-unmanaged.rules \ + data/server.conf.in + +CLEANFILES += \ + data/NetworkManager.service \ + data/NetworkManager-wait-online.service \ + data/NetworkManager-dispatcher.service \ + data/org.freedesktop.NetworkManager.service \ + data/server.conf + diff --git a/examples/C/Makefile.am b/examples/C/Makefile.am deleted file mode 100644 index 4502e9bb78..0000000000 --- a/examples/C/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -SUBDIRS= glib - -if WITH_QT -SUBDIRS += qt -endif diff --git a/examples/Makefile.am b/examples/Makefile.am deleted file mode 100644 index 3521b4cecd..0000000000 --- a/examples/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -SUBDIRS= \ - shell \ - python \ - ruby \ - lua \ - C \ - dispatcher diff --git a/examples/Makemodule.am b/examples/Makemodule.am new file mode 100644 index 0000000000..e19011cc41 --- /dev/null +++ b/examples/Makemodule.am @@ -0,0 +1,63 @@ +SUBDIRS += \ + examples/C/glib \ + examples/C/qt + +EXTRA_DIST += \ + 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 + +EXTRA_DIST += \ + examples/dispatcher/10-ifcfg-rh-routes.sh \ + examples/dispatcher/70-wifi-wired-exclusive.sh + +EXTRA_DIST += \ + examples/ruby/add-connection.rb \ + examples/ruby/get-basic-nm-info.rb \ + examples/ruby/list-devices.rb + +EXTRA_DIST += \ + 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 + +EXTRA_DIST += \ + 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 + +EXTRA_DIST += \ + examples/python/python-networkmanager/README + +EXTRA_DIST += \ + 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 diff --git a/examples/dispatcher/Makefile.am b/examples/dispatcher/Makefile.am deleted file mode 100644 index 0089d5fe7b..0000000000 --- a/examples/dispatcher/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -EXTRA_DIST = \ - 10-ifcfg-rh-routes.sh \ - 70-wifi-wired-exclusive.sh - diff --git a/examples/lua/Makefile.am b/examples/lua/Makefile.am deleted file mode 100644 index bf14f68299..0000000000 --- a/examples/lua/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -SUBDIRS= lgi - diff --git a/examples/lua/lgi/Makefile.am b/examples/lua/lgi/Makefile.am deleted file mode 100644 index ce5c8f5c90..0000000000 --- a/examples/lua/lgi/Makefile.am +++ /dev/null @@ -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 diff --git a/examples/python/Makefile.am b/examples/python/Makefile.am deleted file mode 100644 index cd3ce3ed90..0000000000 --- a/examples/python/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -SUBDIRS= dbus gi python-networkmanager - diff --git a/examples/python/dbus/Makefile.am b/examples/python/dbus/Makefile.am deleted file mode 100644 index 0a89dc5663..0000000000 --- a/examples/python/dbus/Makefile.am +++ /dev/null @@ -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 diff --git a/examples/python/gi/Makefile.am b/examples/python/gi/Makefile.am deleted file mode 100644 index 9c69407f49..0000000000 --- a/examples/python/gi/Makefile.am +++ /dev/null @@ -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 diff --git a/examples/python/python-networkmanager/Makefile.am b/examples/python/python-networkmanager/Makefile.am deleted file mode 100644 index 45fe750c45..0000000000 --- a/examples/python/python-networkmanager/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ - README diff --git a/examples/ruby/Makefile.am b/examples/ruby/Makefile.am deleted file mode 100644 index 14f97ef89d..0000000000 --- a/examples/ruby/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -EXTRA_DIST = \ - add-connection.rb \ - get-basic-nm-info.rb \ - list-devices.rb diff --git a/examples/shell/Makefile.am b/examples/shell/Makefile.am deleted file mode 100644 index e4b6f6c795..0000000000 --- a/examples/shell/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -EXTRA_DIST = \ - nm-logging.sh \ - get-hostname.sh \ - list-devices.sh \ - disconnect-device.sh \ - active-wifi.sh diff --git a/introspection/Makefile.am b/introspection/Makefile.am deleted file mode 100644 index 3a627930b9..0000000000 --- a/introspection/Makefile.am +++ /dev/null @@ -1,172 +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-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-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-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 - -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-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-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 diff --git a/introspection/Makemodule.am b/introspection/Makemodule.am new file mode 100644 index 0000000000..0a7a479c52 --- /dev/null +++ b/introspection/Makemodule.am @@ -0,0 +1,171 @@ +noinst_LTLIBRARIES += \ + introspection/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. + +introspection_libnmdbus_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(GLIB_CFLAGS)) + +nodist_introspection_libnmdbus_la_SOURCES = \ + introspection/nmdbus-access-point.c \ + introspection/nmdbus-access-point.h \ + introspection/nmdbus-active-connection.c \ + introspection/nmdbus-active-connection.h \ + introspection/nmdbus-agent-manager.c \ + introspection/nmdbus-agent-manager.h \ + introspection/nmdbus-device-adsl.c \ + introspection/nmdbus-device-adsl.h \ + introspection/nmdbus-device-bond.c \ + introspection/nmdbus-device-bond.h \ + introspection/nmdbus-device-bridge.c \ + introspection/nmdbus-device-bridge.h \ + introspection/nmdbus-device-bt.c \ + introspection/nmdbus-device-bt.h \ + introspection/nmdbus-device-ethernet.c \ + introspection/nmdbus-device-ethernet.h \ + introspection/nmdbus-device.c \ + introspection/nmdbus-device.h \ + introspection/nmdbus-device-generic.c \ + introspection/nmdbus-device-generic.h \ + introspection/nmdbus-device-infiniband.c \ + introspection/nmdbus-device-infiniband.h \ + introspection/nmdbus-device-ip-tunnel.c \ + introspection/nmdbus-device-ip-tunnel.h \ + introspection/nmdbus-device-macvlan.c \ + introspection/nmdbus-device-macvlan.h \ + introspection/nmdbus-device-modem.c \ + introspection/nmdbus-device-modem.h \ + introspection/nmdbus-device-olpc-mesh.c \ + introspection/nmdbus-device-olpc-mesh.h \ + introspection/nmdbus-device-team.c \ + introspection/nmdbus-device-team.h \ + introspection/nmdbus-device-tun.c \ + introspection/nmdbus-device-tun.h \ + introspection/nmdbus-device-veth.c \ + introspection/nmdbus-device-veth.h \ + introspection/nmdbus-device-vlan.c \ + introspection/nmdbus-device-vlan.h \ + introspection/nmdbus-device-vxlan.c \ + introspection/nmdbus-device-vxlan.h \ + introspection/nmdbus-device-wifi.c \ + introspection/nmdbus-device-wifi.h \ + introspection/nmdbus-device-wimax.c \ + introspection/nmdbus-device-wimax.h \ + introspection/nmdbus-dhcp4-config.c \ + introspection/nmdbus-dhcp4-config.h \ + introspection/nmdbus-dhcp6-config.c \ + introspection/nmdbus-dhcp6-config.h \ + introspection/nmdbus-ip4-config.c \ + introspection/nmdbus-ip4-config.h \ + introspection/nmdbus-ip6-config.c \ + introspection/nmdbus-ip6-config.h \ + introspection/nmdbus-manager.c \ + introspection/nmdbus-manager.h \ + introspection/nmdbus-ppp-manager.c \ + introspection/nmdbus-ppp-manager.h \ + introspection/nmdbus-secret-agent.c \ + introspection/nmdbus-secret-agent.h \ + introspection/nmdbus-settings-connection.c \ + introspection/nmdbus-settings-connection.h \ + introspection/nmdbus-settings.c \ + introspection/nmdbus-settings.h \ + introspection/nmdbus-vpn-connection.c \ + introspection/nmdbus-vpn-connection.h \ + introspection/nmdbus-vpn-plugin.c \ + introspection/nmdbus-vpn-plugin.h + +DBUS_INTERFACE_DOCS = \ + introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml \ + introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml \ + introspection/nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml \ + introspection/nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml \ + introspection/nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml \ + introspection/nmdbus-manager-org.freedesktop.NetworkManager.xml \ + introspection/nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml \ + introspection/nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml \ + introspection/nmdbus-device-org.freedesktop.NetworkManager.Device.xml \ + introspection/nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml \ + introspection/nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml \ + introspection/nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml \ + introspection/nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml \ + introspection/nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml \ + introspection/nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml \ + introspection/nmdbus-ppp-manager-org.freedesktop.NetworkManager.PPP.xml \ + introspection/nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml \ + introspection/nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml \ + introspection/nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml \ + introspection/nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml \ + introspection/nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml \ + introspection/nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml \ + introspection/nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml \ + introspection/nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml \ + introspection/nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml \ + introspection/nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml \ + introspection/nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml \ + introspection/nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml \ + introspection/nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml \ + introspection/nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml \ + introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml \ + introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml \ + introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml + +define _make_nmdbus_rule +$(1): $(patsubst introspection/nmdbus-%.c,introspection/nm-%.xml,$(1)) + $$(AM_V_GEN) gdbus-codegen \ + --generate-c-code $$(basename $$@) \ + --generate-docbook $$(basename $$@) \ + --c-namespace NMDBus \ + --interface-prefix org.freedesktop.NetworkManager \ + $$< + +introspection/$(filter $(basename $(1))-org.freedesktop.NetworkManager.%,$(DBUS_INTERFACE_DOCS)): $(1) + @true + +introspection/$(basename $(1)).h: $(1) + @true +endef + +$(foreach f,$(filter %.c,$(nodist_introspection_libnmdbus_la_SOURCES)),$(eval $(call _make_nmdbus_rule,$f))) + +BUILT_SOURCES += $(nodist_introspection_libnmdbus_la_SOURCES) $(DBUS_INTERFACE_DOCS) + +EXTRA_DIST += \ + introspection/nm-access-point.xml \ + introspection/nm-active-connection.xml \ + introspection/nm-agent-manager.xml \ + introspection/nm-device-adsl.xml \ + introspection/nm-device-bond.xml \ + introspection/nm-device-bridge.xml \ + introspection/nm-device-bt.xml \ + introspection/nm-device-ethernet.xml \ + introspection/nm-device-generic.xml \ + introspection/nm-device-infiniband.xml \ + introspection/nm-device-ip-tunnel.xml \ + introspection/nm-device-macvlan.xml \ + introspection/nm-device-modem.xml \ + introspection/nm-device-olpc-mesh.xml \ + introspection/nm-device-team.xml \ + introspection/nm-device-tun.xml \ + introspection/nm-device-veth.xml \ + introspection/nm-device-vlan.xml \ + introspection/nm-device-vxlan.xml \ + introspection/nm-device-wifi.xml \ + introspection/nm-device-wimax.xml \ + introspection/nm-device.xml \ + introspection/nm-dhcp4-config.xml \ + introspection/nm-dhcp6-config.xml \ + introspection/nm-ip4-config.xml \ + introspection/nm-ip6-config.xml \ + introspection/nm-manager.xml \ + introspection/nm-ppp-manager.xml \ + introspection/nm-secret-agent.xml \ + introspection/nm-settings-connection.xml \ + introspection/nm-settings.xml \ + introspection/nm-vpn-connection.xml \ + introspection/nm-vpn-plugin.xml \ + introspection/nm-wimax-nsp.xml diff --git a/libnm-core/Makefile.am b/libnm-core/Makefile.am deleted file mode 100644 index 23aa042d44..0000000000 --- a/libnm-core/Makefile.am +++ /dev/null @@ -1,56 +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)\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ - $(GLIB_CFLAGS) \ - $(CODE_COVERAGE_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) - -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 - -BUILT_SOURCES = $(GLIB_GENERATED) -CLEANFILES = $(BUILT_SOURCES) diff --git a/libnm-core/Makefile.libnm-core b/libnm-core/Makefile.libnm-core index 0038ce23d6..dfdd94835f 100644 --- a/libnm-core/Makefile.libnm-core +++ b/libnm-core/Makefile.libnm-core @@ -1,113 +1,110 @@ -# 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.) +# 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_libnm_core_headers = \ + libnm-core/nm-core-enum-types.h \ + shared/nm-version-macros.h \ + libnm-core/nm-connection.h \ + libnm-core/nm-core-types.h \ + libnm-core/nm-dbus-interface.h \ + libnm-core/nm-errors.h \ + libnm-core/nm-setting-8021x.h \ + libnm-core/nm-setting-adsl.h \ + libnm-core/nm-setting-bluetooth.h \ + libnm-core/nm-setting-bond.h \ + libnm-core/nm-setting-bridge-port.h \ + libnm-core/nm-setting-bridge.h \ + libnm-core/nm-setting-cdma.h \ + libnm-core/nm-setting-connection.h \ + libnm-core/nm-setting-dcb.h \ + libnm-core/nm-setting-generic.h \ + libnm-core/nm-setting-gsm.h \ + libnm-core/nm-setting-infiniband.h \ + libnm-core/nm-setting-ip-config.h \ + libnm-core/nm-setting-ip-tunnel.h \ + libnm-core/nm-setting-ip4-config.h \ + libnm-core/nm-setting-ip6-config.h \ + libnm-core/nm-setting-macvlan.h \ + libnm-core/nm-setting-olpc-mesh.h \ + libnm-core/nm-setting-ppp.h \ + libnm-core/nm-setting-pppoe.h \ + libnm-core/nm-setting-serial.h \ + libnm-core/nm-setting-team-port.h \ + libnm-core/nm-setting-team.h \ + libnm-core/nm-setting-tun.h \ + libnm-core/nm-setting-vlan.h \ + libnm-core/nm-setting-vpn.h \ + libnm-core/nm-setting-vxlan.h \ + libnm-core/nm-setting-wimax.h \ + libnm-core/nm-setting-wired.h \ + libnm-core/nm-setting-wireless-security.h \ + libnm-core/nm-setting-wireless.h \ + libnm-core/nm-setting.h \ + libnm-core/nm-simple-connection.h \ + libnm-core/nm-utils.h \ + libnm-core/nm-version.h \ + libnm-core/nm-vpn-dbus-interface.h \ + libnm-core/nm-vpn-editor-plugin.h \ + libnm-core/nm-vpn-plugin-info.h -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-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_libnm_core_private_headers = \ + shared/nm-shared-utils.h \ + libnm-core/crypto.h \ + libnm-core/nm-connection-private.h \ + libnm-core/nm-core-internal.h \ + libnm-core/nm-core-types-internal.h \ + libnm-core/nm-keyfile-internal.h \ + libnm-core/nm-keyfile-utils.h \ + libnm-core/nm-property-compare.h \ + libnm-core/nm-setting-private.h \ + libnm-core/nm-utils-private.h -libnm_core_private_headers = \ - $(top_builddir)/shared/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-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-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 +libnm_core_libnm_core_sources = \ + libnm-core/nm-core-enum-types.c \ + shared/nm-shared-utils.c \ + libnm-core/crypto.c \ + libnm-core/nm-connection.c \ + libnm-core/nm-dbus-utils.c \ + libnm-core/nm-errors.c \ + libnm-core/nm-keyfile-reader.c \ + libnm-core/nm-keyfile-utils.c \ + libnm-core/nm-keyfile-writer.c \ + libnm-core/nm-property-compare.c \ + libnm-core/nm-setting-8021x.c \ + libnm-core/nm-setting-adsl.c \ + libnm-core/nm-setting-bluetooth.c \ + libnm-core/nm-setting-bond.c \ + libnm-core/nm-setting-bridge-port.c \ + libnm-core/nm-setting-bridge.c \ + libnm-core/nm-setting-cdma.c \ + libnm-core/nm-setting-connection.c \ + libnm-core/nm-setting-dcb.c \ + libnm-core/nm-setting-generic.c \ + libnm-core/nm-setting-gsm.c \ + libnm-core/nm-setting-infiniband.c \ + libnm-core/nm-setting-ip-config.c \ + libnm-core/nm-setting-ip-tunnel.c \ + libnm-core/nm-setting-ip4-config.c \ + libnm-core/nm-setting-ip6-config.c \ + libnm-core/nm-setting-macvlan.c \ + libnm-core/nm-setting-olpc-mesh.c \ + libnm-core/nm-setting-ppp.c \ + libnm-core/nm-setting-pppoe.c \ + libnm-core/nm-setting-serial.c \ + libnm-core/nm-setting-team-port.c \ + libnm-core/nm-setting-team.c \ + libnm-core/nm-setting-tun.c \ + libnm-core/nm-setting-vlan.c \ + libnm-core/nm-setting-vpn.c \ + libnm-core/nm-setting-vxlan.c \ + libnm-core/nm-setting-wimax.c \ + libnm-core/nm-setting-wired.c \ + libnm-core/nm-setting-wireless-security.c \ + libnm-core/nm-setting-wireless.c \ + libnm-core/nm-setting.c \ + libnm-core/nm-simple-connection.c \ + libnm-core/nm-utils.c \ + libnm-core/nm-vpn-editor-plugin.c \ + libnm-core/nm-vpn-plugin-info.c diff --git a/libnm-core/Makemodule.am b/libnm-core/Makemodule.am new file mode 100644 index 0000000000..90074a118b --- /dev/null +++ b/libnm-core/Makemodule.am @@ -0,0 +1,49 @@ +#SUBDIRS += libnm-core/tests + +libnm_core_libnm_core_la_CPPFLAGS = \ + -I${top_srcdir}/shared \ + -I${top_builddir}/shared \ + -I${top_srcdir}/libnm-core \ + -I${top_builddir}/libnm-core \ + -DG_LOG_DOMAIN=\""libnm"\" \ + -DLOCALEDIR=\"$(datadir)/locale\" \ + -DNMCONFDIR=\"$(nmconfdir)\" \ + -DNMLIBDIR=\"$(nmlibdir)\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ + $(GLIB_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) + +noinst_LTLIBRARIES += libnm-core/libnm-core.la + +# header/source defines are in Makefile.libnm-core, so they can be shared +# with libnm/Makefile.am +#include libnm-core/Makefile.libnm-core + +libnminclude_HEADERS += $(libnm_core_libnm_core_headers) +libnm_core_libnm_core_la_SOURCES = \ + $(libnm_core_libnm_core_sources) \ + $(libnm_core_libnm_core_private_headers) + +GLIB_GENERATED += libnm-core/nm-core-enum-types.h libnm-core/nm-core-enum-types.c +nm_core_enum_types_sources = $(filter-out %nm-core-enum-types.h,$(libnm_core_libnm_core_headers)) +nm_core_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM +nm_core_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM + +libnm_core_libnm_core_la_LIBADD = \ + $(GLIB_LIBS) \ + $(UUID_LIBS) + +libnm_core_libnm_core_la_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) + +if WITH_GNUTLS +libnm_core_libnm_core_la_CPPFLAGS += $(GNUTLS_CFLAGS) +libnm_core_libnm_core_la_SOURCES += libnm-core/crypto_gnutls.c +libnm_core_libnm_core_la_LIBADD += $(GNUTLS_LIBS) +endif + +if WITH_NSS +libnm_core_libnm_core_la_CPPFLAGS += $(NSS_CFLAGS) +libnm_core_libnm_core_la_SOURCES += libnm-core/crypto_nss.c +libnm_core_libnm_core_la_LIBADD += $(NSS_LIBS) +endif diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am deleted file mode 100644 index c406847474..0000000000 --- a/libnm-glib/Makefile.am +++ /dev/null @@ -1,227 +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 - -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 - -if ENABLE_TESTS - -check-local: - $(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-glib.so $(SYMBOL_VIS_FILE) - -endif - diff --git a/libnm-glib/Makemodule.am b/libnm-glib/Makemodule.am new file mode 100644 index 0000000000..31c2c99263 --- /dev/null +++ b/libnm-glib/Makemodule.am @@ -0,0 +1,222 @@ +#SUBDIRS = . tests + +libnm_glib_common_cppflags = \ + -I$(top_srcdir)/shared \ + -I$(top_builddir)/shared \ + -I$(top_srcdir)/libnm-util \ + -I$(top_builddir)/libnm-util \ + -I$(top_srcdir)/libnm-glib \ + -I$(top_builddir)/libnm-glib \ + -DG_LOG_DOMAIN=\""libnm-glib"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ + $(DBUS_CFLAGS) \ + $(GLIB_CFLAGS) + +BUILT_SOURCES += \ + libnm-glib/nm-vpn-plugin-glue.h \ + libnm-glib/nm-secret-agent-glue.h + + +noinst_LTLIBRARIES += \ + libnm-glib/libdeprecated-nm-glib.la + +##################################################### +# Deprecated original libnm_glib bits +##################################################### + +libnm_glib_libdeprecated_nm_glib_la_SOURCES = \ + libnm-glib/libnm_glib.h \ + libnm-glib/libnm_glib.c + +libnm_glib_libdeprecated_nm_glib_la_CPPFLAGS = \ + $(libnm_glib_common_cppflags) \ + -Wno-deprecated-declarations \ + -Wno-deprecated + +libnm_glib_libdeprecated_nm_glib_la_LIBADD = \ + $(DBUS_LIBS) \ + $(GLIB_LIBS) + +libnm_glib_libdeprecateddir = $(includedir)/libnm-glib +libnm_glib_libdeprecated_HEADERS = libnm-glib/libnm_glib.h + +##################################################### +# Real libnm-glib stuff +##################################################### + +lib_LTLIBRARIES += \ + libnm-glib/libnm-glib.la \ + libnm-glib/libnm-glib-vpn.la + +libnm_glib_libnm_glib_la_CFLAGS = \ + $(GLIB_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(GUDEV_CFLAGS) \ + -DNMRUNDIR=\"$(nmrundir)\" + +libnm_glib_libnm_glib_la_CPPFLAGS = \ + $(libnm_glib_common_cppflags) + +libnmglibinclude_HEADERS = \ + libnm-glib/nm-object.h \ + libnm-glib/nm-client.h \ + libnm-glib/nm-device.h \ + libnm-glib/nm-device-ethernet.h \ + libnm-glib/nm-device-infiniband.h \ + libnm-glib/nm-device-adsl.h \ + libnm-glib/nm-device-wifi.h \ + libnm-glib/nm-device-bt.h \ + libnm-glib/nm-device-olpc-mesh.h \ + libnm-glib/nm-device-bond.h \ + libnm-glib/nm-device-team.h \ + libnm-glib/nm-device-bridge.h \ + libnm-glib/nm-device-vlan.h \ + libnm-glib/nm-device-generic.h \ + libnm-glib/nm-access-point.h \ + libnm-glib/nm-ip4-config.h \ + libnm-glib/nm-device-modem.h \ + libnm-glib/nm-vpn-connection.h \ + libnm-glib/nm-types.h \ + libnm-glib/nm-active-connection.h \ + libnm-glib/nm-dhcp4-config.h \ + libnm-glib/nm-ip6-config.h \ + libnm-glib/nm-dhcp6-config.h \ + libnm-glib/nm-remote-connection.h \ + libnm-glib/nm-remote-settings.h \ + libnm-glib/nm-secret-agent.h \ + libnm-glib/nm-device-wimax.h \ + libnm-glib/nm-wimax-nsp.h \ + libnm-glib/nm-glib-enum-types.h + +libnmglibvpn_HEADERS = \ + libnm-glib/nm-vpn-plugin.h \ + libnm-glib/nm-vpn-plugin-ui-interface.h \ + libnm-glib/nm-vpn-plugin-utils.h \ + libnm-glib/nm-vpn-enum-types.h + +libnm_glib_libnm_glib_la_csources = \ + libnm-glib/nm-object.c \ + libnm-glib/nm-dbus-helpers.c \ + libnm-glib/nm-client.c \ + libnm-glib/nm-device.c \ + libnm-glib/nm-device-ethernet.c \ + libnm-glib/nm-device-infiniband.c \ + libnm-glib/nm-device-adsl.c \ + libnm-glib/nm-device-wifi.c \ + libnm-glib/nm-device-bt.c \ + libnm-glib/nm-device-olpc-mesh.c \ + libnm-glib/nm-device-bond.c \ + libnm-glib/nm-device-team.c \ + libnm-glib/nm-device-bridge.c \ + libnm-glib/nm-device-vlan.c \ + libnm-glib/nm-device-generic.c \ + libnm-glib/nm-access-point.c \ + libnm-glib/nm-ip4-config.c \ + libnm-glib/nm-device-modem.c \ + libnm-glib/nm-vpn-connection.c \ + libnm-glib/nm-types.c \ + libnm-glib/nm-object-cache.c \ + libnm-glib/nm-active-connection.c \ + libnm-glib/nm-dhcp4-config.c \ + libnm-glib/nm-ip6-config.c \ + libnm-glib/nm-dhcp6-config.c \ + libnm-glib/nm-remote-connection.c \ + libnm-glib/nm-remote-settings.c \ + libnm-glib/nm-secret-agent.c \ + libnm-glib/nm-device-wimax.c \ + libnm-glib/nm-wimax-nsp.c \ + libnm-glib/nm-glib-enum-types.c + +libnm_glib_libnm_glib_la_private_headers = \ + libnm-glib/nm-object-private.h \ + libnm-glib/nm-device-private.h \ + libnm-glib/nm-types-private.h \ + libnm-glib/nm-object-cache.h \ + libnm-glib/nm-remote-connection-private.h \ + libnm-glib/nm-dbus-helpers-private.h + +libnm_glib_libnm_glib_la_SOURCES = \ + $(libnm_glib_libnm_glib_la_csources) \ + $(libnm_glib_libnm_glib_la_private_headers) + +GLIB_GENERATED += libnm-glib/nm-glib-enum-types.h libnm-glib/nm-glib-enum-types.c +nm_glib_enum_types_sources = $(libnmglibinclude_HEADERS) +nm_glib_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM +nm_glib_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM + +libnm_glib_libnm_glib_la_LIBADD = \ + $(top_builddir)/libnm-util/libnm-util.la \ + $(builddir)/libnm-glib/libdeprecated-nm-glib.la \ + $(GLIB_LIBS) \ + $(DBUS_LIBS) \ + $(GUDEV_LIBS) + +libnm_glib_libnm_glib_la_LDFLAGS = \ + -Wl,--version-script=$(srcdir)/libnm-glib/libnm-glib.ver \ + -version-info "13:0:9" + +noinst_PROGRAMS = libnm-glib/libnm-glib-test + +libnm_glib_libnm_glib_test_SOURCES = libnm-glib/libnm-glib-test.c +libnm_glib_libnm_glib_test_CPPFLAGS = $(libnm_glib_common_cppflags) +libnm_glib_libnm_glib_test_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS) +libnm_glib_libnm_glib_test_LDADD = libnm-glib/libnm-glib.la $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS) + +libnm_glib_libnm_glib_vpn_la_SOURCES = \ + libnm-glib/nm-vpn-plugin.c \ + libnm-glib/nm-vpn-plugin-ui-interface.c \ + libnm-glib/nm-vpn-plugin-utils.c \ + libnm-glib/nm-vpn-enum-types.c +GLIB_GENERATED += libnm-glib/nm-vpn-enum-types.h libnm-glib/nm-vpn-enum-types.c +nm_vpn_enum_types_sources = $(libnmglibvpn_HEADERS) +libnm_glib_libnm_glib_vpn_la_CPPFLAGS = $(libnm_glib_common_cppflags) +libnm_glib_libnm_glib_vpn_la_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS) +libnm_glib_libnm_glib_vpn_la_LIBADD = $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS) +libnm_glib_libnm_glib_vpn_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-glib/libnm-glib-vpn.ver \ + -version-info "3:0:2" + +BUILT_SOURCES += $(GLIB_GENERATED) + +##################################################### + +libnm-glib/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=$@ $< + +libnm-glib/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=$@ $< + +pkgconfig_DATA += libnm-glib/libnm-glib.pc libnm-glib/libnm-glib-vpn.pc + +DISTCLEANFILES += libnm-glib/libnm-glib.pc libnm-glib/libnm-glib.pc + +EXTRA_DIST += \ + libnm-glib/libnm-glib.pc.in \ + libnm-glib/libnm-glib-vpn.pc.in \ + libnm-glib/libnm-glib.ver \ + libnm-glib/libnm-glib-vpn.ver + +INTROSPECTION_COMPILER_ARGS += --includedir=$(top_builddir)/libnm-util + +if HAVE_INTROSPECTION +libnm-glib/NMClient-1.0.gir: libnm-glib/libnm-glib.la +libnm_glib_NMClient_1_0_gir_INCLUDES = Gio-2.0 DBusGLib-1.0 +libnm_glib_NMClient_1_0_gir_PACKAGES = gio-2.0 dbus-glib-1 gudev-1.0 +libnm_glib_NMClient_1_0_gir_EXPORT_PACKAGES = libnm-glib libnm-glib-vpn +libnm_glib_NMClient_1_0_gir_CFLAGS = $(libnm_glib_common_cppflags) -I$(top_srcdir)/libnm-glib -I$(top_srcdir)/libnm-util +libnm_glib_NMClient_1_0_gir_LIBS = libnm-glib/libnm-glib.la $(top_builddir)/libnm-util/libnm-util.la +libnm_glib_NMClient_1_0_gir_FILES = $(libnmglibinclude_HEADERS) $(libnm_glib_libnm_glib_la_csources) +libnm_glib_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 += libnm-glib/NMClient-1.0.gir +typelib_DATA += libnm-glib/NMClient-1.0.typelib +endif + +if ENABLE_TESTS + +CHECK_LOCALS += check-local-libnm-glib + +check-local-libnm-glib: + $(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-glib.so $(srcdir)/libnm-glib.ver + +endif + diff --git a/libnm-glib/nm-vpn-plugin.c b/libnm-glib/nm-vpn-plugin.c index 2af9deb4bd..a128e5db7d 100644 --- a/libnm-glib/nm-vpn-plugin.c +++ b/libnm-glib/nm-vpn-plugin.c @@ -1029,7 +1029,8 @@ nm_vpn_plugin_class_init (NMVPNPluginClass *plugin_class) dbus_g_error_domain_register (NM_VPN_PLUGIN_ERROR, NM_DBUS_VPN_ERROR_PREFIX, - NM_TYPE_VPN_PLUGIN_ERROR); + nm_vpn_plugin_error_get_type ()); +// NM_TYPE_VPN_PLUGIN_ERROR); setup_unix_signal_handler (); } diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am deleted file mode 100644 index 8f51fc37c7..0000000000 --- a/libnm-util/Makefile.am +++ /dev/null @@ -1,201 +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-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-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) - -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 - -if ENABLE_TESTS - -check-local: - $(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-util.so $(SYMBOL_VIS_FILE) - -endif - diff --git a/libnm-util/Makemodule.am b/libnm-util/Makemodule.am new file mode 100644 index 0000000000..e6b30b054f --- /dev/null +++ b/libnm-util/Makemodule.am @@ -0,0 +1,192 @@ +#SUBDIRS = . tests + +libnm_util_common_cppflags = \ + -I${top_srcdir} \ + -I${top_srcdir}/shared \ + -I$(top_builddir)/shared \ + -I${top_srcdir}/libnm-util \ + -I$(top_builddir)/libnm-util \ + -DG_LOG_DOMAIN=\""libnm-util"\" \ + -DLOCALEDIR=\"$(datadir)/locale\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ + $(GLIB_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(UUID_CFLAGS) + +if WITH_GNUTLS +libnm_util_common_cppflags += $(GNUTLS_CFLAGS) +endif + +if WITH_NSS +libnm_util_common_cppflags += $(NSS_CFLAGS) +endif + +lib_LTLIBRARIES += libnm-util/libnm-util.la + +libnm_util_libnm_util_la_CPPFLAGS = $(libnm_util_common_cppflags) + +libnmutilinclude_HEADERS = \ + $(top_builddir)/shared/nm-version-macros.h \ + libnm-util/NetworkManager.h \ + libnm-util/NetworkManagerVPN.h \ + libnm-util/nm-connection.h \ + libnm-util/nm-setting.h \ + libnm-util/nm-setting-8021x.h \ + libnm-util/nm-setting-adsl.h \ + libnm-util/nm-setting-bluetooth.h \ + libnm-util/nm-setting-bond.h \ + libnm-util/nm-setting-team.h \ + libnm-util/nm-setting-team-port.h \ + libnm-util/nm-setting-bridge.h \ + libnm-util/nm-setting-bridge-port.h \ + libnm-util/nm-setting-connection.h \ + libnm-util/nm-setting-dcb.h \ + libnm-util/nm-setting-infiniband.h \ + libnm-util/nm-setting-ip4-config.h \ + libnm-util/nm-setting-vlan.h \ + libnm-util/nm-setting-ip6-config.h \ + libnm-util/nm-setting-ppp.h \ + libnm-util/nm-setting-pppoe.h \ + libnm-util/nm-setting-serial.h \ + libnm-util/nm-setting-generic.h \ + libnm-util/nm-setting-gsm.h \ + libnm-util/nm-setting-cdma.h \ + libnm-util/nm-setting-olpc-mesh.h \ + libnm-util/nm-setting-wimax.h \ + libnm-util/nm-setting-wired.h \ + libnm-util/nm-setting-wireless.h \ + libnm-util/nm-setting-wireless-security.h \ + libnm-util/nm-setting-vpn.h \ + libnm-util/nm-utils.h \ + libnm-util/nm-version.h + +nodist_libnmutilinclude_HEADERS = \ + libnm-util/nm-utils-enum-types.h + +libnm_util_libnm_util_la_private_headers = \ + shared/nm-shared-utils.h \ + libnm-util/crypto.h \ + libnm-util/nm-dbus-glib-types.h \ + libnm-util/nm-gvaluearray-compat.h \ + libnm-util/nm-param-spec-specialized.h \ + libnm-util/nm-setting-private.h \ + libnm-util/nm-utils-private.h + +libnm_util_libnm_util_la_sources = \ + shared/nm-shared-utils.c \ + libnm-util/crypto.c \ + libnm-util/nm-connection.c \ + libnm-util/nm-param-spec-specialized.c \ + libnm-util/nm-setting.c \ + libnm-util/nm-setting-8021x.c \ + libnm-util/nm-setting-adsl.c \ + libnm-util/nm-setting-bluetooth.c \ + libnm-util/nm-setting-bond.c \ + libnm-util/nm-setting-team.c \ + libnm-util/nm-setting-team-port.c \ + libnm-util/nm-setting-bridge.c \ + libnm-util/nm-setting-bridge-port.c \ + libnm-util/nm-setting-connection.c \ + libnm-util/nm-setting-dcb.c \ + libnm-util/nm-setting-infiniband.c \ + libnm-util/nm-setting-ip4-config.c \ + libnm-util/nm-setting-vlan.c \ + libnm-util/nm-setting-ip6-config.c \ + libnm-util/nm-setting-ppp.c \ + libnm-util/nm-setting-pppoe.c \ + libnm-util/nm-setting-serial.c \ + libnm-util/nm-setting-generic.c \ + libnm-util/nm-setting-gsm.c \ + libnm-util/nm-setting-cdma.c \ + libnm-util/nm-setting-olpc-mesh.c \ + libnm-util/nm-setting-wimax.c \ + libnm-util/nm-setting-wired.c \ + libnm-util/nm-setting-wireless.c \ + libnm-util/nm-setting-wireless-security.c \ + libnm-util/nm-setting-vpn.c \ + libnm-util/nm-utils-enum-types.c \ + libnm-util/nm-utils.c \ + libnm-util/nm-value-transforms.c + +libnm_util_libnm_util_la_SOURCES = \ + $(libnm_util_libnm_util_la_sources) \ + $(libnm_util_libnm_util_la_private_headers) + +GLIB_GENERATED += libnm-util/nm-utils-enum-types.h libnm-util/nm-utils-enum-types.c +nm_utils_enum_types_sources = $(filter-out %NetworkManagerVPN.h,$(filter-out %NetworkManager.h,$(libnmutilinclude_HEADERS))) +nm_utils_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM +nm_utils_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM + +libnm_util_libnm_util_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS) $(UUID_LIBS) + +libnm_util_libnm_util_la_LDFLAGS = \ + -Wl,--version-script=$(srcdir)/libnm-util/libnm-util.ver \ + -version-info "9:0:7" + +if WITH_GNUTLS +libnm_util_libnm_util_la_SOURCES += libnm-util/crypto_gnutls.c +libnm_util_libnm_util_la_LIBADD += libnm-util/$(GNUTLS_LIBS) +endif + +if WITH_NSS +libnm_util_libnm_util_la_SOURCES += libnm-util/crypto_nss.c +libnm_util_libnm_util_la_LIBADD += $(NSS_LIBS) +endif + +########################################### +# Crypto test library +########################################### + +noinst_LTLIBRARIES += libnm-util/libtest-crypto.la + +libnm_util_libtest_crypto_la_CPPFLAGS = $(libnm_util_common_cppflags) + +libnm_util_libtest_crypto_la_SOURCES = libnm-util/crypto.c + +libnm_util_libtest_crypto_la_LIBADD = \ + $(GLIB_LIBS) + +if WITH_GNUTLS +libnm_util_libtest_crypto_la_SOURCES += libnm-util/crypto_gnutls.c +libnm_util_libtest_crypto_la_LIBADD += $(GNUTLS_LIBS) +endif + +if WITH_NSS +libnm_util_libtest_crypto_la_SOURCES += libnm-util/crypto_nss.c +libnm_util_libtest_crypto_la_LIBADD += $(NSS_LIBS) +endif + +pkgconfig_DATA += libnm-util/libnm-util.pc + +DISTCLEANFILES += libnm-util/libnm-util.pc + +EXTRA_DIST += libnm-util/libnm-util.pc.in libnm-util/libnm-util.ver + +INTROSPECTION_SCANNER_ARGS += --add-include-path=$(srcdir) +INTROSPECTION_COMPILER_ARGS += --includedir=$(srcdir) + +if HAVE_INTROSPECTION +libnm_util_NetworkManager-1.0.gir: libnm-util/libnm-util.la +libnm_util_NetworkManager_1_0_gir_INCLUDES = GObject-2.0 DBusGLib-1.0 +libnm_util_NetworkManager_1_0_gir_PACKAGES = gobject-2.0 dbus-glib-1 +libnm_util_NetworkManager_1_0_gir_EXPORT_PACKAGES = libnm-util/libnm-util +libnm_util_NetworkManager_1_0_gir_CFLAGS = $(libnm_util_common_cppflags) -I$(top_srcdir)/libnm-util +libnm_util_NetworkManager_1_0_gir_LIBS = libnm-util/libnm-util.la +libnm_util_NetworkManager_1_0_gir_FILES = \ + $(libnmutilinclude_HEADERS) \ + $(nodist_libnmutilinclude_HEADERS) \ + $(libnm_util_libnm_util_la_sources) +libnm_util_NetworkManager_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm + +INTROSPECTION_GIRS += libnm-util/NetworkManager-1.0.gir +typelib_DATA += libnm-util/NetworkManager-1.0.typelib +endif + +if ENABLE_TESTS + +CHECK_LOCALS += check-local-libnm-utils + +check-local-libnm-utils: + $(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-util.so $(srcdir)/libnm-util/libnm-util.ver + +endif diff --git a/libnm-util/NetworkManagerVPN.h b/libnm-util/NetworkManagerVPN.h index 756619864f..96c202d9ef 100644 --- a/libnm-util/NetworkManagerVPN.h +++ b/libnm-util/NetworkManagerVPN.h @@ -79,7 +79,7 @@ * * VPN daemon states */ -typedef enum NMVPNServiceState { +typedef enum { NM_VPN_SERVICE_STATE_UNKNOWN = 0, NM_VPN_SERVICE_STATE_INIT, NM_VPN_SERVICE_STATE_SHUTDOWN, @@ -107,7 +107,7 @@ typedef enum NMVPNServiceState { * * VPN connection states */ -typedef enum NMVPNConnectionState { +typedef enum { NM_VPN_CONNECTION_STATE_UNKNOWN = 0, NM_VPN_CONNECTION_STATE_PREPARE, NM_VPN_CONNECTION_STATE_NEED_AUTH, @@ -147,7 +147,7 @@ typedef enum NMVPNConnectionState { * * VPN connection state reasons */ -typedef enum NMVPNConnectionStateReason { +typedef enum { NM_VPN_CONNECTION_STATE_REASON_UNKNOWN = 0, NM_VPN_CONNECTION_STATE_REASON_NONE, NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED, diff --git a/libnm/Makefile.am b/libnm/Makefile.am deleted file mode 100644 index e035b3cda2..0000000000 --- a/libnm/Makefile.am +++ /dev/null @@ -1,241 +0,0 @@ -include $(GLIB_MAKEFILE) - -@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' - -libnm_la_LIBADD = \ - $(top_builddir)/libnm-core/libnm-core.la \ - $(top_builddir)/introspection/libnmdbus.la \ - $(GLIB_LIBS) \ - $(UUID_LIBS) \ - $(GUDEV_LIBS) - -libnm_la_LDFLAGS = \ - $(CODE_COVERAGE_LDFLAGS) - -SYMBOL_VIS_FILE=$(srcdir)/libnm.ver - -libnm_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \ - -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 - -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 $@ - -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}; \ - $(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}; \ - $(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 diff --git a/libnm/Makemodule.am b/libnm/Makemodule.am new file mode 100644 index 0000000000..2dd7f4d89d --- /dev/null +++ b/libnm/Makemodule.am @@ -0,0 +1,224 @@ +#SUBDIRS += libnm/tests + +libnm_libnm_la_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/libnm.la + +libnminclude_hfiles = \ + $(top_builddir)/shared/nm-version-macros.h \ + libnm/NetworkManager.h \ + libnm/nm-access-point.h \ + libnm/nm-active-connection.h \ + libnm/nm-client.h \ + libnm/nm-device-adsl.h \ + libnm/nm-device-bond.h \ + libnm/nm-device-bridge.h \ + libnm/nm-device-bt.h \ + libnm/nm-device-ethernet.h \ + libnm/nm-device-generic.h \ + libnm/nm-device-infiniband.h \ + libnm/nm-device-ip-tunnel.h \ + libnm/nm-device-macvlan.h \ + libnm/nm-device-modem.h \ + libnm/nm-device-olpc-mesh.h \ + libnm/nm-device-team.h \ + libnm/nm-device-tun.h \ + libnm/nm-device-vlan.h \ + libnm/nm-device-vxlan.h \ + libnm/nm-device-wifi.h \ + libnm/nm-device-wimax.h \ + libnm/nm-device.h \ + libnm/nm-dhcp-config.h \ + libnm/nm-libnm-enum-types.h \ + libnm/nm-ip-config.h \ + libnm/nm-object.h \ + libnm/nm-remote-connection.h \ + libnm/nm-types.h \ + libnm/nm-vpn-connection.h \ + libnm/nm-vpn-editor.h \ + libnm/nm-wimax-nsp.h + +libnminclude_nointrospect_hfiles = \ + libnm/nm-secret-agent-old.h \ + libnm/nm-vpn-plugin-old.h \ + libnm/nm-vpn-service-plugin.h + +libnm_headers = \ + $(libnminclude_hfiles) \ + $(libnminclude_nointrospect_hfiles) + +libnminclude_HEADERS += $(libnm_headers) + +libnm_libnm_la_private_headers = \ + libnm/nm-dbus-helpers.h \ + libnm/nm-device-private.h \ + libnm/nm-dhcp4-config.h \ + libnm/nm-dhcp6-config.h \ + libnm/nm-ip4-config.h \ + libnm/nm-ip6-config.h \ + libnm/nm-manager.h \ + libnm/nm-object-cache.h \ + libnm/nm-object-private.h \ + libnm/nm-remote-connection-private.h \ + libnm/nm-remote-settings.h + +libnm_libnm_la_csources = \ + libnm/nm-access-point.c \ + libnm/nm-active-connection.c \ + libnm/nm-client.c \ + libnm/nm-dbus-helpers.c \ + libnm/nm-device-adsl.c \ + libnm/nm-device-bond.c \ + libnm/nm-device-bridge.c \ + libnm/nm-device-bt.c \ + libnm/nm-device-ethernet.c \ + libnm/nm-device-generic.c \ + libnm/nm-device-infiniband.c \ + libnm/nm-device-ip-tunnel.c \ + libnm/nm-device-macvlan.c \ + libnm/nm-device-modem.c \ + libnm/nm-device-olpc-mesh.c \ + libnm/nm-device-team.c \ + libnm/nm-device-tun.c \ + libnm/nm-device-vlan.c \ + libnm/nm-device-vxlan.c \ + libnm/nm-device-wifi.c \ + libnm/nm-device-wimax.c \ + libnm/nm-device.c \ + libnm/nm-dhcp-config.c \ + libnm/nm-dhcp4-config.c \ + libnm/nm-dhcp6-config.c \ + libnm/nm-libnm-enum-types.c \ + libnm/nm-ip-config.c \ + libnm/nm-ip4-config.c \ + libnm/nm-ip6-config.c \ + libnm/nm-manager.c \ + libnm/nm-object-cache.c \ + libnm/nm-object.c \ + libnm/nm-remote-connection.c \ + libnm/nm-remote-settings.c \ + libnm/nm-secret-agent-old.c \ + libnm/nm-vpn-connection.c \ + libnm/nm-vpn-plugin-old.c \ + libnm/nm-vpn-editor.c \ + libnm/nm-vpn-service-plugin.c \ + libnm/nm-wimax-nsp.c + +libnm_libnm_la_SOURCES = \ + $(libnm_libnm_la_csources) \ + $(libnm_libnm_la_private_headers) + +GLIB_GENERATED += libnm/nm-libnm-enum-types.h libnm/nm-libnm-enum-types.c +nm_libnm_enum_types_sources = $(libnm_headers) +nm_libnm_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include <nm-core-enum-types.h>\n' +nm_libnm_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n' + +libnm_libnm_la_LIBADD = \ + $(top_builddir)/libnm-core/libnm-core.la \ + $(top_builddir)/introspection/libnmdbus.la \ + $(GLIB_LIBS) \ + $(UUID_LIBS) \ + $(GUDEV_LIBS) + +libnm_libnm_la_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) + +libnm_libnm_la_LDFLAGS += \ + -Wl,--version-script=$(srcdir)/libnm/libnm.ver \ + -version-info "1:0:1" + +### + +pkgconfig_DATA += libnm/libnm.pc + +DISTCLEANFILES += libnm/libnm.pc + +EXTRA_DIST += libnm/libnm.pc.in libnm/libnm.ver + +INTROSPECTION_COMPILER_ARGS += \ + --includedir=$(top_srcdir)/libnm-core \ + --includedir=$(top_builddir)/libnm-core \ + --includedir=$(top_srcdir)/libnm \ + --includedir=$(top_builddir)/libnm + +if HAVE_INTROSPECTION +libnm/NM-1.0.gir: libnm/libnm.la +libnm_NM_1_0_gir_INCLUDES = Gio-2.0 +libnm_NM_1_0_gir_PACKAGES = gio-2.0 gudev-1.0 +libnm_NM_1_0_gir_EXPORT_PACKAGES = libnm +libnm_NM_1_0_gir_CFLAGS = $(libnm_libnm_la_CPPFLAGS) +libnm_NM_1_0_gir_LIBS = libnm/libnm.la +libnm_NM_1_0_gir_FILES = \ + $(libnm_core_libnm_core_headers) \ + $(libnminclude_hfiles) \ + $(libnm_core_libnm_core_sources) \ + $(libnm_libnm_la_csources) +libnm_NM_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm + +INTROSPECTION_GIRS += libnm/NM-1.0.gir +typelib_DATA += libnm/NM-1.0.typelib +endif + +CHECK_LOCALS += check-local-libnm + +check-local-libnm: + $(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm.so $(srcdir)/libnm/libnm.ver + +if BUILD_SETTING_DOCS + +noinst_DATA += \ + libnm/nm-property-docs.xml \ + libnm/nm-setting-docs-overrides.xml \ + libnm/nm-setting-docs.xml \ + libnm/nm-keyfile-docs.xml \ + libnm/nm-ifcfg-rh-docs.xml + +docs_sources = $(filter-out %/nm-core-enum-types.c,$(libnm_core_libnm_core_sources)) + +libnm/nm-setting-docs-overrides.xml: libnm/generate-plugin-docs.pl $(docs_sources) + $(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl dbus $(top_srcdir)/libnm-core $@ + +libnm/nm-property-docs.xml: libnm/generate-setting-docs.py $(docs_sources) | libnm/NM-1.0.gir libnm/NM-1.0.typelib libnm/libnm.la + $(AM_V_GEN) \ + 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}; \ + $(srcdir)/libnm/generate-setting-docs.py \ + --gir $(builddir)/libnm/NM-1.0.gir \ + --output $@ + +libnm/nm-setting-docs.xml: libnm/generate-setting-docs.py $(docs_sources) libnm/nm-setting-docs-overrides.xml | libnm/NM-1.0.gir libnm/NM-1.0.typelib libnm/libnm.la + $(AM_V_GEN) \ + 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}; \ + $(srcdir)/libnm/generate-setting-docs.py \ + --gir $(builddir)/libnm/NM-1.0.gir \ + --overrides $(builddir)/libnm/nm-setting-docs-overrides.xml \ + --output $@ + +libnm/nm-keyfile-docs.xml: libnm/generate-plugin-docs.pl $(docs_sources) + $(srcdir)/libnm/generate-plugin-docs.pl keyfile $(top_srcdir)/libnm-core $@ +libnm/nm-ifcfg-rh-docs.xml: libnm/generate-plugin-docs.pl $(docs_sources) + $(srcdir)/libnm/generate-plugin-docs.pl ifcfg-rh $(top_srcdir)/libnm-core $@ + +endif + +EXTRA_DIST += \ + libnm/generate-setting-docs.py \ + libnm/generate-plugin-docs.pl diff --git a/libnm/NetworkManager.h b/libnm/NetworkManager.h index b5dab8fd84..3509e5e54e 100644 --- a/libnm/NetworkManager.h +++ b/libnm/NetworkManager.h @@ -44,7 +44,7 @@ #include <nm-device-wimax.h> #include <nm-device.h> #include <nm-dhcp-config.h> -#include <nm-enum-types.h> +#include <nm-libnm-enum-types.h> #include <nm-ip-config.h> #include <nm-object.h> #include <nm-remote-connection.h> diff --git a/libnm/nm-device-bt.c b/libnm/nm-device-bt.c index dc28ad89f4..24acb917bf 100644 --- a/libnm/nm-device-bt.c +++ b/libnm/nm-device-bt.c @@ -30,7 +30,7 @@ #include "nm-device-bt.h" #include "nm-device-private.h" #include "nm-object-private.h" -#include "nm-enum-types.h" +#include "nm-libnm-enum-types.h" G_DEFINE_TYPE (NMDeviceBt, nm_device_bt, NM_TYPE_DEVICE) diff --git a/libnm/nm-device-modem.c b/libnm/nm-device-modem.c index d442dc0342..31eb684f3c 100644 --- a/libnm/nm-device-modem.c +++ b/libnm/nm-device-modem.c @@ -30,7 +30,7 @@ #include "nm-device-modem.h" #include "nm-device-private.h" #include "nm-object-private.h" -#include "nm-enum-types.h" +#include "nm-libnm-enum-types.h" G_DEFINE_TYPE (NMDeviceModem, nm_device_modem, NM_TYPE_DEVICE) diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c index cbbbde5ed6..8266ba0ebf 100644 --- a/libnm/nm-secret-agent-old.c +++ b/libnm/nm-secret-agent-old.c @@ -24,7 +24,7 @@ #include "nm-dbus-interface.h" #include "nm-secret-agent-old.h" -#include "nm-enum-types.h" +#include "nm-libnm-enum-types.h" #include "nm-dbus-helpers.h" #include "nm-simple-connection.h" #include "nm-core-internal.h" diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c index 634e61a232..69daa859c8 100644 --- a/libnm/nm-vpn-plugin-old.c +++ b/libnm/nm-vpn-plugin-old.c @@ -27,7 +27,7 @@ #include <signal.h> #include <stdlib.h> -#include "nm-enum-types.h" +#include "nm-libnm-enum-types.h" #include "nm-utils.h" #include "nm-connection.h" #include "nm-dbus-helpers.h" diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c index 82e29ee8a3..c3a8c85fcb 100644 --- a/libnm/nm-vpn-service-plugin.c +++ b/libnm/nm-vpn-service-plugin.c @@ -27,7 +27,7 @@ #include <signal.h> #include <stdlib.h> -#include "nm-enum-types.h" +#include "nm-libnm-enum-types.h" #include "nm-utils.h" #include "nm-connection.h" #include "nm-dbus-helpers.h" diff --git a/libnm/nm-wimax-nsp.c b/libnm/nm-wimax-nsp.c index d544b0d47f..0fd3160931 100644 --- a/libnm/nm-wimax-nsp.c +++ b/libnm/nm-wimax-nsp.c @@ -29,7 +29,7 @@ #include "nm-wimax-nsp.h" #include "nm-dbus-interface.h" #include "nm-object-private.h" -#include "nm-enum-types.h" +#include "nm-libnm-enum-types.h" G_DEFINE_TYPE (NMWimaxNsp, nm_wimax_nsp, NM_TYPE_OBJECT) diff --git a/man/Makefile.am b/man/Makemodule.am index 9338edbbe0..e845332391 100644 --- a/man/Makefile.am +++ b/man/Makemodule.am @@ -1,7 +1,3 @@ -man_MANS = -CLEANFILES = -EXTRA_DIST = - XSLTPROC = xsltproc XSLTPROC_FLAGS = --xinclude --nonet @@ -17,54 +13,58 @@ XSLTPROC_MAN_FLAGS = \ if ENABLE_GTK_DOC -%.1: %.xml common.ent +%.1: %.xml man/common.ent $(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $< + @touch $@ -%.5: %.xml common.ent +%.5: %.xml man/common.ent $(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $< + @touch $@ -%.7: %.xml common.ent +%.7: %.xml man/common.ent $(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $< + @touch $@ -%.8: %.xml common.ent +%.8: %.xml man/common.ent $(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $< + @touch $@ endif if BUILD_SETTING_DOCS -nm-settings.xml: nm-settings.xsl $(top_builddir)/libnm/nm-setting-docs.xml +man/nm-settings.xml: man/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 +man/nm-settings-keyfile.xml: man/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 +man/nm-settings-ifcfg-rh.xml: man/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 + man/nm-settings.xml \ + man/nm-settings-keyfile.xml \ + man/nm-settings-ifcfg-rh.xml endif -man_pages = \ - nmcli.1 \ - nmtui.1 \ - nm-online.1 \ - NetworkManager.conf.5 \ - nmcli-examples.7 \ - NetworkManager.8 +man_pages = \ + man/nmcli.1 \ + man/nmtui.1 \ + man/nm-online.1 \ + man/NetworkManager.conf.5 \ + man/nmcli-examples.7 \ + man/NetworkManager.8 -autogenerated_man_pages = \ - nm-settings.5 \ - nm-settings-keyfile.5 +autogenerated_man_pages = \ + man/nm-settings.5 \ + man/nm-settings-keyfile.5 if CONFIG_PLUGIN_IFCFG_RH -autogenerated_man_pages += nm-settings-ifcfg-rh.5 +autogenerated_man_pages += man/nm-settings-ifcfg-rh.5 else -EXTRA_DIST += nm-settings-ifcfg-rh.5 +EXTRA_DIST += man/nm-settings-ifcfg-rh.5 endif EXTRA_DIST += \ @@ -90,7 +90,7 @@ install_manpages = true endif endif -install-data-hook: +install-data-hook-man: if test -n "$(install_manpages)"; then \ for link in $(nmtui_links); do \ ln -f $(DESTDIR)$(mandir)/man1/nmtui.1 $(DESTDIR)$(mandir)/man1/$$link.1; \ @@ -100,7 +100,9 @@ install-data-hook: done; \ fi -uninstall-hook: +INSTALL_DATA_HOOKS += install-data-hook-man + +uninstall-hook-man: if test -n "$(install_manpages)"; then \ for link in $(nmtui_links); do \ rm -f $(DESTDIR)$(mandir)/man1/$$link.1; \ @@ -110,6 +112,8 @@ uninstall-hook: done; \ fi +UNINSTALL_HOOKS += uninstall-hook-man + if ENABLE_GTK_DOC man_MANS += $(man_pages) CLEANFILES += $(man_pages) diff --git a/policy/Makefile.am b/policy/Makemodule.am index 37c4344aab..c48068ddbc 100644 --- a/policy/Makefile.am +++ b/policy/Makemodule.am @@ -1,11 +1,7 @@ -polkit_policydir = $(datadir)/polkit-1/actions - dist_polkit_policy_in_in_files = \ - org.freedesktop.NetworkManager.policy.in.in - -polkit_policy_DATA = $(dist_polkit_policy_in_in_files:.policy.in.in=.policy) + policy/org.freedesktop.NetworkManager.policy.in.in -@INTLTOOL_POLICY_RULE@ +polkit_policy_DATA += $(dist_polkit_policy_in_in_files:.policy.in.in=.policy) # polkit >= 0.92 doesn't have an updated polkit-policy-file-validate #check: @@ -24,5 +20,3 @@ polkit_policy_DATA = $(dist_polkit_policy_in_in_files:.policy.in.in=.policy) clean-local : rm -f *~ - -DISTCLEANFILES = $(polkit_policy_DATA) diff --git a/shared/Makefile.am b/shared/Makefile.am deleted file mode 100644 index c042fdbe80..0000000000 --- a/shared/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -EXTRA_DIST = \ - gsystem-local-alloc.h \ - nm-dbus-compat.h \ - nm-default.h \ - nm-glib.h \ - nm-macros-internal.h \ - nm-shared-utils.c \ - nm-shared-utils.h \ - nm-test-libnm-utils.h \ - nm-test-utils.h \ - nm-test-utils-impl.c \ - nm-version-macros.h.in - -CLEANFILES=nm-version.h diff --git a/shared/Makemodule.am b/shared/Makemodule.am new file mode 100644 index 0000000000..0e32a84ddb --- /dev/null +++ b/shared/Makemodule.am @@ -0,0 +1,14 @@ +EXTRA_DIST += \ + shared/gsystem-local-alloc.h \ + shared/nm-dbus-compat.h \ + shared/nm-default.h \ + shared/nm-glib.h \ + shared/nm-macros-internal.h \ + shared/nm-shared-utils.c \ + shared/nm-shared-utils.h \ + shared/nm-test-libnm-utils.h \ + shared/nm-test-utils.h \ + shared/nm-test-utils-impl.c \ + shared/nm-version-macros.h.in + +CLEANFILES += shared/nm-version.h diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 95e4c508de..0000000000 --- a/src/Makefile.am +++ /dev/null @@ -1,647 +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 \ - -I$(top_srcdir)/callouts \ - -DPREFIX=\"$(prefix)\" \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON - -# add each subdirectory that contains a libNM source file. $(sort) is being used -# primarily for its side effect of removing duplicates. -AM_CPPFLAGS += $(foreach d,$(sort $(dir $(libNetworkManager_la_SOURCES))),-I$(top_srcdir)/src/$d) - -noinst_LTLIBRARIES = \ - libNetworkManager.la \ - libnm-iface-helper.la \ - libsystemd-nm.la - -###################### -# libsystemd-nm -###################### - -SYSTEMD_NM_CFLAGS_PATHS = \ - -I$(top_srcdir)/src/systemd/src/systemd \ - -I$(top_srcdir)/src/systemd/src/libsystemd-network \ - -I$(top_srcdir)/src/systemd/src/basic \ - -I$(top_srcdir)/src/systemd - -libsystemd_nm_la_SOURCES = \ - systemd/nm-sd.c \ - systemd/nm-sd.h \ - systemd/nm-sd-adapt.c \ - systemd/nm-sd-adapt.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/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/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/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 \ - $(SYSTEMD_NM_CFLAGS_PATHS) \ - -I$(top_srcdir)/src/systemd/src/shared \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \ - $(GLIB_CFLAGS) - -libsystemd_nm_la_LIBADD = \ - $(GLIB_LIBS) - -###################### -# libsystemd-nm-base -###################### - -if ENABLE_TESTS -noinst_LTLIBRARIES += \ - libNetworkManager-base.la - -libNetworkManager_base_la_SOURCES = \ - nm-core-utils.c \ - nm-core-utils.h \ - nm-logging.c \ - nm-logging.h - -libNetworkManager_base_la_CPPFLAGS = \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -I$(top_srcdir)/src/platform \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - -DNO_SYSTEMD_JOURNAL \ - -DPREFIX=\"$(prefix)\" \ - -DNMSTATEDIR=\"$(nmstatedir)\" \ - $(GLIB_CFLAGS) - -libNetworkManager_base_la_LIBADD = \ - $(top_builddir)/libnm-core/libnm-core.la \ - $(GLIB_LIBS) -endif - -########################################### -# NetworkManager -########################################### - -sbin_PROGRAMS = NetworkManager - -NetworkManager_SOURCES = \ - $(nm_device_sources) $(nm_device_headers) \ - $(nm_dhcp_client_sources) $(nm_dhcp_client_headers) \ - main-utils.c \ - main-utils.h \ - main.c - -NetworkManager_LDADD = libNetworkManager.la - -nm_device_sources = \ - devices/nm-device-bond.c \ - devices/nm-device-bridge.c \ - devices/nm-device-ethernet.c \ - devices/nm-device-infiniband.c \ - devices/nm-device-ip-tunnel.c \ - devices/nm-device-macvlan.c \ - devices/nm-device-tun.c \ - devices/nm-device-veth.c \ - devices/nm-device-vlan.c \ - devices/nm-device-vxlan.c \ - $(NULL) - -nm_device_headers = \ - devices/nm-device-bond.h \ - devices/nm-device-bridge.h \ - devices/nm-device-ethernet.h \ - devices/nm-device-infiniband.h \ - devices/nm-device-ip-tunnel.h \ - devices/nm-device-macvlan.h \ - devices/nm-device-tun.h \ - devices/nm-device-veth.h \ - devices/nm-device-vlan.h \ - devices/nm-device-vxlan.h - -nm_dhcp_client_sources = \ - dhcp-manager/nm-dhcp-dhclient.c \ - dhcp-manager/nm-dhcp-dhclient-utils.c \ - dhcp-manager/nm-dhcp-dhcpcd.c \ - dhcp-manager/nm-dhcp-systemd.c - -nm_dhcp_client_headers = \ - dhcp-manager/nm-dhcp-dhclient.h \ - dhcp-manager/nm-dhcp-dhclient-utils.h \ - dhcp-manager/nm-dhcp-dhcpcd.h \ - dhcp-manager/nm-dhcp-systemd.h - -libNetworkManager_la_SOURCES = \ - $(nm_device_headers) \ - $(nm_dhcp_client_headers) \ - 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 \ - \ - 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-listener.c \ - dhcp-manager/nm-dhcp-listener.h \ - dhcp-manager/nm-dhcp-manager.c \ - dhcp-manager/nm-dhcp-manager.h \ - \ - dns-manager/nm-dns-dnsmasq.c \ - dns-manager/nm-dns-dnsmasq.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 \ - dns-manager/nm-dns-utils.c \ - dns-manager/nm-dns-utils.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/nm-fake-platform.c \ - platform/nm-fake-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-fake-rdisc.c \ - rdisc/nm-fake-rdisc.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/nm-keyfile-connection.c \ - settings/plugins/keyfile/nm-keyfile-connection.h \ - settings/plugins/keyfile/plugin.c \ - settings/plugins/keyfile/plugin.h \ - settings/plugins/keyfile/reader.c \ - settings/plugins/keyfile/reader.h \ - settings/plugins/keyfile/utils.c \ - settings/plugins/keyfile/utils.h \ - settings/plugins/keyfile/writer.c \ - settings/plugins/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-activation-request.c \ - nm-activation-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-connection-provider.c \ - nm-connection-provider.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-ip4-config.c \ - nm-ip4-config.h \ - nm-ip6-config.c \ - nm-ip6-config.h \ - nm-logging.c \ - nm-logging.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-policy.c \ - nm-policy.h \ - nm-rfkill-manager.c \ - nm-rfkill-manager.h \ - nm-session-monitor.h \ - nm-session-monitor.c \ - nm-sleep-monitor.h \ - nm-types.h \ - nm-core-utils.c \ - nm-core-utils.h \ - NetworkManagerUtils.c \ - NetworkManagerUtils.h - - -if SUSPEND_RESUME_UPOWER -libNetworkManager_la_SOURCES += nm-sleep-monitor-upower.c -else -# systemd/consolekit suspend/resume used whenever upower is not enabled -libNetworkManager_la_SOURCES += nm-sleep-monitor-systemd.c -endif - -if WITH_WEXT -libNetworkManager_la_SOURCES += \ - platform/wifi/wifi-utils-wext.c \ - platform/wifi/wifi-utils-wext.h -endif - - -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 -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) - -AM_CPPFLAGS += \ - $(GLIB_CFLAGS) \ - $(GUDEV_CFLAGS) \ - $(LIBNL_CFLAGS) \ - $(LIBNDP_CFLAGS) \ - $(LIBSOUP_CFLAGS) \ - $(SELINUX_CFLAGS) \ - $(LIBAUDIT_CFLAGS) \ - $(SYSTEMD_LOGIN_CFLAGS) \ - $(SYSTEMD_JOURNAL_CFLAGS) \ - $(SYSTEMD_NM_CFLAGS_PATHS) \ - $(CODE_COVERAGE_CFLAGS) \ - \ - -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)\" \ - \ - $(NULL) - -AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS) - -libNetworkManager_la_LIBADD = \ - $(top_builddir)/libnm-core/libnm-core.la \ - $(top_builddir)/introspection/libnmdbus.la \ - libsystemd-nm.la \ - $(GLIB_LIBS) \ - $(GUDEV_LIBS) \ - $(LIBNL_LIBS) \ - $(SYSTEMD_LOGIN_LIBS) \ - $(SYSTEMD_JOURNAL_LIBS) \ - $(LIBNDP_LIBS) \ - $(LIBDL) \ - $(LIBM) \ - $(SELINUX_LIBS) \ - $(LIBAUDIT_LIBS) - -if WITH_LIBSOUP -libNetworkManager_la_LIBADD += $(LIBSOUP_LIBS) -endif - -NetworkManager_LDFLAGS = \ - -rdynamic \ - -Wl,--version-script="$(srcdir)/NetworkManager.ver" - -###################### - -libnm_iface_helper_la_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 \ - \ - 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-fake-rdisc.c \ - rdisc/nm-fake-rdisc.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-ip4-config.c \ - nm-ip4-config.h \ - nm-ip6-config.c \ - nm-ip6-config.h \ - \ - nm-enum-types.c \ - nm-enum-types.h \ - nm-logging.c \ - nm-logging.h \ - nm-multi-index.c \ - nm-multi-index.h \ - nm-core-utils.c \ - nm-core-utils.h \ - NetworkManagerUtils.c \ - NetworkManagerUtils.h - -if WITH_WEXT -libnm_iface_helper_la_SOURCES += \ - platform/wifi/wifi-utils-wext.c \ - platform/wifi/wifi-utils-wext.h -endif - -libnm_iface_helper_la_LIBADD = \ - $(top_builddir)/libnm-core/libnm-core.la \ - $(top_builddir)/introspection/libnmdbus.la \ - libsystemd-nm.la \ - $(GLIB_LIBS) \ - $(GUDEV_LIBS) \ - $(LIBNL_LIBS) \ - $(LIBNDP_LIBS) \ - $(LIBDL) \ - $(LIBM) - -libexec_PROGRAMS = nm-iface-helper - -nm_iface_helper_SOURCES = \ - dhcp-manager/nm-dhcp-systemd.h \ - dhcp-manager/nm-dhcp-systemd.c \ - nm-iface-helper.c \ - main-utils.c \ - main-utils.h - -nm_iface_helper_LDADD = \ - $(top_builddir)/libnm-core/libnm-core.la \ - libsystemd-nm.la \ - libnm-iface-helper.la \ - $(GLIB_LIBS) \ - $(GUDEV_LIBS) \ - $(SYSTEMD_JOURNAL_LIBS) \ - $(LIBNL_LIBS) \ - $(LIBNDP_LIBS) \ - $(LIBM) - -nm_iface_helper_LDFLAGS = -rdynamic - -###################### - -dbusservicedir = $(DBUS_SYS_DIR) -dbusservice_DATA = org.freedesktop.NetworkManager.conf - -EXTRA_DIST = \ - $(dbusservice_DATA) \ - $(NetworkManager_DATA) \ - 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) diff --git a/src/Makemodule.am b/src/Makemodule.am new file mode 100644 index 0000000000..0a1fd9c977 --- /dev/null +++ b/src/Makemodule.am @@ -0,0 +1,647 @@ +#SUBDIRS += \ +# src/dhcp-manager \ +# src/ppp-manager \ +# src/settings/plugins \ +# src/devices/adsl +# +#if WITH_MODEM_MANAGER_1 +#SUBDIRS += src/devices/wwan +#SUBDIRS += src/devices/bluetooth +#endif +# +#if WITH_WIFI +#SUBDIRS += src/devices/wifi +#endif +# +#if WITH_TEAMDCTL +#SUBDIRS += src/devices/team +#endif +# +#if ENABLE_TESTS +#SUBDIRS += \ +# src/dhcp-manager/tests \ +# src/dnsmasq-manager/tests \ +# src/platform \ +# src/devices \ +# src/rdisc \ +# src/supplicant-manager/tests \ +# src/tests +#endif + +src_common_cppflags = \ + -I$(top_srcdir)/src \ + -I$(top_builddir)/src \ + -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)/callouts \ + -DPREFIX=\"$(prefix)\" \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON + +# add each subdirectory that contains a libNM source file. $(sort) is being used +# primarily for its side effect of removing duplicates. +src_common_cppflags += $(foreach d,$(sort $(dir $(src_libNetworkManager_la_SOURCES))),-I$(top_srcdir)/$d) + +src_libNetworkManager_la_CPPFLAGS = $(src_common_cppflags) +src_libnm_iface_helper_la_CPPFLAGS = $(src_common_cppflags) + +noinst_LTLIBRARIES += \ + src/libNetworkManager.la \ + src/libnm-iface-helper.la \ + src/libsystemd-nm.la + +###################### +# libsystemd-nm +###################### + +SYSTEMD_NM_CFLAGS_PATHS = \ + -I$(top_srcdir)/src/systemd/src/systemd \ + -I$(top_srcdir)/src/systemd/src/libsystemd-network \ + -I$(top_srcdir)/src/systemd/src/basic \ + -I$(top_srcdir)/src/systemd + +src_libsystemd_nm_la_SOURCES = \ + src/systemd/nm-sd.c \ + src/systemd/nm-sd.h \ + src/systemd/nm-sd-adapt.c \ + src/systemd/nm-sd-adapt.h \ + src/systemd/src/basic/alloc-util.c \ + src/systemd/src/basic/alloc-util.h \ + src/systemd/src/basic/async.h \ + src/systemd/src/basic/escape.c \ + src/systemd/src/basic/escape.h \ + src/systemd/src/basic/ether-addr-util.c \ + src/systemd/src/basic/ether-addr-util.h \ + src/systemd/src/basic/fd-util.c \ + src/systemd/src/basic/fd-util.h \ + src/systemd/src/basic/fileio.c \ + src/systemd/src/basic/fileio.h \ + src/systemd/src/basic/fs-util.c \ + src/systemd/src/basic/fs-util.h \ + src/systemd/src/basic/hash-funcs.c \ + src/systemd/src/basic/hash-funcs.h \ + src/systemd/src/basic/hashmap.c \ + src/systemd/src/basic/hashmap.h \ + src/systemd/src/basic/hexdecoct.c \ + src/systemd/src/basic/hexdecoct.h \ + src/systemd/src/basic/hostname-util.c \ + src/systemd/src/basic/hostname-util.h \ + src/systemd/src/basic/in-addr-util.c \ + src/systemd/src/basic/in-addr-util.h \ + src/systemd/src/basic/io-util.c \ + src/systemd/src/basic/io-util.h \ + src/systemd/src/basic/list.h \ + src/systemd/src/basic/log.h \ + src/systemd/src/basic/macro.h \ + src/systemd/src/basic/mempool.c \ + src/systemd/src/basic/mempool.h \ + src/systemd/src/basic/parse-util.c \ + src/systemd/src/basic/parse-util.h \ + src/systemd/src/basic/path-util.c \ + src/systemd/src/basic/path-util.h \ + src/systemd/src/basic/prioq.c \ + src/systemd/src/basic/prioq.h \ + src/systemd/src/basic/random-util.c \ + src/systemd/src/basic/random-util.h \ + src/systemd/src/basic/refcnt.h \ + src/systemd/src/basic/set.h \ + src/systemd/src/basic/siphash24.c \ + src/systemd/src/basic/siphash24.h \ + src/systemd/src/basic/socket-util.c \ + src/systemd/src/basic/socket-util.h \ + src/systemd/src/basic/sparse-endian.h \ + src/systemd/src/basic/stdio-util.h \ + src/systemd/src/basic/string-table.c \ + src/systemd/src/basic/string-table.h \ + src/systemd/src/basic/string-util.c \ + src/systemd/src/basic/string-util.h \ + src/systemd/src/basic/strv.c \ + src/systemd/src/basic/strv.h \ + src/systemd/src/basic/time-util.c \ + src/systemd/src/basic/time-util.h \ + src/systemd/src/basic/umask-util.h \ + src/systemd/src/basic/unaligned.h \ + src/systemd/src/basic/utf8.c \ + src/systemd/src/basic/utf8.h \ + src/systemd/src/basic/util.c \ + src/systemd/src/basic/util.h \ + src/systemd/src/libsystemd-network/arp-util.c \ + src/systemd/src/libsystemd-network/arp-util.h \ + src/systemd/src/libsystemd-network/dhcp-identifier.c \ + src/systemd/src/libsystemd-network/dhcp-identifier.h \ + src/systemd/src/libsystemd-network/dhcp-internal.h \ + src/systemd/src/libsystemd-network/dhcp-lease-internal.h \ + src/systemd/src/libsystemd-network/dhcp-network.c \ + src/systemd/src/libsystemd-network/dhcp-option.c \ + src/systemd/src/libsystemd-network/dhcp-packet.c \ + src/systemd/src/libsystemd-network/dhcp-protocol.h \ + src/systemd/src/libsystemd-network/dhcp6-internal.h \ + src/systemd/src/libsystemd-network/dhcp6-lease-internal.h \ + src/systemd/src/libsystemd-network/dhcp6-network.c \ + src/systemd/src/libsystemd-network/dhcp6-option.c \ + src/systemd/src/libsystemd-network/dhcp6-protocol.h \ + src/systemd/src/libsystemd-network/lldp-internal.h \ + src/systemd/src/libsystemd-network/lldp-neighbor.c \ + src/systemd/src/libsystemd-network/lldp-neighbor.h \ + src/systemd/src/libsystemd-network/lldp-network.c \ + src/systemd/src/libsystemd-network/lldp-network.h \ + src/systemd/src/libsystemd-network/network-internal.c \ + src/systemd/src/libsystemd-network/network-internal.h \ + src/systemd/src/libsystemd-network/sd-dhcp-client.c \ + src/systemd/src/libsystemd-network/sd-dhcp-lease.c \ + src/systemd/src/libsystemd-network/sd-dhcp6-client.c \ + src/systemd/src/libsystemd-network/sd-dhcp6-lease.c \ + src/systemd/src/libsystemd-network/sd-ipv4acd.c \ + src/systemd/src/libsystemd-network/sd-ipv4ll.c \ + src/systemd/src/libsystemd-network/sd-lldp.c \ + src/systemd/src/libsystemd/sd-event/sd-event.c \ + src/systemd/src/libsystemd/sd-id128/sd-id128.c \ + src/systemd/src/shared/dns-domain.c \ + src/systemd/src/shared/dns-domain.h \ + src/systemd/src/systemd/_sd-common.h \ + src/systemd/src/systemd/sd-dhcp-client.h \ + src/systemd/src/systemd/sd-dhcp-lease.h \ + src/systemd/src/systemd/sd-dhcp6-client.h \ + src/systemd/src/systemd/sd-dhcp6-lease.h \ + src/systemd/src/systemd/sd-event.h \ + src/systemd/src/systemd/sd-id128.h \ + src/systemd/src/systemd/sd-ipv4acd.h \ + src/systemd/src/systemd/sd-ipv4ll.h \ + src/systemd/src/systemd/sd-lldp.h \ + src/systemd/src/systemd/sd-ndisc.h + +src_libsystemd_nm_la_CPPFLAGS = \ + -I$(top_srcdir)/src \ + -I$(top_builddir)/src \ + -I$(top_srcdir)/shared \ + -I$(top_builddir)/shared \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + $(SYSTEMD_NM_CFLAGS_PATHS) \ + -I$(top_srcdir)/src/systemd/src/shared \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \ + $(GLIB_CFLAGS) + +src_libsystemd_nm_la_LIBADD = \ + $(GLIB_LIBS) + +###################### +# libsystemd-nm-base +###################### + +if ENABLE_TESTS +noinst_LTLIBRARIES += \ + src/libNetworkManager-base.la + +src_libNetworkManager_base_la_SOURCES = \ + src/nm-core-utils.c \ + src/nm-core-utils.h \ + src/nm-logging.c \ + src/nm-logging.h + +src_libNetworkManager_base_la_CPPFLAGS = \ + -I$(top_srcdir)/src \ + -I$(top_builddir)/src \ + -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 \ + -DNO_SYSTEMD_JOURNAL \ + -DPREFIX=\"$(prefix)\" \ + -DNMSTATEDIR=\"$(nmstatedir)\" \ + $(GLIB_CFLAGS) + +src_libNetworkManager_base_la_LIBADD = \ + $(top_builddir)/libnm-core/libnm-core.la \ + $(GLIB_LIBS) +endif + +########################################### +# NetworkManager +########################################### + +sbin_PROGRAMS += src/NetworkManager + +src_NetworkManager_SOURCES = \ + $(nm_device_sources) $(nm_device_headers) \ + $(nm_dhcp_client_sources) $(nm_dhcp_client_headers) \ + src/main-utils.c \ + src/main-utils.h \ + src/main.c + +src_NetworkManager_LDADD = src/libNetworkManager.la + +src_NetworkManager_CPPFLAGS = $(src_common_cppflags) + +nm_device_sources = \ + src/devices/nm-device-bond.c \ + src/devices/nm-device-bridge.c \ + src/devices/nm-device-ethernet.c \ + src/devices/nm-device-infiniband.c \ + src/devices/nm-device-ip-tunnel.c \ + src/devices/nm-device-macvlan.c \ + src/devices/nm-device-tun.c \ + src/devices/nm-device-veth.c \ + src/devices/nm-device-vlan.c \ + src/devices/nm-device-vxlan.c \ + $(NULL) + +nm_device_headers = \ + src/devices/nm-device-bond.h \ + src/devices/nm-device-bridge.h \ + src/devices/nm-device-ethernet.h \ + src/devices/nm-device-infiniband.h \ + src/devices/nm-device-ip-tunnel.h \ + src/devices/nm-device-macvlan.h \ + src/devices/nm-device-tun.h \ + src/devices/nm-device-veth.h \ + src/devices/nm-device-vlan.h \ + src/devices/nm-device-vxlan.h + +nm_dhcp_client_sources = \ + src/dhcp-manager/nm-dhcp-dhclient.c \ + src/dhcp-manager/nm-dhcp-dhclient-utils.c \ + src/dhcp-manager/nm-dhcp-dhcpcd.c \ + src/dhcp-manager/nm-dhcp-systemd.c + +nm_dhcp_client_headers = \ + src/dhcp-manager/nm-dhcp-dhclient.h \ + src/dhcp-manager/nm-dhcp-dhclient-utils.h \ + src/dhcp-manager/nm-dhcp-dhcpcd.h \ + src/dhcp-manager/nm-dhcp-systemd.h + +src_libNetworkManager_la_SOURCES = \ + $(nm_device_headers) \ + $(nm_dhcp_client_headers) \ + src/devices/nm-device.c \ + src/devices/nm-device.h \ + src/devices/nm-lldp-listener.c \ + src/devices/nm-lldp-listener.h \ + src/devices/nm-arping-manager.c \ + src/devices/nm-arping-manager.h \ + src/devices/nm-device-ethernet-utils.c \ + src/devices/nm-device-ethernet-utils.h \ + src/devices/nm-device-factory.c \ + src/devices/nm-device-factory.h \ + src/devices/nm-device-generic.c \ + src/devices/nm-device-generic.h \ + src/devices/nm-device-logging.h \ + src/devices/nm-device-private.h \ + \ + src/dhcp-manager/nm-dhcp-client.c \ + src/dhcp-manager/nm-dhcp-client.h \ + src/dhcp-manager/nm-dhcp-client-logging.h \ + src/dhcp-manager/nm-dhcp-utils.c \ + src/dhcp-manager/nm-dhcp-utils.h \ + src/dhcp-manager/nm-dhcp-listener.c \ + src/dhcp-manager/nm-dhcp-listener.h \ + src/dhcp-manager/nm-dhcp-manager.c \ + src/dhcp-manager/nm-dhcp-manager.h \ + \ + src/dns-manager/nm-dns-dnsmasq.c \ + src/dns-manager/nm-dns-dnsmasq.h \ + src/dns-manager/nm-dns-unbound.c \ + src/dns-manager/nm-dns-unbound.h \ + src/dns-manager/nm-dns-manager.c \ + src/dns-manager/nm-dns-manager.h \ + src/dns-manager/nm-dns-plugin.c \ + src/dns-manager/nm-dns-plugin.h \ + src/dns-manager/nm-dns-utils.c \ + src/dns-manager/nm-dns-utils.h \ + \ + src/dnsmasq-manager/nm-dnsmasq-manager.c \ + src/dnsmasq-manager/nm-dnsmasq-manager.h \ + src/dnsmasq-manager/nm-dnsmasq-utils.c \ + src/dnsmasq-manager/nm-dnsmasq-utils.h \ + \ + src/platform/nmp-netns.c \ + src/platform/nmp-netns.h \ + src/platform/nmp-object.c \ + src/platform/nmp-object.h \ + src/platform/nm-platform-utils.c \ + src/platform/nm-platform-utils.h \ + src/platform/nm-platform.c \ + src/platform/nm-platform.h \ + src/platform/nm-linux-platform.c \ + src/platform/nm-linux-platform.h \ + src/platform/nm-fake-platform.c \ + src/platform/nm-fake-platform.h \ + src/platform/wifi/wifi-utils-nl80211.c \ + src/platform/wifi/wifi-utils-nl80211.h \ + src/platform/wifi/wifi-utils-private.h \ + src/platform/wifi/wifi-utils.c \ + src/platform/wifi/wifi-utils.h \ + \ + src/rdisc/nm-fake-rdisc.c \ + src/rdisc/nm-fake-rdisc.h \ + src/rdisc/nm-lndp-rdisc.c \ + src/rdisc/nm-lndp-rdisc.h \ + src/rdisc/nm-rdisc.c \ + src/rdisc/nm-rdisc.h \ + src/rdisc/nm-rdisc-private.h \ + \ + src/ppp-manager/nm-ppp-manager.c \ + src/ppp-manager/nm-ppp-manager.h \ + src/ppp-manager/nm-ppp-status.h \ + \ + src/settings/nm-agent-manager.c \ + src/settings/nm-agent-manager.h \ + src/settings/nm-inotify-helper.c \ + src/settings/nm-inotify-helper.h \ + src/settings/nm-secret-agent.c \ + src/settings/nm-secret-agent.h \ + src/settings/nm-settings-connection.c \ + src/settings/nm-settings-connection.h \ + src/settings/nm-settings-plugin.c \ + src/settings/nm-settings-plugin.h \ + src/settings/nm-settings.c \ + src/settings/nm-settings.h \ + \ + src/settings/plugins/keyfile/nm-keyfile-connection.c \ + src/settings/plugins/keyfile/nm-keyfile-connection.h \ + src/settings/plugins/keyfile/plugin.c \ + src/settings/plugins/keyfile/plugin.h \ + src/settings/plugins/keyfile/reader.c \ + src/settings/plugins/keyfile/reader.h \ + src/settings/plugins/keyfile/utils.c \ + src/settings/plugins/keyfile/utils.h \ + src/settings/plugins/keyfile/writer.c \ + src/settings/plugins/keyfile/writer.h \ + \ + src/supplicant-manager/nm-supplicant-config.c \ + src/supplicant-manager/nm-supplicant-config.h \ + src/supplicant-manager/nm-supplicant-interface.c \ + src/supplicant-manager/nm-supplicant-interface.h \ + src/supplicant-manager/nm-supplicant-manager.c \ + src/supplicant-manager/nm-supplicant-manager.h \ + src/supplicant-manager/nm-supplicant-settings-verify.c \ + src/supplicant-manager/nm-supplicant-settings-verify.h \ + src/supplicant-manager/nm-supplicant-types.h \ + \ + src/vpn-manager/nm-vpn-connection.c \ + src/vpn-manager/nm-vpn-connection.h \ + src/vpn-manager/nm-vpn-manager.c \ + src/vpn-manager/nm-vpn-manager.h \ + \ + src/nm-activation-request.c \ + src/nm-activation-request.h \ + src/nm-active-connection.c \ + src/nm-active-connection.h \ + src/nm-audit-manager.c \ + src/nm-audit-manager.h \ + src/nm-bus-manager.c \ + src/nm-bus-manager.h \ + src/nm-config.c \ + src/nm-config.h \ + src/nm-config-data.c \ + src/nm-config-data.h \ + src/nm-connection-provider.c \ + src/nm-connection-provider.h \ + src/nm-connectivity.c \ + src/nm-connectivity.h \ + src/nm-dcb.c \ + src/nm-dcb.h \ + src/nm-route-manager.c \ + src/nm-route-manager.h \ + src/nm-default-route-manager.c \ + src/nm-default-route-manager.h \ + src/nm-dhcp4-config.c \ + src/nm-dhcp4-config.h \ + src/nm-dhcp6-config.c \ + src/nm-dhcp6-config.h \ + src/nm-dispatcher.c \ + src/nm-dispatcher.h \ + src/nm-enum-types.c \ + src/nm-enum-types.h \ + src/nm-exported-object.c \ + src/nm-exported-object.h \ + src/nm-firewall-manager.c \ + src/nm-firewall-manager.h \ + src/nm-ip4-config.c \ + src/nm-ip4-config.h \ + src/nm-ip6-config.c \ + src/nm-ip6-config.h \ + src/nm-logging.c \ + src/nm-logging.h \ + src/nm-auth-manager.c \ + src/nm-auth-manager.h \ + src/nm-auth-subject.c \ + src/nm-auth-subject.h \ + src/nm-auth-utils.c \ + src/nm-auth-utils.h \ + src/nm-manager.c \ + src/nm-manager.h \ + src/nm-multi-index.c \ + src/nm-multi-index.h \ + src/nm-policy.c \ + src/nm-policy.h \ + src/nm-rfkill-manager.c \ + src/nm-rfkill-manager.h \ + src/nm-session-monitor.h \ + src/nm-session-monitor.c \ + src/nm-sleep-monitor.h \ + src/nm-types.h \ + src/nm-core-utils.c \ + src/nm-core-utils.h \ + src/NetworkManagerUtils.c \ + src/NetworkManagerUtils.h + + +if SUSPEND_RESUME_UPOWER +src_libNetworkManager_la_SOURCES += src/nm-sleep-monitor-upower.c +else +# systemd/consolekit suspend/resume used whenever upower is not enabled +src_libNetworkManager_la_SOURCES += src/nm-sleep-monitor-systemd.c +endif + +if WITH_WEXT +src_libNetworkManager_la_SOURCES += \ + src/platform/wifi/wifi-utils-wext.c \ + src/platform/wifi/wifi-utils-wext.h +endif + + +GLIB_GENERATED += src/nm-enum-types.h src/nm-enum-types.c +nm_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include <nm-core-enum-types.h>\n' +nm_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM +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 \ + , $(src_libNetworkManager_la_SOURCES)) + +src_common_cppflags += \ + $(GLIB_CFLAGS) \ + $(GUDEV_CFLAGS) \ + $(LIBNL_CFLAGS) \ + $(LIBNDP_CFLAGS) \ + $(LIBSOUP_CFLAGS) \ + $(SELINUX_CFLAGS) \ + $(LIBAUDIT_CFLAGS) \ + $(SYSTEMD_LOGIN_CFLAGS) \ + $(SYSTEMD_JOURNAL_CFLAGS) \ + $(SYSTEMD_NM_CFLAGS_PATHS) \ + $(CODE_COVERAGE_CFLAGS) \ + \ + -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)\" \ + \ + $(NULL) + +src_libNetworkManager_la_LIBADD = \ + $(top_builddir)/libnm-core/libnm-core.la \ + $(top_builddir)/introspection/libnmdbus.la \ + src/libsystemd-nm.la \ + $(GLIB_LIBS) \ + $(GUDEV_LIBS) \ + $(LIBNL_LIBS) \ + $(SYSTEMD_LOGIN_LIBS) \ + $(SYSTEMD_JOURNAL_LIBS) \ + $(LIBNDP_LIBS) \ + $(LIBDL) \ + $(LIBM) \ + $(SELINUX_LIBS) \ + $(LIBAUDIT_LIBS) + +if WITH_LIBSOUP +src_libNetworkManager_la_LIBADD += $(LIBSOUP_LIBS) +endif + +src_NetworkManager_LDFLAGS = \ + -rdynamic \ + -Wl,--version-script="$(srcdir)/src/NetworkManager.ver" + +###################### + +src_libnm_iface_helper_la_SOURCES = \ + src/dhcp-manager/nm-dhcp-client.c \ + src/dhcp-manager/nm-dhcp-client.h \ + src/dhcp-manager/nm-dhcp-client-logging.h \ + src/dhcp-manager/nm-dhcp-utils.c \ + src/dhcp-manager/nm-dhcp-utils.h \ + src/dhcp-manager/nm-dhcp-manager.c \ + src/dhcp-manager/nm-dhcp-manager.h \ + \ + src/platform/nmp-netns.c \ + src/platform/nmp-netns.h \ + src/platform/nmp-object.c \ + src/platform/nmp-object.h \ + src/platform/nm-platform-utils.c \ + src/platform/nm-platform-utils.h \ + src/platform/nm-platform.c \ + src/platform/nm-platform.h \ + src/platform/nm-linux-platform.c \ + src/platform/nm-linux-platform.h \ + src/platform/wifi/wifi-utils-nl80211.c \ + src/platform/wifi/wifi-utils-nl80211.h \ + src/platform/wifi/wifi-utils-private.h \ + src/platform/wifi/wifi-utils.c \ + src/platform/wifi/wifi-utils.h \ + \ + src/rdisc/nm-fake-rdisc.c \ + src/rdisc/nm-fake-rdisc.h \ + src/rdisc/nm-lndp-rdisc.c \ + src/rdisc/nm-lndp-rdisc.h \ + src/rdisc/nm-rdisc.c \ + src/rdisc/nm-rdisc.h \ + \ + src/nm-route-manager.c \ + src/nm-route-manager.h \ + \ + src/nm-exported-object.c \ + src/nm-exported-object.h \ + src/nm-ip4-config.c \ + src/nm-ip4-config.h \ + src/nm-ip6-config.c \ + src/nm-ip6-config.h \ + \ + src/nm-enum-types.c \ + src/nm-enum-types.h \ + src/nm-logging.c \ + src/nm-logging.h \ + src/nm-multi-index.c \ + src/nm-multi-index.h \ + src/nm-core-utils.c \ + src/nm-core-utils.h \ + src/NetworkManagerUtils.c \ + src/NetworkManagerUtils.h + +if WITH_WEXT +src_libnm_iface_helper_la_SOURCES += \ + src/platform/wifi/wifi-utils-wext.c \ + src/platform/wifi/wifi-utils-wext.h +endif + +src_libnm_iface_helper_la_LIBADD = \ + $(top_builddir)/libnm-core/libnm-core.la \ + $(top_builddir)/introspection/libnmdbus.la \ + src/libsystemd-nm.la \ + $(GLIB_LIBS) \ + $(GUDEV_LIBS) \ + $(LIBNL_LIBS) \ + $(LIBNDP_LIBS) \ + $(LIBDL) \ + $(LIBM) + +libexec_PROGRAMS += src/nm-iface-helper + +src_nm_iface_helper_SOURCES = \ + src/dhcp-manager/nm-dhcp-systemd.h \ + src/dhcp-manager/nm-dhcp-systemd.c \ + src/nm-iface-helper.c \ + src/main-utils.c \ + src/main-utils.h + +src_nm_iface_helper_LDADD = \ + $(top_builddir)/libnm-core/libnm-core.la \ + src/libsystemd-nm.la \ + src/libnm-iface-helper.la \ + $(GLIB_LIBS) \ + $(GUDEV_LIBS) \ + $(SYSTEMD_JOURNAL_LIBS) \ + $(LIBNL_LIBS) \ + $(LIBNDP_LIBS) \ + $(LIBM) + +src_nm_iface_helper_LDFLAGS = -rdynamic + +src_nm_iface_helper_CPPFLAGS = $(src_common_cppflags) + +###################### + +dbusservice_DATA += src/org.freedesktop.NetworkManager.conf + +EXTRA_DIST += \ + $(dbusservice_DATA) \ + $(NetworkManager_DATA) \ + src/NetworkManager.ver + +INSTALL_DATA_HOOKS += install-data-hook-src + +install-data-hook-src: + $(mkinstalldirs) -m 0755 $(DESTDIR)$(rundir) + $(mkinstalldirs) -m 0700 $(DESTDIR)$(statedir) + $(mkinstalldirs) -m 0755 $(DESTDIR)$(pkglibdir) diff --git a/tools/Makefile.am b/tools/Makefile.am deleted file mode 100644 index 91ada71a0e..0000000000 --- a/tools/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -EXTRA_DIST = \ - check-exports.sh \ - debug-helper.py \ - run-test-valgrind.sh \ - run-test-dbus-session.sh \ - test-networkmanager-service.py \ - test-sudo-wrapper.sh diff --git a/tools/Makemodule.am b/tools/Makemodule.am new file mode 100644 index 0000000000..9f58d6ab1d --- /dev/null +++ b/tools/Makemodule.am @@ -0,0 +1,7 @@ +EXTRA_DIST += \ + tools/check-exports.sh \ + tools/debug-helper.py \ + tools/run-test-valgrind.sh \ + tools/run-test-dbus-session.sh \ + tools/test-networkmanager-service.py \ + tools/test-sudo-wrapper.sh diff --git a/vapi/Makefile.am b/vapi/Makefile.am deleted file mode 100644 index 4913d1a580..0000000000 --- a/vapi/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -EXTRA_DIST = \ - NetworkManager-1.0.metadata \ - NMClient-1.0.metadata \ - libnm-util.deps \ - libnm-glib.deps - -if WITH_LEGACY_LIBRARIES -VAPIGEN_VAPIS = libnm-util.vapi libnm-glib.vapi -endif - -if ENABLE_VAPIGEN -include Makefile.vapigen - -libnm-util.vapi: $(top_builddir)/libnm-util/NetworkManager-1.0.gir libnm-util.deps NetworkManager-1.0.metadata -libnm-glib.vapi: $(top_builddir)/libnm-glib/NMClient-1.0.gir libnm-glib.deps NMClient-1.0.metadata libnm-util.vapi - - -libnm_util_vapi_METADATADIRS = $(srcdir) -libnm_util_vapi_FILES = $(top_builddir)/libnm-util/NetworkManager-1.0.gir - -libnm_glib_vapi_METADATADIRS = $(srcdir) -libnm_glib_vapi_FILES = $(top_builddir)/libnm-glib/NMClient-1.0.gir -libnm_glib_vapi_VAPIDIRS = $(builddir) -libnm_glib_vapi_GIRDIRS = $(top_builddir)/libnm-util -libnm_glib_vapi_DEPS = gio-2.0 - -vapidir = $(datadir)/vala/vapi -vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps) - -endif - -CLEANFILES = $(VAPIGEN_VAPIS) diff --git a/vapi/Makemodule.am b/vapi/Makemodule.am new file mode 100644 index 0000000000..adcf2c2ebc --- /dev/null +++ b/vapi/Makemodule.am @@ -0,0 +1,27 @@ +EXTRA_DIST += \ + vapi/NetworkManager-1.0.metadata \ + vapi/NMClient-1.0.metadata \ + vapi/libnm-util.deps \ + vapi/libnm-glib.deps + +if WITH_LEGACY_LIBRARIES +VAPIGEN_VAPIS += vapi/libnm-util.vapi vapi/libnm-glib.vapi +endif + +if ENABLE_VAPIGEN + +vapi/libnm-util.vapi: $(top_builddir)/libnm-util/NetworkManager-1.0.gir vapi/libnm-util.deps vapi/NetworkManager-1.0.metadata +vapi/libnm-glib.vapi: $(top_builddir)/libnm-glib/NMClient-1.0.gir vapi/libnm-glib.deps vapi/NMClient-1.0.metadata vapi/libnm-util.vapi + +vapi_libnm_util_vapi_METADATADIRS = $(srcdir)/vapi +vapi_libnm_util_vapi_FILES = $(top_builddir)/libnm-util/NetworkManager-1.0.gir + +vapi_libnm_glib_vapi_METADATADIRS = $(srcdir)/vapi +vapi_libnm_glib_vapi_FILES = $(top_builddir)/libnm-glib/NMClient-1.0.gir +vapi_libnm_glib_vapi_VAPIDIRS = $(builddir)/vapi +vapi_libnm_glib_vapi_GIRDIRS = $(top_builddir)/libnm-util +vapi_libnm_glib_vapi_DEPS = gio-2.0 + +vapi_DATA += $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps) + +endif |