system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-06 01:28:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: merge "clients/cli/Makefile.am" into toplevel Makefile

Browse Source
This commit is contained in:
Thomas Haller 2016-10-18 14:01:56 +02:00
parent f63a5a2a0d
commit c8a25001f4
4 changed files with 98 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
Makefile.am
View File

@ -25,6 +25,7 @@ DISTCLEANFILES =
EXTRA_DIST =
dist_hook =
install_data_hook =
uninstall_hook =
TESTS =
BUILT_SOURCES =
GLIB_GENERATED =
@ -56,6 +57,8 @@ statedir=$(localstatedir)/lib/NetworkManager
dbusactivationdir = $(datadir)/dbus-1/system-services
completiondir = $(datadir)/bash-completion/completions
SUBDIRS = \
. \
clients \
@ -3096,6 +3099,98 @@ clients_nm_online_LDADD = \
libnm/libnm.la \
$(GLIB_LIBS)
###############################################################################
# clients/cli
###############################################################################
if BUILD_NMCLI
bin_PROGRAMS += clients/cli/nmcli
clients_cli_nmcli_SOURCES = \
clients/cli/agent.c \
clients/cli/agent.h \
clients/cli/common.c \
clients/cli/common.h \
clients/cli/connections.c \
clients/cli/connections.h \
clients/cli/devices.c \
clients/cli/devices.h \
clients/cli/general.c \
clients/cli/general.h \
clients/cli/settings.c \
clients/cli/settings.h \
clients/cli/nmcli.c \
clients/cli/nmcli.h \
clients/cli/utils.c \
clients/cli/utils.h \
clients/cli/polkit-agent.c \
clients/cli/polkit-agent.h \
\
clients/common/nm-secret-agent-simple.c \
clients/common/nm-secret-agent-simple.h \
clients/common/nm-vpn-helpers.c \
clients/common/nm-vpn-helpers.h \
$(NULL)
clients_cli_nmcli_CPPFLAGS = \
-I${top_srcdir} \
-I${top_builddir} \
-I${top_srcdir}/shared \
-I$(top_builddir)/shared \
-I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm \
-I${top_builddir}/libnm \
-I${top_srcdir}/clients/common \
$(GLIB_CFLAGS) \
-DG_LOG_DOMAIN=\""nmcli"\" \
-DNMCLI_LOCALEDIR=\"$(datadir)/locale\"
clients_cli_nmcli_LDADD = \
$(GLIB_LIBS) \
$(READLINE_LIBS) \
libnm/libnm.la
if WITH_POLKIT_AGENT
clients_cli_nmcli_CPPFLAGS += $(POLKIT_CFLAGS)
clients_cli_nmcli_SOURCES += \
clients/common/nm-polkit-listener.c \
clients/common/nm-polkit-listener.h
clients_cli_nmcli_LDADD += $(POLKIT_LIBS)
endif
clients_cli_nmcli_LDFLAGS = \
-Wl,--version-script="$(top_srcdir)/linker-script-binary.ver"
install-data-hook-nmcli:
$(mkinstalldirs) $(DESTDIR)$(completiondir)
$(INSTALL_DATA) $(srcdir)/clients/cli/nmcli-completion $(DESTDIR)$(completiondir)/nmcli
install_data_hook += install-data-hook-nmcli
uninstall-hook-nmcli:
rm -f $(DESTDIR)$(completiondir)/nmcli
uninstall_hook += uninstall-hook-nmcli
endif
if BUILD_SETTING_DOCS
clients/cli/settings-docs.c: clients/cli/settings-docs.xsl libnm/nm-property-docs.xml
$(AM_V_GEN) xsltproc --output $@ $^
BUILT_SOURCES += clients/cli/settings-docs.c
EXTRA_DIST += clients/cli/settings-docs.c
endif
EXTRA_DIST += \
clients/cli/nmcli-completion \
clients/cli/settings-docs.xsl
###############################################################################
girdir = $(datadir)/gir-1.0
@ -3192,6 +3287,8 @@ install-data-hook: $(install_data_hook)
$(mkinstalldirs) -m 0700 $(DESTDIR)$(statedir)
$(mkinstalldirs) -m 0755 $(DESTDIR)$(pkglibdir)
uninstall-hook: $(uninstall_hook)
###############################################################################
cscope:

2
clients/Makefile.am
View File

@ -1 +1 @@
SUBDIRS = cli tui
SUBDIRS = tui

81
clients/cli/Makefile.am
View File

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

1
configure.ac
View File

@ -1143,7 +1143,6 @@ libnm-glib/libnm-glib-vpn.pc
libnm-glib/Makefile
libnm-glib/tests/Makefile
clients/Makefile
clients/cli/Makefile
clients/tui/Makefile
clients/tui/newt/Makefile
man/Makefile