colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: merge "libnm-glib/Makefile.am" into toplevel Makefile

Browse Source
This commit is contained in:
Thomas Haller
2016-10-18 15:53:05 +02:00
parent 7c66a6be17
commit 8027e09be4
2 changed files with 240 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

247
Makefile.am
View File

@@ -68,6 +68,9 @@ servicedir = $(datadir)/dbus-1/system-services
completiondir = $(datadir)/bash-completion/completions completiondir = $(datadir)/bash-completion/completions
GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
SUBDIRS = \ SUBDIRS = \
. \ . \
po \ po \
@@ -427,8 +430,6 @@ GLIB_GENERATED += \
libnm-core/nm-core-enum-types.c libnm-core/nm-core-enum-types.c
nm_core_enum_types_sources = $(filter-out %nm-core-enum-types.h,$(libnm_core_libnm_core_headers)) nm_core_enum_types_sources = $(filter-out %nm-core-enum-types.h,$(libnm_core_libnm_core_headers))
nm_core_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM
nm_core_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM
libnm_core_libnm_core_la_CPPFLAGS = \ libnm_core_libnm_core_la_CPPFLAGS = \
-I${srcdir}/shared \ -I${srcdir}/shared \
@@ -500,8 +501,6 @@ GLIB_GENERATED += \
libnm-core/tests/nm-core-tests-enum-types.c libnm-core/tests/nm-core-tests-enum-types.c
nm_core_tests_enum_types_sources = libnm-core/tests/test-general-enums.h nm_core_tests_enum_types_sources = libnm-core/tests/test-general-enums.h
nm_core_tests_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM
nm_core_tests_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM
libnm_core_tests_cppflags = \ libnm_core_tests_cppflags = \
-I${srcdir}/shared \ -I${srcdir}/shared \
@@ -2371,8 +2370,6 @@ if WITH_MODEM_MANAGER_1
GLIB_GENERATED += \ GLIB_GENERATED += \
src/devices/bluetooth/nm-bt-enum-types.h \ src/devices/bluetooth/nm-bt-enum-types.h \
src/devices/bluetooth/nm-bt-enum-types.c src/devices/bluetooth/nm-bt-enum-types.c
nm_bt_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM
nm_bt_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM
nm_bt_enum_types_sources = src/devices/bluetooth/nm-bt-error.h nm_bt_enum_types_sources = src/devices/bluetooth/nm-bt-error.h
pkglib_LTLIBRARIES += src/devices/bluetooth/libnm-device-plugin-bluetooth.la pkglib_LTLIBRARIES += src/devices/bluetooth/libnm-device-plugin-bluetooth.la
@@ -3581,8 +3578,6 @@ GLIB_GENERATED += \
libnm-util/nm-utils-enum-types.h \ libnm-util/nm-utils-enum-types.h \
libnm-util/nm-utils-enum-types.c libnm-util/nm-utils-enum-types.c
nm_utils_enum_types_sources = $(filter-out libnm-util/NetworkManager%,$(libnm_util_libnm_util_include_HEADERS)) nm_utils_enum_types_sources = $(filter-out libnm-util/NetworkManager%,$(libnm_util_libnm_util_include_HEADERS))
nm_utils_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM
nm_utils_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM
libnm_util_libnm_util_la_LIBADD = \ libnm_util_libnm_util_la_LIBADD = \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
@@ -3719,6 +3714,242 @@ libnm_util_tests_test_libnm_linking_LDADD = \
$(top_builddir)/libnm/libnm.la \ $(top_builddir)/libnm/libnm.la \
$(libnm_util_tests_ldadd) $(libnm_util_tests_ldadd)
###############################################################################
# libnm-glib
###############################################################################
libnm_glib_cppflags = \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \
-I$(top_srcdir)/libnm-glib \
-I$(top_builddir)/libnm-glib \
-DG_LOG_DOMAIN=\""libnm-glib"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
$(DBUS_CFLAGS) \
$(GLIB_CFLAGS)
noinst_LTLIBRARIES += libnm-glib/libdeprecated-nm-glib.la
libnm_glib_libdeprecated_nm_glib_la_SOURCES = \
libnm-glib/libnm_glib.h \
libnm-glib/libnm_glib.c
libnm_glib_libdeprecated_nm_glib_la_CPPFLAGS = \
$(libnm_glib_cppflags) \
-Wno-deprecated-declarations \
-Wno-deprecated
libnm_glib_libdeprecated_nm_glib_la_LIBADD = \
$(DBUS_LIBS) \
$(GLIB_LIBS)
libdeprecateddir = $(includedir)/libnm-glib
libdeprecated_HEADERS = \
libnm-glib/libnm_glib.h
lib_LTLIBRARIES += libnm-glib/libnm-glib.la
libnm_glib_libnmincludedir = $(includedir)/libnm-glib
libnm_glib_libnmvpndir = $(includedir)/libnm-glib
libnm_glib_libnminclude_HEADERS = \
libnm-glib/nm-object.h \
libnm-glib/nm-client.h \
libnm-glib/nm-device.h \
libnm-glib/nm-device-ethernet.h \
libnm-glib/nm-device-infiniband.h \
libnm-glib/nm-device-adsl.h \
libnm-glib/nm-device-wifi.h \
libnm-glib/nm-device-bt.h \
libnm-glib/nm-device-olpc-mesh.h \
libnm-glib/nm-device-bond.h \
libnm-glib/nm-device-team.h \
libnm-glib/nm-device-bridge.h \
libnm-glib/nm-device-vlan.h \
libnm-glib/nm-device-generic.h \
libnm-glib/nm-access-point.h \
libnm-glib/nm-ip4-config.h \
libnm-glib/nm-device-modem.h \
libnm-glib/nm-vpn-connection.h \
libnm-glib/nm-types.h \
libnm-glib/nm-active-connection.h \
libnm-glib/nm-dhcp4-config.h \
libnm-glib/nm-ip6-config.h \
libnm-glib/nm-dhcp6-config.h \
libnm-glib/nm-remote-connection.h \
libnm-glib/nm-remote-settings.h \
libnm-glib/nm-secret-agent.h \
libnm-glib/nm-device-wimax.h \
libnm-glib/nm-wimax-nsp.h \
libnm-glib/nm-glib-enum-types.h
libnm_glib_libnmvpn_HEADERS = \
libnm-glib/nm-vpn-plugin.h \
libnm-glib/nm-vpn-plugin-ui-interface.h \
libnm-glib/nm-vpn-plugin-utils.h \
libnm-glib/nm-vpn-enum-types.h
libnm_glib_libnm_glib_la_csources = \
libnm-glib/nm-object.c \
libnm-glib/nm-dbus-helpers.c \
libnm-glib/nm-client.c \
libnm-glib/nm-device.c \
libnm-glib/nm-device-ethernet.c \
libnm-glib/nm-device-infiniband.c \
libnm-glib/nm-device-adsl.c \
libnm-glib/nm-device-wifi.c \
libnm-glib/nm-device-bt.c \
libnm-glib/nm-device-olpc-mesh.c \
libnm-glib/nm-device-bond.c \
libnm-glib/nm-device-team.c \
libnm-glib/nm-device-bridge.c \
libnm-glib/nm-device-vlan.c \
libnm-glib/nm-device-generic.c \
libnm-glib/nm-access-point.c \
libnm-glib/nm-ip4-config.c \
libnm-glib/nm-device-modem.c \
libnm-glib/nm-vpn-connection.c \
libnm-glib/nm-types.c \
libnm-glib/nm-object-cache.c \
libnm-glib/nm-active-connection.c \
libnm-glib/nm-dhcp4-config.c \
libnm-glib/nm-ip6-config.c \
libnm-glib/nm-dhcp6-config.c \
libnm-glib/nm-remote-connection.c \
libnm-glib/nm-remote-settings.c \
libnm-glib/nm-secret-agent.c \
libnm-glib/nm-device-wimax.c \
libnm-glib/nm-wimax-nsp.c \
libnm-glib/nm-glib-enum-types.c
libnm_glib_libnm_glib_la_private_headers = \
libnm-glib/nm-object-private.h \
libnm-glib/nm-device-private.h \
libnm-glib/nm-types-private.h \
libnm-glib/nm-object-cache.h \
libnm-glib/nm-remote-connection-private.h \
libnm-glib/nm-dbus-helpers-private.h
libnm_glib_libnm_glib_la_SOURCES = \
$(libnm_glib_libnm_glib_la_csources) \
$(libnm_glib_libnm_glib_la_private_headers)
libnm_glib_libnm_glib_la_CPPFLAGS = \
$(libnm_glib_cppflags) \
$(GUDEV_CFLAGS) \
-DNMRUNDIR=\"$(nmrundir)\"
libnm_glib_libnm_glib_la_LDFLAGS = \
-Wl,--version-script=$(srcdir)/libnm-glib/libnm-glib.ver \
-version-info "13:0:9"
libnm_glib_libnm_glib_la_LIBADD = \
libnm-util/libnm-util.la \
libnm-glib/libdeprecated-nm-glib.la \
$(GLIB_LIBS) \
$(DBUS_LIBS) \
$(GUDEV_LIBS)
GLIB_GENERATED += \
libnm-glib/nm-glib-enum-types.h \
libnm-glib/nm-glib-enum-types.c
nm_glib_enum_types_sources = $(libnm_glib_libnminclude_HEADERS)
check_programs_norun += libnm-glib/libnm-glib-test
libnm_glib_libnm_glib_test_CFLAGS = $(libnm_glib_cppflags)
libnm_glib_libnm_glib_test_LDADD = \
libnm-glib/libnm-glib.la \
libnm-util/libnm-util.la \
$(GLIB_LIBS) \
$(DBUS_LIBS)
lib_LTLIBRARIES += libnm-glib/libnm-glib-vpn.la
libnm_glib_libnm_glib_vpn_la_SOURCES = \
libnm-glib/nm-vpn-plugin.c \
libnm-glib/nm-vpn-plugin-ui-interface.c \
libnm-glib/nm-vpn-plugin-utils.c \
libnm-glib/nm-vpn-enum-types.c
libnm_glib_libnm_glib_vpn_la_CPPFLAGS = $(libnm_glib_cppflags)
libnm_glib_libnm_glib_vpn_la_LIBADD = \
libnm-util/libnm-util.la \
$(GLIB_LIBS) \
$(DBUS_LIBS)
libnm_glib_libnm_glib_vpn_la_LDFLAGS = \
-Wl,--version-script=$(srcdir)/libnm-glib/libnm-glib-vpn.ver \
-version-info "3:0:2"
GLIB_GENERATED += \
libnm-glib/nm-vpn-enum-types.h \
libnm-glib/nm-vpn-enum-types.c
nm_vpn_enum_types_sources = $(libnm_glib_libnmvpn_HEADERS)
libnm-glib/nm-vpn-plugin-glue.h: $(srcdir)/introspection/nm-vpn-plugin.xml
$(AM_V_GEN) dbus-binding-tool --prefix=nm_vpn_plugin --mode=glib-server --output=$@ $<
libnm-glib/nm-secret-agent-glue.h: $(srcdir)/introspection/nm-secret-agent.xml
$(AM_V_GEN) dbus-binding-tool --prefix=nm_secret_agent --mode=glib-server --output=$@ $<
BUILT_SOURCES += \
libnm-glib/nm-vpn-plugin-glue.h \
libnm-glib/nm-secret-agent-glue.h
pkgconfig_DATA += \
libnm-glib/libnm-glib.pc \
libnm-glib/libnm-glib-vpn.pc
DISTCLEANFILES += \
libnm-glib/libnm-glib.pc \
libnm-glib/libnm-glib.pc
EXTRA_DIST += \
libnm-glib/libnm-glib.pc.in \
libnm-glib/libnm-glib-vpn.pc.in \
libnm-glib/libnm-glib.ver \
libnm-glib/libnm-glib-vpn.ver
if HAVE_INTROSPECTION
libnm-glib/NMClient-1.0.gir: libnm-glib/libnm-glib.la $(builddir)/libnm-util/NetworkManager-1.0.gir
libnm_glib_NMClient_1_0_gir_INCLUDES = Gio-2.0 DBusGLib-1.0
libnm_glib_NMClient_1_0_gir_PACKAGES = gio-2.0 dbus-glib-1 gudev-1.0
libnm_glib_NMClient_1_0_gir_EXPORT_PACKAGES = libnm-glib libnm-glib-vpn
libnm_glib_NMClient_1_0_gir_CFLAGS = $(libnm_glib_cppflags)
libnm_glib_NMClient_1_0_gir_LIBS = \
libnm-glib/libnm-glib.la \
libnm-util/libnm-util.la
libnm_glib_NMClient_1_0_gir_FILES = \
$(libnm_glib_libnminclude_HEADERS) \
$(libnm_glib_libnm_glib_la_csources)
libnm_glib_NMClient_1_0_gir_SCANNERFLAGS = \
"-I$(srcdir)/libnm-util" \
"-I$(builddir)/libnm-util" \
"-I$(srcdir)/libnm-glib" \
"-I$(builddir)/libnm-glib" \
--warn-all --identifier-prefix=NM --symbol-prefix=nm \
--include-uninstalled=$(builddir)/libnm-util/NetworkManager-1.0.gir
libnm-glib/NMClient-1.0.typelib: libnm-glib/NMClient-1.0.gir
$(INTROSPECTION_COMPILER) "--includedir=$(srcdir)/libnm-util" "--includedir=$(builddir)/libnm-util" $< -o $@
INTROSPECTION_GIRS += libnm-glib/NMClient-1.0.gir
endif
check-local-exports-libnm-glib:
$(top_srcdir)/tools/check-exports.sh $(builddir)/libnm-glib/.libs/libnm-glib.so $(srcdir)/libnm-glib/libnm-glib.ver
check_local += check-local-exports-libnm-glib
endif endif
############################################################################### ###############################################################################

227
libnm-glib/Makefile.am
View File

@@ -1,226 +1 @@
include $(GLIB_MAKEFILE) SUBDIRS = tests
SUBDIRS = . tests
AM_CPPFLAGS = \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \
-DG_LOG_DOMAIN=\""libnm-glib"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
$(DBUS_CFLAGS) \
$(GLIB_CFLAGS)
BUILT_SOURCES = \
nm-vpn-plugin-glue.h \
nm-secret-agent-glue.h
noinst_LTLIBRARIES = \
libdeprecated-nm-glib.la
#####################################################
# Deprecated original libnm_glib bits
#####################################################
libdeprecated_nm_glib_la_SOURCES = \
libnm_glib.h \
libnm_glib.c
libdeprecated_nm_glib_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-Wno-deprecated-declarations \
-Wno-deprecated
libdeprecated_nm_glib_la_LIBADD = \
$(DBUS_LIBS) \
$(GLIB_LIBS)
libdeprecateddir = $(includedir)/libnm-glib
libdeprecated_HEADERS = libnm_glib.h
#####################################################
# Real libnm-glib stuff
#####################################################
lib_LTLIBRARIES = libnm-glib.la libnm-glib-vpn.la
libnm_glib_la_CFLAGS = \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
$(GUDEV_CFLAGS) \
-DNMRUNDIR=\"$(nmrundir)\"
libnmincludedir = $(includedir)/libnm-glib
libnmvpndir = $(includedir)/libnm-glib
libnminclude_HEADERS = \
nm-object.h \
nm-client.h \
nm-device.h \
nm-device-ethernet.h \
nm-device-infiniband.h \
nm-device-adsl.h \
nm-device-wifi.h \
nm-device-bt.h \
nm-device-olpc-mesh.h \
nm-device-bond.h \
nm-device-team.h \
nm-device-bridge.h \
nm-device-vlan.h \
nm-device-generic.h \
nm-access-point.h \
nm-ip4-config.h \
nm-device-modem.h \
nm-vpn-connection.h \
nm-types.h \
nm-active-connection.h \
nm-dhcp4-config.h \
nm-ip6-config.h \
nm-dhcp6-config.h \
nm-remote-connection.h \
nm-remote-settings.h \
nm-secret-agent.h \
nm-device-wimax.h \
nm-wimax-nsp.h \
nm-glib-enum-types.h
libnmvpn_HEADERS = \
nm-vpn-plugin.h \
nm-vpn-plugin-ui-interface.h \
nm-vpn-plugin-utils.h \
nm-vpn-enum-types.h
libnm_glib_la_csources = \
nm-object.c \
nm-dbus-helpers.c \
nm-client.c \
nm-device.c \
nm-device-ethernet.c \
nm-device-infiniband.c \
nm-device-adsl.c \
nm-device-wifi.c \
nm-device-bt.c \
nm-device-olpc-mesh.c \
nm-device-bond.c \
nm-device-team.c \
nm-device-bridge.c \
nm-device-vlan.c \
nm-device-generic.c \
nm-access-point.c \
nm-ip4-config.c \
nm-device-modem.c \
nm-vpn-connection.c \
nm-types.c \
nm-object-cache.c \
nm-active-connection.c \
nm-dhcp4-config.c \
nm-ip6-config.c \
nm-dhcp6-config.c \
nm-remote-connection.c \
nm-remote-settings.c \
nm-secret-agent.c \
nm-device-wimax.c \
nm-wimax-nsp.c \
nm-glib-enum-types.c
libnm_glib_la_private_headers = \
nm-object-private.h \
nm-device-private.h \
nm-types-private.h \
nm-object-cache.h \
nm-remote-connection-private.h \
nm-dbus-helpers-private.h
libnm_glib_la_SOURCES = \
$(libnm_glib_la_csources) \
$(libnm_glib_la_private_headers)
GLIB_GENERATED = nm-glib-enum-types.h nm-glib-enum-types.c
nm_glib_enum_types_sources = $(libnminclude_HEADERS)
GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
libnm_glib_la_LIBADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(builddir)/libdeprecated-nm-glib.la \
$(GLIB_LIBS) \
$(DBUS_LIBS) \
$(GUDEV_LIBS)
SYMBOL_VIS_FILE=$(srcdir)/libnm-glib.ver
libnm_glib_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \
-version-info "13:0:9"
noinst_PROGRAMS = libnm-glib-test
libnm_glib_test_SOURCES = libnm-glib-test.c
libnm_glib_test_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
libnm_glib_test_LDADD = libnm-glib.la $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS)
libnm_glib_vpn_la_SOURCES = \
nm-vpn-plugin.c \
nm-vpn-plugin-ui-interface.c \
nm-vpn-plugin-utils.c \
nm-vpn-enum-types.c
GLIB_GENERATED += nm-vpn-enum-types.h nm-vpn-enum-types.c
nm_vpn_enum_types_sources = $(libnmvpn_HEADERS)
libnm_glib_vpn_la_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
libnm_glib_vpn_la_LIBADD = $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS)
libnm_glib_vpn_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-glib-vpn.ver \
-version-info "3:0:2"
BUILT_SOURCES += $(GLIB_GENERATED)
#####################################################
nm-vpn-plugin-glue.h: $(top_srcdir)/introspection/nm-vpn-plugin.xml
$(AM_V_GEN) dbus-binding-tool --prefix=nm_vpn_plugin --mode=glib-server --output=$@ $<
nm-secret-agent-glue.h: $(top_srcdir)/introspection/nm-secret-agent.xml
$(AM_V_GEN) dbus-binding-tool --prefix=nm_secret_agent --mode=glib-server --output=$@ $<
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libnm-glib.pc libnm-glib-vpn.pc
DISTCLEANFILES = libnm-glib.pc libnm-glib.pc
EXTRA_DIST = libnm-glib.pc.in libnm-glib-vpn.pc.in libnm-glib.ver libnm-glib-vpn.ver
CLEANFILES = $(BUILT_SOURCES)
-include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS =
INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/libnm-util
# Pass SANITIZER_ENV where a command that uses built libraries is
# executed, to suppress possible errors
INTROSPECTION_SCANNER_ENV = $(SANITIZER_ENV)
if HAVE_INTROSPECTION
introspection_sources = $(libnminclude_HEADERS) $(libnm_glib_la_csources)
NMClient-1.0.gir: libnm-glib.la
NMClient_1_0_gir_INCLUDES = Gio-2.0 DBusGLib-1.0
NMClient_1_0_gir_PACKAGES = gio-2.0 dbus-glib-1 gudev-1.0
NMClient_1_0_gir_EXPORT_PACKAGES = libnm-glib libnm-glib-vpn
NMClient_1_0_gir_CFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/libnm-glib -I$(top_srcdir)/libnm-util
NMClient_1_0_gir_LIBS = libnm-glib.la $(top_builddir)/libnm-util/libnm-util.la
NMClient_1_0_gir_FILES = $(introspection_sources)
NMClient_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm --include-uninstalled=$(top_builddir)/libnm-util/NetworkManager-1.0.gir
INTROSPECTION_GIRS += NMClient-1.0.gir
girdir = $(datadir)/gir-1.0
gir_DATA = $(INTROSPECTION_GIRS)
typelibdir = $(libdir)/girepository-1.0
typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
CLEANFILES += $(gir_DATA) $(typelib_DATA)
endif
check-local:
$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-glib.so $(SYMBOL_VIS_FILE)