X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.plugins;h=f959152c333cb8c864feaa9df882104cd7f98e86;hb=db22a96a0d172ddb68528fed5812a940f2318be9;hp=af3cfa0ba334912df704b77ef9a9152ce59b4d56;hpb=298b67120507e9f19fa60e56d8abbe4f870125cc;p=framework%2Fconnectivity%2Fconnman.git

diff --git a/Makefile.plugins b/Makefile.plugins
index af3cfa0..f959152 100644
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -3,69 +3,30 @@ plugin_cflags = -fvisibility=hidden -I$(srcdir)/gdbus \
 					@DBUS_CFLAGS@ @GLIB_CFLAGS@
 plugin_ldflags = -no-undefined -module -avoid-version
 
+script_cflags = -fvisibility=hidden -I$(srcdir)/gdbus \
+					@DBUS_CFLAGS@
 
 if LOOPBACK
-if LOOPBACK_BUILTIN
 builtin_modules += loopback
 builtin_sources += plugins/loopback.c
-else
-plugin_LTLIBRARIES += plugins/loopback.la
-plugin_objects += $(plugins_loopback_la_OBJECTS)
-plugins_loopback_la_CFLAGS = $(plugin_cflags)
-plugins_loopback_la_LDFLAGS = $(plugin_ldflags)
-endif
 endif
 
 if ETHERNET
-if ETHERNET_BUILTIN
 builtin_modules += ethernet
 builtin_sources += plugins/ethernet.c
-else
-plugin_LTLIBRARIES += plugins/ethernet.la
-plugin_objects += $(plugins_ethernet_la_OBJECTS)
-plugins_ethernet_la_CFLAGS = $(plugin_cflags)
-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 $(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 $(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 BLUETOOTH
-if BLUETOOTH_BUILTIN
 builtin_modules += bluetooth
 builtin_sources += plugins/bluetooth.c
-else
-plugin_LTLIBRARIES += plugins/bluetooth.la
-plugin_objects += $(plugins_bluetooth_la_OBJECTS)
-plugins_bluetooth_la_CFLAGS = $(plugin_cflags)
-plugins_bluetooth_la_LDFLAGS = $(plugin_ldflags)
-endif
 endif
 
 if HH2SERIAL_GPS
@@ -81,16 +42,13 @@ endif
 endif
 
 if OFONO
-if OFONO_BUILTIN
 builtin_modules += ofono
 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
+
+if DUNDEE
+builtin_modules += dundee
+builtin_sources += plugins/dundee.c
 endif
 
 if OPENCONNECT
@@ -147,66 +105,65 @@ plugins_vpnc_la_LDFLAGS = $(plugin_ldflags)
 endif
 endif
 
-builtin_sources += $(builtin_vpn_sources)
-
-if PORTAL
-if PORTAL_BUILTIN
-builtin_modules += portal
-builtin_sources += plugins/portal.c
+if L2TP
+if L2TP_BUILTIN
+builtin_modules += l2tp
+builtin_sources += plugins/l2tp.c
+builtin_vpn_sources = plugins/vpn.c plugins/vpn.h
+builtin_cflags += -DL2TP=\"@L2TP@\"
 else
-plugin_LTLIBRARIES += plugins/portal.la
-plugin_objects += $(plugins_portal_la_OBJECTS)
-plugins_portal_la_CFLAGS = $(plugin_cflags)
-plugins_portal_la_LDFLAGS = $(plugin_ldflags)
+plugin_LTLIBRARIES += plugins/l2tp.la
+plugin_objects += $(plugins_l2tp_la_OBJECTS)
+plugins_l2tp_la_SOURCES = plugins/vpn.h plugins/vpn.c \
+						plugins/l2tp.c
+plugins_l2tp_la_CFLAGS = $(plugin_cflags) -DL2TP=\"@L2TP@\" \
+					-DSTATEDIR=\""$(statedir)"\" \
+					-DSCRIPTDIR=\""$(build_scriptdir)"\"
+plugins_l2tp_la_LDFLAGS = $(plugin_ldflags)
 endif
 endif
 
-if PACRUNNER
-if PACRUNNER_BUILTIN
-builtin_modules += pacrunner
-builtin_sources += plugins/pacrunner.c
-else
-plugin_LTLIBRARIES += plugins/pacrunner.la
-plugin_objects += $(plugins_pacrunner_la_OBJECTS)
-plugins_pacrunner_la_CFLAGS = $(plugin_cflags)
-plugins_pacrunner_la_LDFLAGS = $(plugin_ldflags)
+if PPTP
+if PPTP_BUILTIN
+builtin_modules += pptp
+builtin_sources += plugins/pptp.c
+builtin_vpn_sources = plugins/vpn.c plugins/vpn.h
+builtin_cflags += -DPPPD=\"@PPPD@\" -DPPTP=\"@PPTP@\"
+else
+plugin_LTLIBRARIES += plugins/pptp.la
+plugin_objects += $(plugins_pptp_la_OBJECTS)
+plugins_pptp_la_SOURCES = plugins/vpn.h plugins/vpn.c \
+						plugins/pptp.c
+plugins_pptp_la_CFLAGS = $(plugin_cflags) -DPPPD=\"@PPPD@\" \
+					-DPPTP=\"@PPTP@\" \
+					-DSTATEDIR=\""$(statedir)"\" \
+					-DSCRIPTDIR=\""$(build_scriptdir)"\"
+plugins_pptp_la_LDFLAGS = $(plugin_ldflags)
 endif
 endif
 
-if GOOGLE
-if GOOGLE_BUILTIN
-builtin_modules += google
-builtin_sources += plugins/google.c
+if PPTP
+script_LTLIBRARIES += scripts/libppp-plugin.la
+scripts_libppp_plugin_la_LDFLAGS = $(script_cflags) @DBUS_CFLAGS@
+scripts_libppp_plugin_la_LIBADD = @DBUS_LIBS@
 else
-plugin_LTLIBRARIES += plugins/google.la
-plugin_objects += $(plugins_google_la_OBJECTS)
-plugins_google_la_CFLAGS = $(plugin_cflags)
-plugins_google_la_LDFLAGS = $(plugin_ldflags)
+if L2TP
+script_LTLIBRARIES += scripts/libppp-plugin.la
+scripts_libppp_plugin_la_LDFLAGS = $(script_cflags) @DBUS_CFLAGS@
+scripts_libppp_plugin_la_LIBADD = @DBUS_LIBS@
 endif
 endif
 
-if MEEGO
-if MEEGO_BUILTIN
-builtin_modules += meego
-builtin_sources += plugins/meego.c
-else
-plugin_LTLIBRARIES += plugins/meego.la
-plugin_objects += $(plugins_meego_la_OBJECTS)
-plugins_meego_la_CFLAGS = $(plugin_cflags)
-plugins_meego_la_LDFLAGS = $(plugin_ldflags)
-endif
+builtin_sources += $(builtin_vpn_sources)
+
+if PACRUNNER
+builtin_modules += pacrunner
+builtin_sources += plugins/pacrunner.c
 endif
 
 if POLKIT
-if POLKIT_BUILTIN
 builtin_modules += polkit
 builtin_sources += plugins/polkit.c
-else
-plugin_LTLIBRARIES += plugins/polkit.la
-plugin_objects += $(plugins_polkit_la_OBJECTS)
-plugins_polkit_la_CFLAGS = $(plugin_cflags)
-plugins_polkit_la_LDFLAGS = $(plugin_ldflags)
-endif
 
 if DATAFILES
 policydir = @POLKIT_DATADIR@
@@ -231,13 +188,6 @@ plugins_iospm_la_CFLAGS = $(plugin_cflags)
 plugins_iospm_la_LDFLAGS = $(plugin_ldflags)
 endif
 
-if FAKE
-plugin_LTLIBRARIES += plugins/fake.la
-plugin_objects += $(plugins_fake_la_OBJECTS)
-plugins_fake_la_CFLAGS = $(plugin_cflags)
-plugins_fake_la_LDFLAGS = $(plugin_ldflags)
-endif
-
 if OPENCONNECT
 script_PROGRAMS += scripts/openconnect-script
 
@@ -256,28 +206,20 @@ script_PROGRAMS += scripts/openvpn-script
 scripts_openvpn_script_LDADD = @DBUS_LIBS@
 endif
 
-if NTPD
-if NTPD_BUILTIN
-builtin_modules += ntpd
-builtin_sources += plugins/ntpd.c
-builtin_cflags += -DNTPD=\"@NTPD@\"
-else
-plugin_LTLIBRARIES += plugins/ntpd.la
-plugin_objects += $(plugins_ntpd_la_OBJECTS)
-plugins_ntpd_la_CFLAGS = $(plugin_cflags) -DNTPD=\"@NTPD@\"
-plugins_ntpd_la_LDFLAGS = $(plugin_ldflags)
-endif
-endif
-
 if NMCOMPAT
-if NMCOMPAT_BUILTIN
 builtin_modules += nmcompat
 builtin_sources += plugins/nmcompat.c
+endif
+
+if TIST
+if TIST_BUILTIN
+builtin_modules += tist
+builtin_sources += plugins/tist.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)
+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