system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-09 04:05:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: build intermediate library libnmc.la for nmcli

Browse Source 
Used for unit testing in the next commit.

Also add libnmc-base.la, which contains common files for nmcli and
nmtui.
This commit is contained in:
Thomas Haller 2017-04-04 10:31:07 +02:00
parent 137273669d
commit d9462879ac
1 changed files with 86 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
Makefile.am
View File

@ -28,6 +28,7 @@ examples_DATA =
CLEANFILES =
DISTCLEANFILES =
EXTRA_DIST =
EXTRA_LTLIBRARIES =
dist_hook =
dist_dependencies =
dist_configure_check =
@ -3111,15 +3112,62 @@ clients_nm_online_LDADD = \
$(clients_nm_online_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
###############################################################################
# clients/cli
# clients/common
###############################################################################
if BUILD_NMCLI
clients_cppflags = \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/libnm-core \
-I$(builddir)/libnm-core \
-I$(srcdir)/libnm \
-I$(builddir)/libnm \
-I$(srcdir)/clients/common \
-I$(builddir)/clients/common \
$(GLIB_CFLAGS) \
-DNMLOCALEDIR=\"$(datadir)/locale\"
bin_PROGRAMS += clients/cli/nmcli
check_ltlibraries += clients/common/libnmc-base.la
clients_cli_nmcli_SOURCES = \
\
clients_common_libnmc_base_la_SOURCES = \
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
clients_common_libnmc_base_la_CPPFLAGS = \
$(clients_cppflags) \
-DG_LOG_DOMAIN=\""libnmc"\"
clients_common_libnmc_base_la_LIBADD = \
libnm/libnm.la \
$(GLIB_LIBS)
$(clients_common_libnmc_base_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
clients_common_settings_doc_c = clients/common/settings-docs.c
if HAVE_INTROSPECTION
$(clients_common_settings_doc_c): clients/common/settings-docs.xsl libnm/nm-property-docs.xml
$(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^)
$(clients_common_settings_doc_c): clients/common/.dirstamp
DISTCLEANFILES += $(clients_common_settings_doc_c)
else
$(clients_common_settings_doc_c):
@echo "to generate $(clients_common_settings_doc_c), configure with --enable-introspection"
@echo "alternatively, build --without-nmcli"
@false
endif
EXTRA_DIST += $(clients_common_settings_doc_c)
if HAVE_INTROSPECTION
check_ltlibraries += clients/common/libnmc.la
else
EXTRA_LTLIBRARIES += clients/common/libnmc.la
endif
clients_common_libnmc_la_SOURCES = \
shared/nm-utils/nm-enum-utils.c \
shared/nm-utils/nm-enum-utils.h \
shared/nm-utils/nm-shared-utils.c \
@ -3134,7 +3182,30 @@ clients_cli_nmcli_SOURCES = \
clients/common/nm-meta-setting-desc.h \
clients/common/nm-meta-setting-access.c \
clients/common/nm-meta-setting-access.h \
\
$(NULL)
clients_common_libnmc_la_CPPFLAGS = \
$(clients_cppflags) \
-DG_LOG_DOMAIN=\""libnmc"\"
clients_common_libnmc_la_LIBADD = \
libnm/libnm.la \
clients/common/libnmc-base.la \
$(GLIB_LIBS)
$(clients_common_libnmc_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(clients_common_libnmc_la_OBJECTS): $(clients_common_settings_doc_c)
$(clients_common_libnmc_la_OBJECTS): clients/common/.dirstamp
###############################################################################
# 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 \
@ -3153,31 +3224,20 @@ clients_cli_nmcli_SOURCES = \
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$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/libnm-core \
-I$(builddir)/libnm-core \
-I$(srcdir)/libnm \
-I$(builddir)/libnm \
-I$(srcdir)/clients/cli \
-I$(srcdir)/clients/common \
-I$(builddir)/clients/common \
$(GLIB_CFLAGS) \
$(clients_cppflags) \
-DG_LOG_DOMAIN=\""nmcli"\" \
-DNMCLI_LOCALEDIR=\"$(datadir)/locale\"
clients_cli_nmcli_LDADD = \
libnm/libnm.la \
clients/common/libnmc-base.la \
clients/common/libnmc.la \
$(GLIB_LIBS) \
$(READLINE_LIBS) \
libnm/libnm.la
$(READLINE_LIBS)
if WITH_POLKIT_AGENT
clients_cli_nmcli_CPPFLAGS += $(POLKIT_CFLAGS)
@ -3190,8 +3250,7 @@ endif
clients_cli_nmcli_LDFLAGS = \
-Wl,--version-script="$(srcdir)/linker-script-binary.ver"
$(clients_cli_nmcli_OBJECTS): $(clients_common_settings_doc_c)
$(clients_cli_nmcli_OBJECTS): clients/cli/.dirstamp
$(clients_cli_nmcli_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
install-data-hook-nmcli:
$(mkinstalldirs) $(DESTDIR)$(completiondir)
@ -3206,22 +3265,6 @@ uninstall_hook += uninstall-hook-nmcli
endif
clients_common_settings_doc_c = clients/common/settings-docs.c
if HAVE_INTROSPECTION
$(clients_common_settings_doc_c): clients/common/settings-docs.xsl libnm/nm-property-docs.xml
$(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^)
$(clients_common_settings_doc_c): clients/common/.dirstamp
DISTCLEANFILES += $(clients_common_settings_doc_c)
else
$(clients_common_settings_doc_c):
@echo "to generate $(clients_common_settings_doc_c), configure with --enable-introspection"
@echo "alternatively, build --without-nmcli"
@false
endif
EXTRA_DIST += $(clients_common_settings_doc_c)
EXTRA_DIST += \
clients/cli/nmcli-completion \
clients/common/settings-docs.xsl
@ -3374,26 +3417,14 @@ clients_tui_nmtui_SOURCES = \
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$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/libnm-core \
-I$(builddir)/libnm-core \
-I$(srcdir)/libnm \
-I$(builddir)/libnm \
-I$(srcdir)/clients/tui/newt \
-I$(srcdir)/clients/common \
$(GLIB_CFLAGS) \
$(clients_cppflags) \
$(NEWT_CFLAGS) \
-DG_LOG_DOMAIN=\""nmtui"\" \
-DLOCALEDIR=\""$(localedir)"\" \
$(NULL)
-DLOCALEDIR=\""$(localedir)"\"
clients_tui_nmtui_LDFLAGS = \
-Wl,--version-script="$(srcdir)/linker-script-binary.ver"
@ -3401,6 +3432,7 @@ clients_tui_nmtui_LDFLAGS = \
clients_tui_nmtui_LDADD = \
libnm/libnm.la \
clients/tui/newt/libnmt-newt.a \
clients/common/libnmc-base.la \
$(GLIB_LIBS) \
$(NEWT_LIBS) \
$(NULL)