system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-03 08:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Thomas Haller 2016-10-18 14:01:56 +02:00
parent 2238ccb48b
commit 586e830e05
5 changed files with 201 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

202
Makefile.am
View File

@ -13,6 +13,7 @@ AUTOMAKE_OPTIONS = subdir-objects
noinst_LTLIBRARIES =
check_LTLIBRARIES =
noinst_PROGRAMS =
noinst_LIBRARIES =
check_PROGRAMS =
noinst_DATA =
sbin_PROGRAMS =
@ -25,6 +26,7 @@ DISTCLEANFILES =
EXTRA_DIST =
dist_hook =
install_data_hook =
install_exec_hook =
uninstall_hook =
TESTS =
BUILT_SOURCES =
@ -61,7 +63,6 @@ completiondir = $(datadir)/bash-completion/completions
SUBDIRS = \
. \
clients \
data \
po \
man \
@ -3191,6 +3192,203 @@ EXTRA_DIST += \
clients/cli/nmcli-completion \
clients/cli/settings-docs.xsl
###############################################################################
# clients/tui
###############################################################################
if BUILD_NMTUI
noinst_LIBRARIES += clients/tui/newt/libnmt-newt.a
clients_tui_newt_libnmt_newt_a_SOURCES = \
clients/tui/newt/nmt-newt.h \
clients/tui/newt/nmt-newt-types.h \
clients/tui/newt/nmt-newt-button.c \
clients/tui/newt/nmt-newt-button.h \
clients/tui/newt/nmt-newt-button-box.c \
clients/tui/newt/nmt-newt-button-box.h \
clients/tui/newt/nmt-newt-checkbox.c \
clients/tui/newt/nmt-newt-checkbox.h \
clients/tui/newt/nmt-newt-component.c \
clients/tui/newt/nmt-newt-component.h \
clients/tui/newt/nmt-newt-container.c \
clients/tui/newt/nmt-newt-container.h \
clients/tui/newt/nmt-newt-entry.c \
clients/tui/newt/nmt-newt-entry.h \
clients/tui/newt/nmt-newt-entry-numeric.c \
clients/tui/newt/nmt-newt-entry-numeric.h \
clients/tui/newt/nmt-newt-form.c \
clients/tui/newt/nmt-newt-form.h \
clients/tui/newt/nmt-newt-grid.c \
clients/tui/newt/nmt-newt-grid.h \
clients/tui/newt/nmt-newt-hacks.c \
clients/tui/newt/nmt-newt-hacks.h \
clients/tui/newt/nmt-newt-label.c \
clients/tui/newt/nmt-newt-label.h \
clients/tui/newt/nmt-newt-listbox.c \
clients/tui/newt/nmt-newt-listbox.h \
clients/tui/newt/nmt-newt-popup.c \
clients/tui/newt/nmt-newt-popup.h \
clients/tui/newt/nmt-newt-section.c \
clients/tui/newt/nmt-newt-section.h \
clients/tui/newt/nmt-newt-separator.c \
clients/tui/newt/nmt-newt-separator.h \
clients/tui/newt/nmt-newt-stack.c \
clients/tui/newt/nmt-newt-stack.h \
clients/tui/newt/nmt-newt-textbox.c \
clients/tui/newt/nmt-newt-textbox.h \
clients/tui/newt/nmt-newt-toggle-button.c \
clients/tui/newt/nmt-newt-toggle-button.h \
clients/tui/newt/nmt-newt-utils.c \
clients/tui/newt/nmt-newt-utils.h \
clients/tui/newt/nmt-newt-widget.c \
clients/tui/newt/nmt-newt-widget.h \
$(NULL)
clients_tui_newt_libnmt_newt_a_CPPFLAGS = \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-DG_LOG_DOMAIN=\""nmtui"\" \
$(GLIB_CFLAGS) \
$(NEWT_CFLAGS) \
$(NULL)
bin_PROGRAMS += clients/tui/nmtui
clients_tui_nmtui_SOURCES = \
clients/tui/nmtui.c \
clients/tui/nmtui.h \
clients/tui/nmtui-connect.c \
clients/tui/nmtui-connect.h \
clients/tui/nmtui-edit.c \
clients/tui/nmtui-edit.h \
clients/tui/nmtui-hostname.c \
clients/tui/nmtui-hostname.h \
\
clients/tui/nm-editor-bindings.c \
clients/tui/nm-editor-bindings.h \
clients/tui/nm-editor-utils.c \
clients/tui/nm-editor-utils.h \
\
clients/tui/nmt-address-list.c \
clients/tui/nmt-address-list.h \
clients/tui/nmt-connect-connection-list.c \
clients/tui/nmt-connect-connection-list.h \
clients/tui/nmt-device-entry.c \
clients/tui/nmt-device-entry.h \
clients/tui/nmt-edit-connection-list.c \
clients/tui/nmt-edit-connection-list.h \
clients/tui/nmt-editor-grid.c \
clients/tui/nmt-editor-grid.h \
clients/tui/nmt-editor-page.c \
clients/tui/nmt-editor-page.h \
clients/tui/nmt-editor-page-device.c \
clients/tui/nmt-editor-page-device.h \
clients/tui/nmt-editor-section.c \
clients/tui/nmt-editor-section.h \
clients/tui/nmt-editor.c \
clients/tui/nmt-editor.h \
clients/tui/nmt-ip-entry.c \
clients/tui/nmt-ip-entry.h \
clients/tui/nmt-mac-entry.c \
clients/tui/nmt-mac-entry.h \
clients/tui/nmt-mtu-entry.c \
clients/tui/nmt-mtu-entry.h \
clients/tui/nmt-page-bond.c \
clients/tui/nmt-page-bond.h \
clients/tui/nmt-page-bridge.c \
clients/tui/nmt-page-bridge.h \
clients/tui/nmt-page-bridge-port.c \
clients/tui/nmt-page-bridge-port.h \
clients/tui/nmt-page-dsl.c \
clients/tui/nmt-page-dsl.h \
clients/tui/nmt-page-ethernet.c \
clients/tui/nmt-page-ethernet.h \
clients/tui/nmt-page-infiniband.c \
clients/tui/nmt-page-infiniband.h \
clients/tui/nmt-page-ip4.c \
clients/tui/nmt-page-ip4.h \
clients/tui/nmt-page-ip6.c \
clients/tui/nmt-page-ip6.h \
clients/tui/nmt-page-ppp.c \
clients/tui/nmt-page-ppp.h \
clients/tui/nmt-page-team.c \
clients/tui/nmt-page-team.h \
clients/tui/nmt-page-team-port.c \
clients/tui/nmt-page-team-port.h \
clients/tui/nmt-page-vlan.c \
clients/tui/nmt-page-vlan.h \
clients/tui/nmt-page-wifi.c \
clients/tui/nmt-page-wifi.h \
clients/tui/nmt-password-dialog.c \
clients/tui/nmt-password-dialog.h \
clients/tui/nmt-password-fields.c \
clients/tui/nmt-password-fields.h \
clients/tui/nmt-route-editor.c \
clients/tui/nmt-route-editor.h \
clients/tui/nmt-route-entry.c \
clients/tui/nmt-route-entry.h \
clients/tui/nmt-route-table.c \
clients/tui/nmt-route-table.h \
clients/tui/nmt-slave-list.c \
clients/tui/nmt-slave-list.h \
clients/tui/nmt-utils.c \
clients/tui/nmt-utils.h \
clients/tui/nmt-widget-list.c \
clients/tui/nmt-widget-list.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_tui_nmtui_CPPFLAGS = \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(top_srcdir)/libnm \
-I$(top_builddir)/libnm \
-I$(srcdir)/clients/tui/newt \
-I$(top_srcdir)/clients/common \
$(GLIB_CFLAGS) \
$(NEWT_CFLAGS) \
$(GUDEV_CFLAGS) \
-DG_LOG_DOMAIN=\""nmtui"\" \
-DLOCALEDIR=\""$(localedir)"\" \
$(NULL)
clients_tui_nmtui_LDFLAGS = \
-Wl,--version-script="$(top_srcdir)/linker-script-binary.ver"
clients_tui_nmtui_LDADD = \
libnm/libnm.la \
clients/tui/newt/libnmt-newt.a \
$(GUDEV_LIBS) \
$(NEWT_LIBS) \
$(GLIB_LIBS) \
$(NULL)
nmtui_links = nmtui-edit nmtui-connect nmtui-hostname
install-exec-hook-nmtui:
for link in $(nmtui_links); do \
$(LN_S) -f nmtui "$(DESTDIR)$(bindir)/$$link"; \
done
install_exec_hook += install-exec-hook-nmtui
uninstall-hook-nmtui:
for link in $(nmtui_links); do \
rm -f "$(DESTDIR)$(bindir)/$$link"; \
done
uninstall_hook += uninstall-hook-nmtui
endif
###############################################################################
girdir = $(datadir)/gir-1.0
@ -3282,6 +3480,8 @@ dist-hook: $(dist_hook)
###############################################################################
install-exec-hook: $(install_exec_hook)
install-data-hook: $(install_data_hook)
$(mkinstalldirs) -m 0755 $(DESTDIR)$(rundir)
$(mkinstalldirs) -m 0700 $(DESTDIR)$(statedir)

1
clients/Makefile.am
View File

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

133
clients/tui/Makefile.am
View File

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

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

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

3
configure.ac
View File

@ -1142,9 +1142,6 @@ libnm-glib/libnm-glib.pc
libnm-glib/libnm-glib-vpn.pc
libnm-glib/Makefile
libnm-glib/tests/Makefile
clients/Makefile
clients/tui/Makefile
clients/tui/newt/Makefile
man/Makefile
man/common.ent
po/Makefile.in