fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-03 12:30:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: merge "examples/C/glib/Makefile.am" into toplevel Makefile

Browse source
This commit is contained in:
Thomas Haller 2016-10-18 14:01:56 +02:00
parent 14b5309af3
commit 742d36c476
5 changed files with 67 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile.am
View file

@ -4256,6 +4256,10 @@ CLEANFILES += \
###############################################################################
include Makefile.examples
###############################################################################
check-local: $(check_local)
dist-hook: $(dist_hook)

62
Makefile.examples Normal file
View file

@ -0,0 +1,62 @@
###############################################################################
# examples/C/glib
###############################################################################
examples_C_glib_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 \
$(GLIB_CFLAGS) \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE
examples_C_glib_cppflags_gdbus = $(examples_C_glib_cppflags)
examples_C_glib_cppflags_libnm = $(examples_C_glib_cppflags)
check_programs_norun += \
examples/C/glib/add-connection-gdbus \
examples/C/glib/add-connection-libnm \
examples/C/glib/get-active-connections-gdbus \
examples/C/glib/get-ap-info-libnm \
examples/C/glib/list-connections-gdbus \
examples/C/glib/list-connections-libnm \
examples/C/glib/monitor-nm-running-gdbus \
examples/C/glib/monitor-nm-state-gdbus
examples_C_glib_add_connection_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus)
examples_C_glib_add_connection_gdbus_LDADD = \
$(GLIB_LIBS) \
$(UUID_LIBS)
examples_C_glib_add_connection_libnm_CPPFLAGS = $(examples_C_glib_cppflags_libnm)
examples_C_glib_add_connection_libnm_LDADD = \
libnm/libnm.la \
$(GLIB_LIBS)
examples_C_glib_get_active_connections_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus)
examples_C_glib_get_active_connections_gdbus_LDADD = \
$(GLIB_LIBS)
examples_C_glib_get_ap_info_libnm_CPPFLAGS = $(examples_C_glib_cppflags_libnm)
examples_C_glib_get_ap_info_libnm_LDADD = \
libnm/libnm.la \
$(GLIB_LIBS)
examples_C_glib_list_connections_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus)
examples_C_glib_list_connections_gdbus_LDADD = \
$(GLIB_LIBS)
examples_C_glib_list_connections_libnm_CPPFLAGS = $(examples_C_glib_cppflags_libnm)
examples_C_glib_list_connections_libnm_LDADD = \
libnm/libnm.la \
$(GLIB_LIBS)
examples_C_glib_monitor_nm_running_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus)
examples_C_glib_monitor_nm_running_gdbus_LDADD = \
$(GLIB_LIBS)
examples_C_glib_monitor_nm_state_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus)
examples_C_glib_monitor_nm_state_gdbus_LDADD = \
$(GLIB_LIBS)

1
configure.ac
View file

@ -1161,7 +1161,6 @@ examples/ruby/Makefile
examples/lua/Makefile
examples/lua/lgi/Makefile
examples/C/Makefile
examples/C/glib/Makefile
examples/C/qt/Makefile
examples/dispatcher/Makefile
])

2
examples/C/Makefile.am
View file

@ -1,4 +1,4 @@
SUBDIRS= glib
SUBDIRS =
if WITH_QT
SUBDIRS += qt

55
examples/C/glib/Makefile.am
View file

@ -1,55 +0,0 @@
AM_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 \
$(GLIB_CFLAGS) \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE
noinst_PROGRAMS = \
add-connection-gdbus \
add-connection-libnm \
get-active-connections-gdbus \
get-ap-info-libnm \
list-connections-gdbus \
list-connections-libnm \
monitor-nm-running-gdbus \
monitor-nm-state-gdbus
add_connection_gdbus_SOURCES = add-connection-gdbus.c
add_connection_gdbus_LDADD = \
$(GLIB_LIBS) \
$(UUID_LIBS)
add_connection_libnm_SOURCES = add-connection-libnm.c
add_connection_libnm_LDADD = \
$(top_builddir)/libnm/libnm.la \
$(GLIB_LIBS)
get_active_connections_gdbus_SOURCES = get-active-connections-gdbus.c
get_active_connections_gdbus_LDADD = \
$(GLIB_LIBS)
get_ap_info_libnm_SOURCES = get-ap-info-libnm.c
get_ap_info_libnm_LDADD = \
$(top_builddir)/libnm/libnm.la \
$(GLIB_LIBS)
list_connections_gdbus_SOURCES = list-connections-gdbus.c
list_connections_gdbus_LDADD = \
$(GLIB_LIBS)
list_connections_libnm_SOURCES = list-connections-libnm.c
list_connections_libnm_LDADD = \
$(top_builddir)/libnm/libnm.la \
$(GLIB_LIBS)
monitor_nm_running_gdbus_SOURCES = monitor-nm-running-gdbus.c
monitor_nm_running_gdbus_LDADD = \
$(GLIB_LIBS)
monitor_nm_state_gdbus_SOURCES = monitor-nm-state-gdbus.c
monitor_nm_state_gdbus_LDADD = \
$(GLIB_LIBS)