gdbus: invaldate_parent_data: walk the whole path down

[framework/connectivity/connman.git] / Makefile.plugins

diff --git a/Makefile.plugins b/Makefile.plugins
index da0c12d..025e972 100644 (file)
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -31,17 +31,21 @@ plugins_ethernet_la_LDFLAGS = $(plugin_ldflags)
 endif
 endif
 
+gsupplicant_sources = gsupplicant/gsupplicant.h gsupplicant/dbus.h \
+                       gsupplicant/supplicant.c gsupplicant/dbus.c
+
 if WIFI
 if WIFI_BUILTIN
 builtin_modules += wifi
-builtin_sources += plugins/wifi.c
+builtin_sources += plugins/wifi.c $(gsupplicant_sources)
+
 builtin_modules += wifi_legacy
 builtin_sources += plugins/wifi-legacy.c \
                        plugins/supplicant.h plugins/supplicant.c
 else
 plugin_LTLIBRARIES += plugins/wifi.la
 plugin_objects += $(plugins_wifi_la_OBJECTS)
-plugins_wifi_la_SOURCES = plugins/wifi.c
+plugins_wifi_la_SOURCES = plugins/wifi.c $(gsupplicant_sources)
 plugins_wifi_la_CFLAGS = $(plugin_cflags)
 plugins_wifi_la_LDFLAGS = $(plugin_ldflags)
 
@@ -82,30 +86,16 @@ endif
 if OFONO
 if OFONO_BUILTIN
 builtin_modules += ofono
-builtin_sources += plugins/ofono.c
+builtin_sources += plugins/mcc.h plugins/ofono.c
 else
 plugin_LTLIBRARIES += plugins/ofono.la
 plugin_objects += $(plugins_ofono_la_OBJECTS)
+plugins_ofono_la_SOURCES = plugins/mcc.h plugins/ofono.c
 plugins_ofono_la_CFLAGS = $(plugin_cflags)
 plugins_ofono_la_LDFLAGS = $(plugin_ldflags)
 endif
 endif
 
-if DHCLIENT
-if DHCLIENT_BUILTIN
-builtin_modules += dhclient
-builtin_sources += plugins/dhclient.c
-builtin_cflags += -DDHCLIENT=\"@DHCLIENT@\"
-else
-plugin_LTLIBRARIES += plugins/dhclient.la
-plugin_objects += $(plugins_dhclient_la_OBJECTS)
-plugins_dhclient_la_CFLAGS = $(plugin_cflags) -DDHCLIENT=\"@DHCLIENT@\" \
-                                       -DSTATEDIR=\""$(statedir)"\" \
-                                       -DSCRIPTDIR=\""$(build_scriptdir)"\"
-plugins_dhclient_la_LDFLAGS = $(plugin_ldflags)
-endif
-endif
-
 if OPENCONNECT
 if OPENCONNECT_BUILTIN
 builtin_modules += openconnect
@@ -261,13 +251,6 @@ script_PROGRAMS += scripts/openvpn-script
 scripts_openvpn_script_LDADD = @DBUS_LIBS@
 endif
 
-if DHCLIENT
-script_DATA += scripts/dhclient.conf
-script_PROGRAMS += scripts/dhclient-script
-
-scripts_dhclient_script_LDADD = @DBUS_LIBS@
-endif
-
 if NTPD
 if NTPD_BUILTIN
 builtin_modules += ntpd
@@ -281,7 +264,7 @@ plugins_ntpd_la_LDFLAGS = $(plugin_ldflags)
 endif
 endif
 
-EXTRA_DIST += plugins/polkit.policy scripts/dhclient.conf
+EXTRA_DIST += plugins/polkit.policy
 
 plugins/connman.policy: plugins/polkit.policy
 if POLKIT