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

build: let libnm/libnm.la sources depend on introspection files

Browse Source 
Source files like libnm/nm-client.c include introspection files like
nmdbus-manager.h. These files are part of BUILT_SOURCES, which is
a pre-requisite to "all" target.

However, that is not sufficient for
  ./autogen --enable-gtk-doc && make dist
This commit is contained in:
Thomas Haller
2016-11-15 11:07:51 +01:00
parent 07a8f22aef
commit c1289fe79b
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile.am
View File

@@ -165,7 +165,7 @@ noinst_LTLIBRARIES += \
# away when we depend on that. # away when we depend on that.
introspection_libnmdbus_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(GLIB_CFLAGS)) introspection_libnmdbus_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(GLIB_CFLAGS))
nodist_introspection_libnmdbus_la_SOURCES = \ introspection_sources = \
introspection/nmdbus-access-point.c \ introspection/nmdbus-access-point.c \
introspection/nmdbus-access-point.h \ introspection/nmdbus-access-point.h \
introspection/nmdbus-active-connection.c \ introspection/nmdbus-active-connection.c \
@@ -237,6 +237,8 @@ nodist_introspection_libnmdbus_la_SOURCES = \
introspection/nmdbus-vpn-plugin.c \ introspection/nmdbus-vpn-plugin.c \
introspection/nmdbus-vpn-plugin.h introspection/nmdbus-vpn-plugin.h
nodist_introspection_libnmdbus_la_SOURCES = $(introspection_sources)
DBUS_INTERFACE_DOCS = \ DBUS_INTERFACE_DOCS = \
introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml \ introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml \
introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml \ introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml \
@@ -290,9 +292,9 @@ $(basename $(1)).h: $(1)
@true @true
endef endef
$(foreach f,$(filter %.c,$(nodist_introspection_libnmdbus_la_SOURCES)),$(eval $(call _make_nmdbus_rule,$f))) $(foreach f,$(filter %.c,$(introspection_sources)),$(eval $(call _make_nmdbus_rule,$f)))
BUILT_SOURCES += $(nodist_introspection_libnmdbus_la_SOURCES) $(DBUS_INTERFACE_DOCS) BUILT_SOURCES += $(introspection_sources) $(DBUS_INTERFACE_DOCS)
EXTRA_DIST += \ EXTRA_DIST += \
introspection/nm-access-point.xml \ introspection/nm-access-point.xml \
@@ -724,6 +726,8 @@ libnm_libnm_la_SOURCES = \
$(libnm_libnm_la_sources) \ $(libnm_libnm_la_sources) \
$(libnm_libnm_la_private_headers) $(libnm_libnm_la_private_headers)
$(libnm_libnm_la_sources): $(introspection_sources)
EXTRA_libnm_libnm_la_DEPENDENCIES = \ EXTRA_libnm_libnm_la_DEPENDENCIES = \
libnm/libnm.ver libnm/libnm.ver
@@ -1183,6 +1187,8 @@ src_libNetworkManagerBase_la_SOURCES += \
src/platform/wifi/wifi-utils-wext.h src/platform/wifi/wifi-utils-wext.h
endif endif
$(src_libNetworkManagerBase_la_SOURCES): $(introspection_sources)
src_libNetworkManagerBase_la_LIBADD = \ src_libNetworkManagerBase_la_LIBADD = \
libnm-core/libnm-core.la \ libnm-core/libnm-core.la \
introspection/libnmdbus.la \ introspection/libnmdbus.la \
@@ -1354,6 +1360,8 @@ src_libNetworkManager_la_SOURCES = \
\ \
$(NULL) $(NULL)
$(src_libNetworkManager_la_SOURCES): $(introspection_sources)
src_libNetworkManager_la_LIBADD = \ src_libNetworkManager_la_LIBADD = \
src/libNetworkManagerBase.la \ src/libNetworkManagerBase.la \
src/libsystemd-nm.la \ src/libsystemd-nm.la \
@@ -2806,6 +2814,7 @@ dispatcher_libnm_dispatcher_core_la_LIBADD = \
libnm/libnm.la \ libnm/libnm.la \
$(GLIB_LIBS) $(GLIB_LIBS)
dispatcher/nm-dispatcher.c: $(introspection_sources)
dispatcher_nm_dispatcher_SOURCES = \ dispatcher_nm_dispatcher_SOURCES = \
shared/nm-dispatcher-api.h \ shared/nm-dispatcher-api.h \