Commit 3d25d704 authored by Dan Winship's avatar Dan Winship

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/.
parent 25dac576
......@@ -166,7 +166,6 @@ valgrind-*.log
/system-settings/src
/test/libnm-glib-test
/test/libnm_glib_test
/test/nm-online
/test/nmtestdevices
/libnm-util/nm-version.h
/libnm-util/nm-setting-docs.xml
......@@ -219,10 +218,10 @@ valgrind-*.log
/data/org.freedesktop.NetworkManager.service
/data/server.conf
/cli/src/nmcli
/cli/src/settings-docs.c
/tui/newt/libnmt-newt.a
/tui/nmtui
clients/cli/nmcli
clients/cli/settings-docs.c
clients/tui/newt/libnmt-newt.a
clients/tui/nmtui
clients/nm-online
/vapi/*.vapi
......@@ -8,8 +8,7 @@ SUBDIRS = \
introspection \
src \
callouts \
cli \
tui \
clients \
tools \
policy \
data \
......
SUBDIRS = src completion
completiondir = $(datadir)/bash-completion/completions
dist_completion_DATA = nmcli
SUBDIRS = cli tui
AM_CPPFLAGS = \
-I${top_srcdir} \
-I${top_srcdir}/libnm-util \
-I${top_builddir}/libnm-util \
-I${top_srcdir}/libnm-glib \
-I${top_builddir}/libnm-glib \
-I${top_srcdir}/include \
$(DBUS_CFLAGS) \
$(GLIB_CFLAGS) \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
-DNMLOCALEDIR=\"$(datadir)/locale\"
bin_PROGRAMS = nm-online
nm_online_SOURCES = nm-online.c
nm_online_CPPFLAGS = \
-DG_LOG_DOMAIN=\""nm-online"\" \
$(AM_CPPFLAGS)
nm_online_LDADD = \
$(top_builddir)/libnm-glib/libnm-glib.la \
$(top_builddir)/libnm-util/libnm-util.la \
$(DBUS_LIBS) \
$(GLIB_LIBS)
......@@ -47,3 +47,14 @@ endif
DISTCLEANFILES = settings-docs.c
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
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment