2011-04-20 19:25:50 -05:00
|
|
|
AM_CPPFLAGS = \
|
2013-08-22 10:47:21 -04:00
|
|
|
-I${top_srcdir}/include \
|
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
|
|
|
-I$(top_builddir)/include \
|
2014-05-19 13:44:02 -04:00
|
|
|
-I${top_srcdir}/libnm-core \
|
|
|
|
|
-I${top_builddir}/libnm-core \
|
|
|
|
|
-I${top_srcdir}/libnm \
|
|
|
|
|
-I${top_builddir}/libnm \
|
2011-04-20 19:25:50 -05:00
|
|
|
$(GLIB_CFLAGS)
|
|
|
|
|
|
|
|
|
|
noinst_PROGRAMS = \
|
2014-08-20 10:08:18 -04:00
|
|
|
add-connection-gdbus \
|
2014-05-19 13:44:02 -04:00
|
|
|
add-connection-libnm \
|
2014-08-20 10:08:18 -04:00
|
|
|
get-active-connections-gdbus \
|
2014-05-19 13:44:02 -04:00
|
|
|
get-ap-info-libnm \
|
2014-08-20 10:08:18 -04:00
|
|
|
list-connections-gdbus \
|
|
|
|
|
list-connections-libnm \
|
|
|
|
|
monitor-nm-running-gdbus \
|
|
|
|
|
monitor-nm-state-gdbus
|
2011-04-20 19:25:50 -05:00
|
|
|
|
2014-08-20 10:08:18 -04:00
|
|
|
add_connection_gdbus_SOURCES = add-connection-gdbus.c
|
|
|
|
|
add_connection_gdbus_LDADD = \
|
|
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(UUID_LIBS)
|
2011-04-20 19:25:50 -05:00
|
|
|
|
2014-05-19 13:44:02 -04:00
|
|
|
add_connection_libnm_SOURCES = add-connection-libnm.c
|
|
|
|
|
add_connection_libnm_LDADD = \
|
|
|
|
|
$(top_builddir)/libnm/libnm.la \
|
2011-04-20 19:25:50 -05:00
|
|
|
$(GLIB_LIBS)
|
|
|
|
|
|
2014-08-20 10:08:18 -04:00
|
|
|
get_active_connections_gdbus_SOURCES = get-active-connections-gdbus.c
|
|
|
|
|
get_active_connections_gdbus_LDADD = \
|
2011-04-20 19:25:50 -05:00
|
|
|
$(GLIB_LIBS)
|
|
|
|
|
|
2014-08-20 10:08:18 -04:00
|
|
|
get_ap_info_libnm_SOURCES = get-ap-info-libnm.c
|
|
|
|
|
get_ap_info_libnm_LDADD = \
|
2014-05-19 13:44:02 -04:00
|
|
|
$(top_builddir)/libnm/libnm.la \
|
2011-04-20 19:25:50 -05:00
|
|
|
$(GLIB_LIBS)
|
|
|
|
|
|
2014-08-20 10:08:18 -04:00
|
|
|
list_connections_gdbus_SOURCES = list-connections-gdbus.c
|
|
|
|
|
list_connections_gdbus_LDADD = \
|
2011-04-20 19:25:50 -05:00
|
|
|
$(GLIB_LIBS)
|
|
|
|
|
|
2014-08-20 10:08:18 -04:00
|
|
|
list_connections_libnm_SOURCES = list-connections-libnm.c
|
|
|
|
|
list_connections_libnm_LDADD = \
|
2014-05-19 13:44:02 -04:00
|
|
|
$(top_builddir)/libnm/libnm.la \
|
2011-04-20 19:25:50 -05:00
|
|
|
$(GLIB_LIBS)
|
|
|
|
|
|
2014-08-20 10:08:18 -04:00
|
|
|
monitor_nm_running_gdbus_SOURCES = monitor-nm-running-gdbus.c
|
|
|
|
|
monitor_nm_running_gdbus_LDADD = \
|
build: clean up GLib-related pkg-config usage (bgo #687218)
We had separate checks for glib-2.0, gobject-2.0, gmodule-2.0, and
gio-unix-2.0. It doesn't make sense to link a binary against all 4
because gio-unix-2.0 depends on glib-2.0 and gobject-2.0. Doing this
actually breaks things in unusual circumstances.
Generally, few bits of NM actually just use glib, and not gio. We
might as well coalesce those requirements together, even if it means
in some cases we "overlink". Additionally, I chose for now to fold
gmodule-2.0 in as well, even though many fewer programs need it. The
cost of overlinking is quite small.
The benefit of this is less repeated junk in Makefile.am, as well as
more centralized control over GLib. A followup patch will allow us to
set -DGLIB_VERSION_MIN_REQUIRED in just one place, rather than having
to replicate it 4 times.
The NM configure is still suboptimal - for example, libpolkit-1
depends on gio-2.0, so really we should determine the compiler flags
all in one pass. But it doesn't matter too much for now.
2012-10-31 20:21:32 +01:00
|
|
|
$(GLIB_LIBS)
|
2012-02-02 13:37:10 +01:00
|
|
|
|
2014-08-20 10:08:18 -04:00
|
|
|
monitor_nm_state_gdbus_SOURCES = monitor-nm-state-gdbus.c
|
|
|
|
|
monitor_nm_state_gdbus_LDADD = \
|
build: clean up GLib-related pkg-config usage (bgo #687218)
We had separate checks for glib-2.0, gobject-2.0, gmodule-2.0, and
gio-unix-2.0. It doesn't make sense to link a binary against all 4
because gio-unix-2.0 depends on glib-2.0 and gobject-2.0. Doing this
actually breaks things in unusual circumstances.
Generally, few bits of NM actually just use glib, and not gio. We
might as well coalesce those requirements together, even if it means
in some cases we "overlink". Additionally, I chose for now to fold
gmodule-2.0 in as well, even though many fewer programs need it. The
cost of overlinking is quite small.
The benefit of this is less repeated junk in Makefile.am, as well as
more centralized control over GLib. A followup patch will allow us to
set -DGLIB_VERSION_MIN_REQUIRED in just one place, rather than having
to replicate it 4 times.
The NM configure is still suboptimal - for example, libpolkit-1
depends on gio-2.0, so really we should determine the compiler flags
all in one pass. But it doesn't matter too much for now.
2012-10-31 20:21:32 +01:00
|
|
|
$(GLIB_LIBS)
|