2012-02-08 12:56:52 -05:00
|
|
|
include $(GLIB_MAKEFILE)
|
|
|
|
|
|
2012-11-05 11:35:34 +01:00
|
|
|
SUBDIRS = . tests
|
2009-02-01 20:18:21 -05:00
|
|
|
|
2013-08-22 10:47:21 -04:00
|
|
|
AM_CPPFLAGS = \
|
|
|
|
|
-I${top_srcdir} \
|
2015-12-22 12:18:22 +01:00
|
|
|
-I${top_srcdir}/shared \
|
|
|
|
|
-I$(top_builddir)/shared \
|
2014-04-07 16:14:47 -04:00
|
|
|
-DG_LOG_DOMAIN=\""libnm-util"\" \
|
2014-11-13 10:29:37 -05:00
|
|
|
-DLOCALEDIR=\"$(datadir)/locale\" \
|
2015-12-20 21:38:32 +01:00
|
|
|
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
|
2008-08-27 02:57:21 +00:00
|
|
|
$(GLIB_CFLAGS) \
|
|
|
|
|
$(DBUS_CFLAGS) \
|
2012-10-31 19:40:01 +01:00
|
|
|
$(UUID_CFLAGS)
|
2005-12-09 23:25:22 +00:00
|
|
|
|
2013-08-22 10:47:21 -04:00
|
|
|
if WITH_GNUTLS
|
2015-03-28 00:20:55 +01:00
|
|
|
AM_CPPFLAGS += $(GNUTLS_CFLAGS)
|
2013-08-22 10:47:21 -04:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
if WITH_NSS
|
|
|
|
|
AM_CPPFLAGS += $(NSS_CFLAGS)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
lib_LTLIBRARIES=libnm-util.la
|
|
|
|
|
|
2007-11-07 16:06:43 +00:00
|
|
|
libnm_util_include_HEADERS = \
|
2015-12-22 12:18:22 +01:00
|
|
|
$(top_builddir)/shared/nm-version-macros.h \
|
2014-07-15 09:24:50 -04:00
|
|
|
NetworkManager.h \
|
|
|
|
|
NetworkManagerVPN.h \
|
2007-11-07 16:06:43 +00:00
|
|
|
nm-connection.h \
|
|
|
|
|
nm-setting.h \
|
2008-03-14 22:40:35 +00:00
|
|
|
nm-setting-8021x.h \
|
2011-05-17 21:03:18 +03:00
|
|
|
nm-setting-adsl.h \
|
2009-05-13 12:34:45 -04:00
|
|
|
nm-setting-bluetooth.h \
|
2011-10-18 13:48:42 +02:00
|
|
|
nm-setting-bond.h \
|
2013-07-25 15:36:45 +02:00
|
|
|
nm-setting-team.h \
|
2013-07-25 15:36:46 +02:00
|
|
|
nm-setting-team-port.h \
|
2012-05-23 16:19:27 +02:00
|
|
|
nm-setting-bridge.h \
|
2012-10-29 11:01:38 -05:00
|
|
|
nm-setting-bridge-port.h \
|
2007-11-07 16:06:43 +00:00
|
|
|
nm-setting-connection.h \
|
2013-09-13 09:44:56 -05:00
|
|
|
nm-setting-dcb.h \
|
2011-10-13 16:28:25 -04:00
|
|
|
nm-setting-infiniband.h \
|
2007-11-07 16:06:43 +00:00
|
|
|
nm-setting-ip4-config.h \
|
2011-12-12 22:20:56 -05:00
|
|
|
nm-setting-vlan.h \
|
2009-06-11 15:52:11 -04:00
|
|
|
nm-setting-ip6-config.h \
|
2007-11-07 16:06:43 +00:00
|
|
|
nm-setting-ppp.h \
|
2008-03-11 16:37:41 +00:00
|
|
|
nm-setting-pppoe.h \
|
2007-11-29 14:38:07 +00:00
|
|
|
nm-setting-serial.h \
|
2013-04-08 11:03:07 -04:00
|
|
|
nm-setting-generic.h \
|
2007-12-10 09:17:40 +00:00
|
|
|
nm-setting-gsm.h \
|
2008-01-21 19:14:18 +00:00
|
|
|
nm-setting-cdma.h \
|
2009-08-05 16:34:02 -04:00
|
|
|
nm-setting-olpc-mesh.h \
|
2009-12-14 13:51:50 +02:00
|
|
|
nm-setting-wimax.h \
|
2007-11-07 16:06:43 +00:00
|
|
|
nm-setting-wired.h \
|
|
|
|
|
nm-setting-wireless.h \
|
|
|
|
|
nm-setting-wireless-security.h \
|
|
|
|
|
nm-setting-vpn.h \
|
build: extract version macros from "nm-version.h" to new header file "nm-version-macros.h"
For libnm library, "nm-dbus-interface.h" contains defines like the D-Bus
paths of NetworkManager. It is desirable to have this header usable without
having a dependency on "glib.h", for example for a QT application. For that,
commit c0852964a890cf43cc2dcaeff41ac6edc5028f24 removed that dependancy.
For libnm-glib library, the analog to "nm-dbus-interface.h" is
"NetworkManager.h", and the same applies there. Commit
159e827a72f420048e12d318f8ba1edd3f641fc8 removed that include.
However, that broke build on PackageKit [1] which expected to get the
version macros by including "NetworkManager.h". So at least for libnm-glib,
we need to preserve old behavior so that a user including
"NetworkManager.h" gets the version macros, but not "glib.h".
Extract the version macros to a new header file "nm-version-macros.h".
This header doesn't include "glib.h" and can be included from
"NetworkManager.h". This gives as previous behavior and a glib-free
include.
For libnm we still don't include "nm-version-macros.h" to "nm-dbus-interface.h".
Very few users will actually need the version macros, but not using
libnm.
Users that use libnm, should just include (libnm's) "NetworkManager.h" to
get all headers.
As a special case, a user who doesn't want to use glib/libnm, but still
needs both "nm-dbus-interface.h" and "nm-version-macros.h", can include
them both separately.
[1] https://github.com/hughsie/PackageKit/issues/85
Fixes: 4545a7fe9670ce4d7c259c11c2cc853bfae6729b
2015-09-25 16:07:50 +02:00
|
|
|
nm-utils.h \
|
|
|
|
|
nm-version.h
|
2014-07-15 11:37:19 -04:00
|
|
|
|
|
|
|
|
nodist_libnm_util_include_HEADERS = \
|
build: extract version macros from "nm-version.h" to new header file "nm-version-macros.h"
For libnm library, "nm-dbus-interface.h" contains defines like the D-Bus
paths of NetworkManager. It is desirable to have this header usable without
having a dependency on "glib.h", for example for a QT application. For that,
commit c0852964a890cf43cc2dcaeff41ac6edc5028f24 removed that dependancy.
For libnm-glib library, the analog to "nm-dbus-interface.h" is
"NetworkManager.h", and the same applies there. Commit
159e827a72f420048e12d318f8ba1edd3f641fc8 removed that include.
However, that broke build on PackageKit [1] which expected to get the
version macros by including "NetworkManager.h". So at least for libnm-glib,
we need to preserve old behavior so that a user including
"NetworkManager.h" gets the version macros, but not "glib.h".
Extract the version macros to a new header file "nm-version-macros.h".
This header doesn't include "glib.h" and can be included from
"NetworkManager.h". This gives as previous behavior and a glib-free
include.
For libnm we still don't include "nm-version-macros.h" to "nm-dbus-interface.h".
Very few users will actually need the version macros, but not using
libnm.
Users that use libnm, should just include (libnm's) "NetworkManager.h" to
get all headers.
As a special case, a user who doesn't want to use glib/libnm, but still
needs both "nm-dbus-interface.h" and "nm-version-macros.h", can include
them both separately.
[1] https://github.com/hughsie/PackageKit/issues/85
Fixes: 4545a7fe9670ce4d7c259c11c2cc853bfae6729b
2015-09-25 16:07:50 +02:00
|
|
|
nm-utils-enum-types.h
|
2007-11-07 16:06:43 +00:00
|
|
|
|
2011-01-21 14:46:09 -06:00
|
|
|
libnm_util_la_private_headers = \
|
2016-03-24 16:03:06 +01:00
|
|
|
$(top_builddir)/shared/nm-shared-utils.h \
|
2008-05-19 07:43:13 +00:00
|
|
|
crypto.h \
|
2015-04-16 12:34:55 -04:00
|
|
|
nm-dbus-glib-types.h \
|
|
|
|
|
nm-gvaluearray-compat.h \
|
2011-01-21 14:46:09 -06:00
|
|
|
nm-param-spec-specialized.h \
|
2015-04-16 12:34:55 -04:00
|
|
|
nm-setting-private.h \
|
|
|
|
|
nm-utils-private.h
|
2011-01-21 14:46:09 -06:00
|
|
|
|
|
|
|
|
libnm_util_la_csources = \
|
2016-03-24 16:03:06 +01:00
|
|
|
$(top_builddir)/shared/nm-shared-utils.c \
|
2011-01-21 14:46:09 -06:00
|
|
|
crypto.c \
|
2007-05-07 14:39:20 +00:00
|
|
|
nm-connection.c \
|
2007-11-07 16:06:43 +00:00
|
|
|
nm-param-spec-specialized.c \
|
2007-05-07 14:39:20 +00:00
|
|
|
nm-setting.c \
|
2008-03-14 22:40:35 +00:00
|
|
|
nm-setting-8021x.c \
|
2011-05-17 21:03:18 +03:00
|
|
|
nm-setting-adsl.c \
|
2009-05-13 12:34:45 -04:00
|
|
|
nm-setting-bluetooth.c \
|
2011-10-18 13:48:42 +02:00
|
|
|
nm-setting-bond.c \
|
2013-07-25 15:36:45 +02:00
|
|
|
nm-setting-team.c \
|
2013-07-25 15:36:46 +02:00
|
|
|
nm-setting-team-port.c \
|
2012-05-23 16:19:27 +02:00
|
|
|
nm-setting-bridge.c \
|
2012-10-29 11:01:38 -05:00
|
|
|
nm-setting-bridge-port.c \
|
2007-11-07 16:06:43 +00:00
|
|
|
nm-setting-connection.c \
|
2013-09-13 09:44:56 -05:00
|
|
|
nm-setting-dcb.c \
|
2011-10-13 16:28:25 -04:00
|
|
|
nm-setting-infiniband.c \
|
2007-11-07 16:06:43 +00:00
|
|
|
nm-setting-ip4-config.c \
|
2011-12-12 22:20:56 -05:00
|
|
|
nm-setting-vlan.c \
|
2008-06-26 21:30:33 +00:00
|
|
|
nm-setting-ip6-config.c \
|
2007-11-07 16:06:43 +00:00
|
|
|
nm-setting-ppp.c \
|
2008-03-11 16:37:41 +00:00
|
|
|
nm-setting-pppoe.c \
|
2007-11-29 14:38:07 +00:00
|
|
|
nm-setting-serial.c \
|
2013-04-08 11:03:07 -04:00
|
|
|
nm-setting-generic.c \
|
2007-12-10 09:17:40 +00:00
|
|
|
nm-setting-gsm.c \
|
2008-01-21 19:14:18 +00:00
|
|
|
nm-setting-cdma.c \
|
2009-08-05 16:34:02 -04:00
|
|
|
nm-setting-olpc-mesh.c \
|
2009-12-14 13:51:50 +02:00
|
|
|
nm-setting-wimax.c \
|
2007-11-07 16:06:43 +00:00
|
|
|
nm-setting-wired.c \
|
|
|
|
|
nm-setting-wireless.c \
|
|
|
|
|
nm-setting-wireless-security.c \
|
|
|
|
|
nm-setting-vpn.c \
|
2012-02-08 12:56:52 -05:00
|
|
|
nm-utils-enum-types.c \
|
2013-03-21 09:36:04 -04:00
|
|
|
nm-utils.c \
|
|
|
|
|
nm-value-transforms.c
|
2011-01-21 14:46:09 -06:00
|
|
|
|
|
|
|
|
libnm_util_la_SOURCES = \
|
|
|
|
|
$(libnm_util_la_csources) \
|
|
|
|
|
$(libnm_util_la_private_headers)
|
2005-12-09 23:25:22 +00:00
|
|
|
|
2012-02-08 12:56:52 -05:00
|
|
|
GLIB_GENERATED = nm-utils-enum-types.h nm-utils-enum-types.c
|
|
|
|
|
BUILT_SOURCES = $(GLIB_GENERATED)
|
2014-07-15 09:24:50 -04:00
|
|
|
nm_utils_enum_types_sources = $(filter-out NetworkManager%,$(libnm_util_include_HEADERS))
|
2012-02-08 12:56:52 -05:00
|
|
|
GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
|
|
|
|
|
GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
|
|
|
|
|
|
2008-08-27 02:57:21 +00:00
|
|
|
libnm_util_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS) $(UUID_LIBS)
|
2008-05-19 07:43:13 +00:00
|
|
|
|
2011-03-21 13:36:43 -05:00
|
|
|
SYMBOL_VIS_FILE=$(srcdir)/libnm-util.ver
|
|
|
|
|
|
|
|
|
|
libnm_util_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \
|
2014-12-18 13:23:37 -05:00
|
|
|
-version-info "9:0:7"
|
2008-08-22 11:32:25 +00:00
|
|
|
|
2008-05-19 07:43:13 +00:00
|
|
|
if WITH_GNUTLS
|
|
|
|
|
libnm_util_la_SOURCES += crypto_gnutls.c
|
2015-03-28 00:20:55 +01:00
|
|
|
libnm_util_la_LIBADD += $(GNUTLS_LIBS)
|
2008-05-19 07:43:13 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
if WITH_NSS
|
|
|
|
|
libnm_util_la_SOURCES += crypto_nss.c
|
|
|
|
|
libnm_util_la_LIBADD += $(NSS_LIBS)
|
|
|
|
|
endif
|
|
|
|
|
|
2005-12-09 23:25:22 +00:00
|
|
|
libnm_util_includedir=$(includedir)/NetworkManager
|
|
|
|
|
|
2008-05-19 07:43:13 +00:00
|
|
|
|
2009-02-02 01:03:15 -05:00
|
|
|
###########################################
|
|
|
|
|
# Crypto test library
|
|
|
|
|
###########################################
|
|
|
|
|
|
|
|
|
|
noinst_LTLIBRARIES = libtest-crypto.la
|
|
|
|
|
|
|
|
|
|
libtest_crypto_la_SOURCES = crypto.c
|
|
|
|
|
|
|
|
|
|
libtest_crypto_la_LIBADD = \
|
|
|
|
|
$(GLIB_LIBS)
|
2008-05-19 07:43:13 +00:00
|
|
|
|
2008-08-22 11:32:37 +00:00
|
|
|
if WITH_GNUTLS
|
2009-02-02 01:03:15 -05:00
|
|
|
libtest_crypto_la_SOURCES += crypto_gnutls.c
|
2015-03-28 00:20:55 +01:00
|
|
|
libtest_crypto_la_LIBADD += $(GNUTLS_LIBS)
|
2008-08-22 11:32:37 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
if WITH_NSS
|
2009-02-02 01:03:15 -05:00
|
|
|
libtest_crypto_la_SOURCES += crypto_nss.c
|
|
|
|
|
libtest_crypto_la_LIBADD += $(NSS_LIBS)
|
2008-08-22 11:32:37 +00:00
|
|
|
endif
|
|
|
|
|
|
2005-12-09 23:25:22 +00:00
|
|
|
pkgconfigdir = $(libdir)/pkgconfig
|
|
|
|
|
pkgconfig_DATA = libnm-util.pc
|
|
|
|
|
|
|
|
|
|
DISTCLEANFILES = libnm-util.pc
|
|
|
|
|
|
build: extract version macros from "nm-version.h" to new header file "nm-version-macros.h"
For libnm library, "nm-dbus-interface.h" contains defines like the D-Bus
paths of NetworkManager. It is desirable to have this header usable without
having a dependency on "glib.h", for example for a QT application. For that,
commit c0852964a890cf43cc2dcaeff41ac6edc5028f24 removed that dependancy.
For libnm-glib library, the analog to "nm-dbus-interface.h" is
"NetworkManager.h", and the same applies there. Commit
159e827a72f420048e12d318f8ba1edd3f641fc8 removed that include.
However, that broke build on PackageKit [1] which expected to get the
version macros by including "NetworkManager.h". So at least for libnm-glib,
we need to preserve old behavior so that a user including
"NetworkManager.h" gets the version macros, but not "glib.h".
Extract the version macros to a new header file "nm-version-macros.h".
This header doesn't include "glib.h" and can be included from
"NetworkManager.h". This gives as previous behavior and a glib-free
include.
For libnm we still don't include "nm-version-macros.h" to "nm-dbus-interface.h".
Very few users will actually need the version macros, but not using
libnm.
Users that use libnm, should just include (libnm's) "NetworkManager.h" to
get all headers.
As a special case, a user who doesn't want to use glib/libnm, but still
needs both "nm-dbus-interface.h" and "nm-version-macros.h", can include
them both separately.
[1] https://github.com/hughsie/PackageKit/issues/85
Fixes: 4545a7fe9670ce4d7c259c11c2cc853bfae6729b
2015-09-25 16:07:50 +02:00
|
|
|
EXTRA_DIST = libnm-util.pc.in libnm-util.ver
|
2008-07-16 21:21:09 +00:00
|
|
|
|
2011-01-21 14:46:09 -06:00
|
|
|
-include $(INTROSPECTION_MAKEFILE)
|
|
|
|
|
INTROSPECTION_GIRS =
|
|
|
|
|
INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
|
|
|
|
|
INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
|
|
|
|
|
|
|
|
|
|
if HAVE_INTROSPECTION
|
2014-07-15 11:37:19 -04:00
|
|
|
introspection_sources = $(libnm_util_include_HEADERS) $(nodist_libnm_util_include_HEADERS) $(libnm_util_la_csources)
|
2011-01-21 14:46:09 -06:00
|
|
|
|
|
|
|
|
NetworkManager-1.0.gir: libnm-util.la
|
|
|
|
|
NetworkManager_1_0_gir_INCLUDES = GObject-2.0 DBusGLib-1.0
|
|
|
|
|
NetworkManager_1_0_gir_PACKAGES = gobject-2.0 dbus-glib-1
|
2012-06-01 19:44:19 +01:00
|
|
|
NetworkManager_1_0_gir_EXPORT_PACKAGES = libnm-util
|
2013-08-22 10:47:21 -04:00
|
|
|
NetworkManager_1_0_gir_CFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/libnm-util
|
2011-01-21 14:46:09 -06:00
|
|
|
NetworkManager_1_0_gir_LIBS = libnm-util.la
|
|
|
|
|
NetworkManager_1_0_gir_FILES = $(introspection_sources)
|
2012-06-11 15:03:01 -05:00
|
|
|
NetworkManager_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm
|
2011-01-21 14:46:09 -06:00
|
|
|
INTROSPECTION_GIRS += NetworkManager-1.0.gir
|
|
|
|
|
|
|
|
|
|
girdir = $(datadir)/gir-1.0
|
|
|
|
|
gir_DATA = $(INTROSPECTION_GIRS)
|
|
|
|
|
|
|
|
|
|
typelibdir = $(libdir)/girepository-1.0
|
|
|
|
|
typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
|
|
|
|
|
|
2015-04-29 16:14:09 +02:00
|
|
|
CLEANFILES = $(gir_DATA) $(typelib_DATA)
|
2014-06-13 11:07:02 -04:00
|
|
|
|
2014-06-27 12:25:54 -04:00
|
|
|
endif
|
|
|
|
|
|
2012-11-05 11:35:34 +01:00
|
|
|
if ENABLE_TESTS
|
2011-03-21 13:36:43 -05:00
|
|
|
|
|
|
|
|
check-local:
|
|
|
|
|
$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-util.so $(SYMBOL_VIS_FILE)
|
|
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|