build: add explicit dependency objects to generated source files

BUILT_DIR only matters during `make all` and `make check`.
This commit is contained in:
Thomas Haller 2016-11-22 18:09:19 +01:00
parent 53496b3bb7
commit 99bf51d3c7

View file

@ -339,6 +339,12 @@ BUILT_SOURCES += \
$(introspection_sources) \ $(introspection_sources) \
$(DBUS_INTERFACE_DOCS) $(DBUS_INTERFACE_DOCS)
$(dispatcher_libnm_dispatcher_core_la_OBJECTS): $(introspection_sources)
$(dispatcher_nm_dispatcher_OBJECTS): $(introspection_sources)
$(libnm_libnm_la_OBJECTS): $(introspection_sources)
$(src_libNetworkManager_la_OBJECTS): $(introspection_sources)
$(src_libNetworkManagerBase_la_OBJECTS): $(introspection_sources)
EXTRA_DIST += \ EXTRA_DIST += \
$(dbusinterfaces_DATA) $(dbusinterfaces_DATA)
@ -484,7 +490,23 @@ GLIB_GENERATED += \
$(libnm_core_lib_c_mkenums) $(libnm_core_lib_c_mkenums)
nm_core_enum_types_sources = $(libnm_core_lib_h_pub_real) nm_core_enum_types_sources = $(libnm_core_lib_h_pub_real)
$(libnm_core_libnm_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(dispatcher_libnm_dispatcher_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(dispatcher_nm_dispatcher_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(libnm_core_libnm_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(libnm_libnm_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(libnm_tests_libnm_vpn_plugin_utils_test_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_NetworkManager_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_settings_plugins_ibft_libnms_ibft_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
if CONFIG_PLUGIN_IFCFG_RH
$(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
endif
$(src_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_devices_team_libnm_device_plugin_team_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_devices_wwan_libnm_device_plugin_wwan_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
libnm_core_libnm_core_la_CPPFLAGS = \ libnm_core_libnm_core_la_CPPFLAGS = \
$(dflt_cppflags_libnm_core) \ $(dflt_cppflags_libnm_core) \
@ -742,7 +764,10 @@ nm_enum_types_sources = \
nm_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include <nm-core-enum-types.h>\n' nm_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include <nm-core-enum-types.h>\n'
nm_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n' nm_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n'
$(libnm_libnm_la_OBJECTS): $(libnm_lib_h_pub_mkenums) $(dispatcher_nm_dispatcher_OBJECTS): $(libnm_lib_h_pub_mkenums)
$(dispatcher_libnm_dispatcher_core_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
$(libnm_libnm_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
$(libnm_tests_libnm_vpn_plugin_utils_test_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
libnm_libnm_la_CPPFLAGS = \ libnm_libnm_la_CPPFLAGS = \
$(dflt_cppflags_libnm_core) \ $(dflt_cppflags_libnm_core) \
@ -763,8 +788,6 @@ nodist_libnm_libnm_la_SOURCES = \
$(libnm_lib_h_pub_mkenums) \ $(libnm_lib_h_pub_mkenums) \
$(libnm_lib_c_mkenums) $(libnm_lib_c_mkenums)
$(libnm_libnm_la_OBJECTS): $(introspection_sources)
EXTRA_libnm_libnm_la_DEPENDENCIES = \ EXTRA_libnm_libnm_la_DEPENDENCIES = \
libnm/libnm.ver libnm/libnm.ver
@ -1219,8 +1242,6 @@ src_libNetworkManagerBase_la_SOURCES += \
src/platform/wifi/wifi-utils-wext.h src/platform/wifi/wifi-utils-wext.h
endif endif
$(src_libNetworkManagerBase_la_OBJECTS): $(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 \
@ -1392,8 +1413,6 @@ src_libNetworkManager_la_SOURCES = \
\ \
$(NULL) $(NULL)
$(src_libNetworkManager_la_OBJECTS): $(introspection_sources)
src_libNetworkManager_la_LIBADD = \ src_libNetworkManager_la_LIBADD = \
src/libNetworkManagerBase.la \ src/libNetworkManagerBase.la \
src/libsystemd-nm.la \ src/libsystemd-nm.la \
@ -1760,6 +1779,8 @@ src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h: src/settings/plugins/ifcfg-rh/n
src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c: src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c: src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h
@true @true
$(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h
############################################################################### ###############################################################################
src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES = \ src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES = \
@ -1775,8 +1796,6 @@ src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES = \
src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS = $(src_settings_plugins_ifcfg_rh_cppflags) src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS = $(src_settings_plugins_ifcfg_rh_cppflags)
$(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
############################################################################### ###############################################################################
src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES = \ src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES = \
@ -1795,9 +1814,6 @@ src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LIBADD = \
src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \ src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \
src/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la src/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la
$(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h
check-local-symbols-settings-ifcfg-rh: src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la check-local-symbols-settings-ifcfg-rh: src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la
$(call check_so_symbols,$(builddir)/src/settings/plugins/ifcfg-rh/.libs/libnm-settings-plugin-ifcfg-rh.so) $(call check_so_symbols,$(builddir)/src/settings/plugins/ifcfg-rh/.libs/libnm-settings-plugin-ifcfg-rh.so)
@ -2806,8 +2822,6 @@ dispatcher_libnm_dispatcher_core_la_LIBADD = \
libnm/libnm.la \ libnm/libnm.la \
$(GLIB_LIBS) $(GLIB_LIBS)
$(dispatcher_nm_dispatcher_OBJECTS): $(introspection_sources)
dispatcher_nm_dispatcher_SOURCES = \ dispatcher_nm_dispatcher_SOURCES = \
shared/nm-dispatcher-api.h \ shared/nm-dispatcher-api.h \
dispatcher/nm-dispatcher.c dispatcher/nm-dispatcher.c