plugin_ldflags = -no-undefined -module -avoid-version
-builtin_modules += dhcp
-builtin_sources += plugins/dhcp.c
-
if LOOPBACK
if LOOPBACK_BUILTIN
builtin_modules += loopback
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_modules += wifi_legacy
-builtin_sources += plugins/wifi-legacy.c \
- plugins/supplicant.h plugins/supplicant.c
+builtin_sources += plugins/wifi.c $(gsupplicant_sources)
+
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)
-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
builtin_sources += plugins/openconnect.c
+builtin_vpn_sources = plugins/vpn.c plugins/vpn.h
builtin_cflags += -DOPENCONNECT=\"@OPENCONNECT@\"
else
plugin_LTLIBRARIES += plugins/openconnect.la
if OPENVPN_BUILTIN
builtin_modules += openvpn
builtin_sources += plugins/openvpn.c
+builtin_vpn_sources = plugins/vpn.c plugins/vpn.h
builtin_cflags += -DOPENVPN=\"@OPENVPN@\"
else
plugin_LTLIBRARIES += plugins/openvpn.la
endif
endif
-if OPENCONNECT_BUILTIN
-builtin_sources += plugins/vpn.c plugins/vpn.h
+if VPNC
+if VPNC_BUILTIN
+builtin_modules += vpnc
+builtin_sources += plugins/vpnc.c
+builtin_vpn_sources = plugins/vpn.c plugins/vpn.h
+builtin_cflags += -DVPNC=\"@VPNC@\"
else
-if OPENVPN_BUILTIN
-builtin_sources += plugins/vpn.c plugins/vpn.h
+plugin_LTLIBRARIES += plugins/vpnc.la
+plugin_objects += $(plugins_vpnc_la_OBJECTS)
+plugins_vpnc_la_SOURCES = plugins/vpn.h plugins/vpn.c \
+ plugins/vpnc.c
+plugins_vpnc_la_CFLAGS = $(plugin_cflags) -DVPNC=\"@VPNC@\" \
+ -DSTATEDIR=\""$(statedir)"\" \
+ -DSCRIPTDIR=\""$(build_scriptdir)"\"
+plugins_vpnc_la_LDFLAGS = $(plugin_ldflags)
endif
endif
-if PORTAL
-if PORTAL_BUILTIN
-builtin_modules += portal
-builtin_sources += plugins/portal.c
-else
-plugin_LTLIBRARIES += plugins/portal.la
-plugin_objects += $(plugins_portal_la_OBJECTS)
-plugins_portal_la_CFLAGS = $(plugin_cflags)
-plugins_portal_la_LDFLAGS = $(plugin_ldflags)
-endif
-endif
-
-if DNSPROXY
-if DNSPROXY_BUILTIN
-builtin_modules += dnsproxy
-builtin_sources += plugins/dnsproxy.c
-else
-plugin_LTLIBRARIES += plugins/dnsproxy.la
-plugin_objects += $(plugins_dnsproxy_la_OBJECTS)
-plugins_dnsproxy_la_CFLAGS = $(plugin_cflags)
-plugins_dnsproxy_la_LDFLAGS = $(plugin_ldflags)
-endif
-endif
+builtin_sources += $(builtin_vpn_sources)
if PACRUNNER
if PACRUNNER_BUILTIN
if DATAFILES
policydir = @POLKIT_DATADIR@
-policy_DATA = plugins/connman.policy
+policy_DATA = plugins/net.connman.policy
endif
endif
script_PROGRAMS += scripts/openconnect-script
scripts_openconnect_script_LDADD = @DBUS_LIBS@
+else
+if VPNC
+script_PROGRAMS += scripts/openconnect-script
+
+scripts_openconnect_script_LDADD = @DBUS_LIBS@
+endif
endif
if OPENVPN
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
endif
endif
-EXTRA_DIST += plugins/polkit.policy scripts/dhclient.conf
+if NMCOMPAT
+if NMCOMPAT_BUILTIN
+builtin_modules += nmcompat
+builtin_sources += plugins/nmcompat.c
+else
+plugin_LTLIBRARIES += plugins/nmcompat.la
+plugin_objects += $(plugins_nmcompat_la_OBJECTS)
+plugins_nmcompat_la_CFLAGS = $(plugin_cflags)
+plugins_nmcompat_la_LDFLAGS = $(plugin_ldflags)
+endif
+endif
+
+if TIST
+if TIST_BUILTIN
+builtin_modules += tist
+builtin_sources += plugins/tist.c
+else
+plugin_LTLIBRARIES += plugins/tist.la
+plugin_objects += $(plugins_tist_la_OBJECTS)
+plugins_tist_la_CFLAGS = $(plugin_cflags)
+plugins_tist_la_LDFLAGS = $(plugin_ldflags)
+endif
+endif
+
+EXTRA_DIST += plugins/polkit.policy
-plugins/connman.policy: plugins/polkit.policy
+plugins/net.connman.policy: plugins/polkit.policy
if POLKIT
$(AM_V_GEN)cp $< $@
endif