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 plugins/supplicant.h plugins/supplicant.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/supplicant.h plugins/supplicant.c
+plugins_wifi_la_SOURCES = plugins/wifi.c $(gsupplicant_sources)
plugins_wifi_la_CFLAGS = $(plugin_cflags)
plugins_wifi_la_LDFLAGS = $(plugin_ldflags)
+
+plugin_LTLIBRARIES += plugins/wifi_legacy.la
+plugin_objects += $(plugins_wifi_legacy_la_OBJECTS)
+plugins_wifi_legacy_la_SOURCES = plugins/wifi-legacy.c \
+ plugins/supplicant.h plugins/supplicant.c
+plugins_wifi_legacy_la_CFLAGS = $(plugin_cflags)
+plugins_wifi_legacy_la_LDFLAGS = $(plugin_ldflags)
+
endif
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
else
plugin_LTLIBRARIES += plugins/openconnect.la
plugin_objects += $(plugins_openconnect_la_OBJECTS)
+plugins_openconnect_la_SOURCES = plugins/vpn.h plugins/vpn.c \
+ plugins/openconnect.c
plugins_openconnect_la_CFLAGS = $(plugin_cflags) -DOPENCONNECT=\"@OPENCONNECT@\" \
-DSTATEDIR=\""$(statedir)"\" \
-DSCRIPTDIR=\""$(build_scriptdir)"\"
endif
endif
+if OPENVPN
+if OPENVPN_BUILTIN
+builtin_modules += openvpn
+builtin_sources += plugins/openvpn.c
+builtin_cflags += -DOPENVPN=\"@OPENVPN@\"
+else
+plugin_LTLIBRARIES += plugins/openvpn.la
+plugin_objects += $(plugins_openvpn_la_OBJECTS)
+plugins_openvpn_la_SOURCES = plugins/vpn.h plugins/vpn.c \
+ plugins/openvpn.c
+plugins_openvpn_la_CFLAGS = $(plugin_cflags) -DOPENVPN=\"@OPENVPN@\" \
+ -DSTATEDIR=\""$(statedir)"\" \
+ -DSCRIPTDIR=\""$(build_scriptdir)"\"
+plugins_openvpn_la_LDFLAGS = $(plugin_ldflags)
+endif
+endif
+
+if OPENCONNECT_BUILTIN
+builtin_sources += plugins/vpn.c plugins/vpn.h
+else
+if OPENVPN_BUILTIN
+builtin_sources += plugins/vpn.c plugins/vpn.h
+endif
+endif
+
if PORTAL
if PORTAL_BUILTIN
builtin_modules += portal
plugins_fake_la_LDFLAGS = $(plugin_ldflags)
endif
-
if OPENCONNECT
script_PROGRAMS += scripts/openconnect-script
scripts_openconnect_script_LDADD = @DBUS_LIBS@
endif
-if DHCLIENT
-script_DATA += scripts/dhclient.conf
-script_PROGRAMS += scripts/dhclient-script
+if OPENVPN
+script_PROGRAMS += scripts/openvpn-script
-scripts_dhclient_script_LDADD = @DBUS_LIBS@
+scripts_openvpn_script_LDADD = @DBUS_LIBS@
endif
if NTPD
endif
endif
-EXTRA_DIST += plugins/polkit.policy scripts/dhclient.conf
+EXTRA_DIST += plugins/polkit.policy
plugins/connman.policy: plugins/polkit.policy
if POLKIT