fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-03 16:20:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
NetworkManager/clients/cli/Makefile.am

78 lines
1.6 KiB
Text
Raw Normal View History

build/nmcli: make nmcli build optional https://mail.gnome.org/archives/networkmanager-list/2015-November/msg00043.html https://mail.gnome.org/archives/networkmanager-list/2015-November/msg00063.html
2015-11-19 00:02:16 +00:00
if BUILD_NMCLI
cli: add initial pieces of nmcli
2010-02-25 09:52:30 -08:00
bin_PROGRAMS = \
nmcli
build: switch from $(INCLUDES) to $(AM_CPPFLAGS) to make automake happy Unfortunately, $(AM_CPPFLAGS) gets overridden by per-target _CPPFLAGS variables, which $(INCLUDES) did not, so this requires some additional changes. In most places, I have just gotten rid of the per-target _CPPFLAGS variables; in directories with a single target, the per-target variable is unnecessary, and in directories with multiple targets, the per-target variable is often undesirable, since it forces some files to be compiled twice, even though there ends up being no difference between the two files.
2013-08-22 10:47:21 -04:00
AM_CPPFLAGS = \
cli: add initial pieces of nmcli
2010-02-25 09:52:30 -08:00
-I${top_srcdir} \
cli: generate setting docs from libnm-util/nm-setting-docs.xml nmcli used the GParamSpec doc strings to get property descriptions, but they will be going away. Generate a .c file from the new XML setting docs file, and link that into nmcli.
2014-05-30 16:45:02 -04:00
-I${top_builddir} \
cli: add initial pieces of nmcli
2010-02-25 09:52:30 -08:00
-I${top_srcdir}/include \
build: extract version macros from "nm-version.h" to new header file "nm-version-macros.h" For libnm library, "nm-dbus-interface.h" contains defines like the D-Bus paths of NetworkManager. It is desirable to have this header usable without having a dependency on "glib.h", for example for a QT application. For that, commit c0852964a890cf43cc2dcaeff41ac6edc5028f24 removed that dependancy. For libnm-glib library, the analog to "nm-dbus-interface.h" is "NetworkManager.h", and the same applies there. Commit 159e827a72f420048e12d318f8ba1edd3f641fc8 removed that include. However, that broke build on PackageKit [1] which expected to get the version macros by including "NetworkManager.h". So at least for libnm-glib, we need to preserve old behavior so that a user including "NetworkManager.h" gets the version macros, but not "glib.h". Extract the version macros to a new header file "nm-version-macros.h". This header doesn't include "glib.h" and can be included from "NetworkManager.h". This gives as previous behavior and a glib-free include. For libnm we still don't include "nm-version-macros.h" to "nm-dbus-interface.h". Very few users will actually need the version macros, but not using libnm. Users that use libnm, should just include (libnm's) "NetworkManager.h" to get all headers. As a special case, a user who doesn't want to use glib/libnm, but still needs both "nm-dbus-interface.h" and "nm-version-macros.h", can include them both separately. [1] https://github.com/hughsie/PackageKit/issues/85 Fixes: 4545a7fe9670ce4d7c259c11c2cc853bfae6729b
2015-09-25 16:07:50 +02:00
-I$(top_builddir)/include \
all: port everything to libnm Since the API has not changed at this point, this is mostly just a matter of updating Makefiles, and changing references to the library name in comments. NetworkManager cannot link to libnm due to the duplicated type/symbol names. So it links to libnm-core.la directly, which means that NetworkManager gets a separate copy of that code from libnm.so. Everything else links to libnm.
2014-05-19 13:44:02 -04:00
-I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm \
-I${top_builddir}/libnm \
cli: use secret agent for getting passwords from user --ask option has to be used, so that nmcli can be interactive.
2014-10-06 15:25:53 +02:00
-I${top_srcdir}/clients/common \
build: switch from $(INCLUDES) to $(AM_CPPFLAGS) to make automake happy Unfortunately, $(AM_CPPFLAGS) gets overridden by per-target _CPPFLAGS variables, which $(INCLUDES) did not, so this requires some additional changes. In most places, I have just gotten rid of the per-target _CPPFLAGS variables; in directories with a single target, the per-target variable is unnecessary, and in directories with multiple targets, the per-target variable is often undesirable, since it forces some files to be compiled twice, even though there ends up being no difference between the two files.
2013-08-22 10:47:21 -04:00
$(GLIB_CFLAGS) \
all: set G_LOG_DOMAIN appropriately, for better g_log() messages
2014-04-07 16:14:47 -04:00
-DG_LOG_DOMAIN=\""nmcli"\" \
libnm-util, libnm-glib: add versioned deprecation/availability macros Add versioned NM_DEPRECATED_IN_* and NM_AVAILABLE_IN_* macros, and tag new/deprecated functions accordingly. (All currently-deprecated functions are assumed to have been deprecated in 0.9.10.) Add NM_VERSION_MIN_REQUIRED and NM_VERSION_MAX_ALLOWED macros which can be set to determine which versions will cause warnings. With the current settings, external consumers of the libnm-util/libnm-glib APIs will have MIN_REQUIRED and MAX_ALLOWED both set to NM_VERSION_0_9_8 by default, meaning they will get warnings about functions added in 0.9.10. NM internally sets NM_VERSION_MAX_ALLOWED to NM_VERSION_NEXT_STABLE to ensure that it is always allowed to use all APIs.
2014-02-12 12:28:52 -05:00
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
build: switch from $(INCLUDES) to $(AM_CPPFLAGS) to make automake happy Unfortunately, $(AM_CPPFLAGS) gets overridden by per-target _CPPFLAGS variables, which $(INCLUDES) did not, so this requires some additional changes. In most places, I have just gotten rid of the per-target _CPPFLAGS variables; in directories with a single target, the per-target variable is unnecessary, and in directories with multiple targets, the per-target variable is often undesirable, since it forces some files to be compiled twice, even though there ends up being no difference between the two files.
2013-08-22 10:47:21 -04:00
-DNMCLI_LOCALEDIR=\"$(datadir)/locale\"
cli: add initial pieces of nmcli
2010-02-25 09:52:30 -08:00
nmcli_SOURCES = \
cli: add 'nmcli agent' command (bgo #739568) Synopsis: nmcli agent { secret | polkit | all } The command runs separate NetworkManager secret agent or session polkit agent, or both. It is useful when - no other secret agent is available (such as GUI nm-applet, gnome-shell, KDE applet) - no other polkit agent is available (such as polkit-gnome-authentication-agent-1, polkit-kde-authentication-agent-1 or lxpolkit) https://bugzilla.gnome.org/show_bug.cgi?id=739568
2014-10-30 15:45:43 +01:00
agent.c \
agent.h \
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
common.c \
common.h \
cli: add initial pieces of nmcli
2010-02-25 09:52:30 -08:00
connections.c \
connections.h \
devices.c \
devices.h \
cli: rename network-manager.[ch] to general.[ch]
2014-09-30 15:53:51 +02:00
general.c \
general.h \
cli: use own code to output connection details (settings) nmcli uses its own code to dump connections' details instead of libnm-util's nm_connection_dump(). It allows to structure output and present values of the settings according to nmcli needs.
2010-03-31 17:14:35 +02:00
settings.c \
settings.h \
cli: add initial pieces of nmcli
2010-02-25 09:52:30 -08:00
nmcli.c \
nmcli.h \
utils.c \
cli: use secret agent for getting passwords from user --ask option has to be used, so that nmcli can be interactive.
2014-10-06 15:25:53 +02:00
utils.h \
cli: add a polkit agent support for nmcli Example: nmcli --ask general hostname computer007
2014-10-30 11:25:55 +01:00
polkit-agent.c \
polkit-agent.h \
cli: use secret agent for getting passwords from user --ask option has to be used, so that nmcli can be interactive.
2014-10-06 15:25:53 +02:00
\
$(srcdir)/../common/nm-secret-agent-simple.c \
$(srcdir)/../common/nm-secret-agent-simple.h \
$(NULL)
cli: add initial pieces of nmcli
2010-02-25 09:52:30 -08:00
nmcli_LDADD = \
$(GLIB_LIBS) \
cli/build: make libreadline a build-time dependency (bgo #729846) and link nmcli against it. This simplifies code, makes sure that line editing capability is supported, and will allow using readline on other places too. https://bugzilla.gnome.org/show_bug.cgi?id=729846 https://bugzilla.redhat.com/show_bug.cgi?id=1007365
2014-05-13 15:50:38 +02:00
$(READLINE_LIBS) \
all: port everything to libnm Since the API has not changed at this point, this is mostly just a matter of updating Makefiles, and changing references to the library name in comments. NetworkManager cannot link to libnm due to the duplicated type/symbol names. So it links to libnm-core.la directly, which means that NetworkManager gets a separate copy of that code from libnm.so. Everything else links to libnm.
2014-05-19 13:44:02 -04:00
$(top_builddir)/libnm/libnm.la
cli: add initial pieces of nmcli
2010-02-25 09:52:30 -08:00
cli: add a polkit agent support for nmcli Example: nmcli --ask general hostname computer007
2014-10-30 11:25:55 +01:00
if WITH_POLKIT_AGENT
AM_CPPFLAGS += $(POLKIT_CFLAGS)
nmcli_SOURCES += $(srcdir)/../common/nm-polkit-listener.c $(srcdir)/../common/nm-polkit-listener.h
nmcli_LDADD += $(POLKIT_LIBS)
endif
build: fix nm-setting-docs build in various configurations Certain build configurations (like --enable-gtk-doc --disable-introspection) were broken with respect to nm-setting-docs. Fix this. Also, we don't require just gobject-introspection, we need pygobject specifically as well.
2014-06-27 12:25:54 -04:00
if BUILD_SETTING_DOCS
cli, libnm: don't use D-Bus-specific documentation in nmcli Now that nm-setting-docs.xml is more D-Bus-specific, it's less appropriate for nmcli's internal documentation. So generate a second copy of the docs without using the overrides file, and use that one for nmcli's documentation.
2014-11-16 17:07:56 -05:00
settings-docs.c: settings-docs.xsl $(top_builddir)/libnm/nm-property-docs.xml
cli: generate setting docs from libnm-util/nm-setting-docs.xml nmcli used the GParamSpec doc strings to get property descriptions, but they will be going away. Generate a .c file from the new XML setting docs file, and link that into nmcli.
2014-05-30 16:45:02 -04:00
$(AM_V_GEN) xsltproc --output $@ $^
cli: add initial pieces of nmcli
2010-02-25 09:52:30 -08:00
cli: generate setting docs from libnm-util/nm-setting-docs.xml nmcli used the GParamSpec doc strings to get property descriptions, but they will be going away. Generate a .c file from the new XML setting docs file, and link that into nmcli.
2014-05-30 16:45:02 -04:00
BUILT_SOURCES = settings-docs.c
docs: make the settings docs work from tarball builds docs/api/settings-spec.xml was accidentally not getting disted, because gtk-doc.make explicitly removes all DISTCLEANFILES from distdir. However, it doesn't actually make sense for the settings docs files to be in DISTCLEANFILES anyway; they were put there rather than CLEANFILES (IIRC) so that "make clean" in a tarball build wouldn't delete them and break things. But the right fix is to just make them only be in CLEANFILES when BUILD_SETTING_DOCS is true, and not ever get deleted otherwise. Also adjust the build rules to ensure that the generated docs don't get rebuilt in tarball builds, since that can cause problems when building from a read-only source tree, etc. Meanwhile, in an unrelated but also fatal bug, configure.ac's check for if the generated docs were already present never got updated for the cli/src -> clients/cli move, and so even if we had been disting settings-spec.xml, configure would still think that the tarball didn't have all of the generated docs in it, so SETTING_DOCS_AVAILABLE would be set false and none of the generated docs would get used. https://bugzilla.gnome.org/show_bug.cgi?id=740035
2014-11-12 15:50:39 -05:00
CLEANFILES = settings-docs.c
cli: generate setting docs from libnm-util/nm-setting-docs.xml nmcli used the GParamSpec doc strings to get property descriptions, but they will be going away. Generate a .c file from the new XML setting docs file, and link that into nmcli.
2014-05-30 16:45:02 -04:00
endif
EXTRA_DIST = settings-docs.c settings-docs.xsl
clients: reorganize source tree, put all the installed clients together Create a new clients/ subdirectory at the top level, and move cli/ and tui/ into it, as well as nm-online.c (which was previously in test/, which made no sense). cli/ was split into two subdirectories, src/ and completion/. While this does simplify things (given that the completion file and the binary both need to be named "nmcli"), it bloats the source tree, and we can work around it by just renaming the completion file at install time. Then we can combine the two directories into one and just have it all under clients/cli/.
2014-07-22 17:55:13 -04:00
completiondir = $(datadir)/bash-completion/completions
install-data-hook:
$(mkinstalldirs) $(DESTDIR)$(completiondir)
$(INSTALL_DATA) $(srcdir)/nmcli-completion $(DESTDIR)$(completiondir)/nmcli
uninstall-hook:
rm -f $(DESTDIR)$(completiondir)/nmcli
EXTRA_DIST += nmcli-completion
build/nmcli: make nmcli build optional https://mail.gnome.org/archives/networkmanager-list/2015-November/msg00043.html https://mail.gnome.org/archives/networkmanager-list/2015-November/msg00063.html
2015-11-19 00:02:16 +00:00
endif
Reference in a new issue Copy permalink