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/qt/Makefile.am" into toplevel Makefile

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

58
Makefile.examples
View file

@ -60,3 +60,61 @@ examples_C_glib_monitor_nm_running_gdbus_LDADD = \
examples_C_glib_monitor_nm_state_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus)
examples_C_glib_monitor_nm_state_gdbus_LDADD = \
$(GLIB_LIBS)
###############################################################################
# examples/C/qt
###############################################################################
if WITH_QT
examples_C_qt_cppflags = \
-I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \
-I${builddir}/examples/C/qt \
$(DBUS_CFLAGS) \
$(QT_CFLAGS)
check_programs_norun += \
examples/C/qt/add-connection-wired \
examples/C/qt/list-connections \
examples/C/qt/change-ipv4-addresses \
examples/C/qt/monitor-nm-running
examples_C_qt_add_connection_wired_SOURCES = examples/C/qt/add-connection-wired.cpp
examples_C_qt_add_connection_wired_CPPFLAGS = $(examples_C_qt_cppflags)
examples_C_qt_add_connection_wired_LDADD = \
$(DBUS_LIBS) \
$(QT_LIBS)
examples_C_qt_list_connections_SOURCES = examples/C/qt/list-connections.cpp
examples_C_qt_list_connections_CPPFLAGS = $(examples_C_qt_cppflags)
examples_C_qt_list_connections_LDADD = \
$(DBUS_LIBS) \
$(QT_LIBS)
examples_C_qt_change_ipv4_addresses_SOURCES = examples/C/qt/change-ipv4-addresses.cpp
examples_C_qt_change_ipv4_addresses_CPPFLAGS = $(examples_C_qt_cppflags)
examples_C_qt_change_ipv4_addresses_LDADD = \
$(DBUS_LIBS) \
$(QT_LIBS)
examples_C_qt_monitor_nm_running_SOURCES = examples/C/qt/monitor-nm-running.cpp
examples_C_qt_monitor_nm_running_CPPFLAGS = $(examples_C_qt_cppflags)
examples_C_qt_monitor_nm_running_LDADD = \
$(DBUS_LIBS) \
$(QT_LIBS)
examples/C/qt/monitor-nm-running.moc: examples/C/qt/monitor-nm-running.cpp
$(AM_V_GEN) $(MOC) -i $< -o $@
BUILT_SOURCES += \
examples/C/qt/monitor-nm-running.moc
endif
EXTRA_DIST += \
examples/C/qt/add-connection-wired.cpp \
examples/C/qt/list-connections.cpp \
examples/C/qt/change-ipv4-addresses.cpp \
examples/C/qt/monitor-nm-running.cpp

2
configure.ac
View file

@ -1160,8 +1160,6 @@ examples/python/python-networkmanager/Makefile
examples/ruby/Makefile
examples/lua/Makefile
examples/lua/lgi/Makefile
examples/C/Makefile
examples/C/qt/Makefile
examples/dispatcher/Makefile
])
AC_CONFIG_SUBDIRS([libndp])

5
examples/C/Makefile.am
View file

@ -1,5 +0,0 @@
SUBDIRS =
if WITH_QT
SUBDIRS += qt
endif

46
examples/C/qt/Makefile.am
View file

@ -1,46 +0,0 @@
AM_CPPFLAGS = \
-I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \
$(DBUS_CFLAGS) \
$(QT_CFLAGS)
noinst_PROGRAMS = \
add-connection-wired \
list-connections \
change-ipv4-addresses \
monitor-nm-running
add_connection_wired_SOURCES = add-connection-wired.cpp
add_connection_wired_LDADD = \
$(DBUS_LIBS) \
$(QT_LIBS)
list_connections_SOURCES = list-connections.cpp
list_connections_LDADD = \
$(DBUS_LIBS) \
$(QT_LIBS)
change_ipv4_addresses_SOURCES = change-ipv4-addresses.cpp
change_ipv4_addresses_LDADD = \
$(DBUS_LIBS) \
$(QT_LIBS)
monitor_nm_running_SOURCES = monitor-nm-running.cpp
monitor_nm_running_LDADD = \
$(DBUS_LIBS) \
$(QT_LIBS)
monitor-nm-running.moc: monitor-nm-running.cpp
$(AM_V_GEN) $(MOC) -i $< -o $@
BUILT_SOURCES = \
monitor-nm-running.moc
EXTRA_DIST = \
add-connection-wired.cpp \
list-connections.cpp \
change-ipv4-addresses.cpp \
monitor-nm-running.cpp
CLEANFILES = $(BUILT_SOURCES)

1
examples/Makefile.am
View file

@ -3,5 +3,4 @@ SUBDIRS= \
python \
ruby \
lua \
C \
dispatcher