Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(273)

Unified Diff: Makefile.plugins

Issue 6513009: flimflam: Add L2TP/IPsec VPN plugin (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/flimflam.git@master
Patch Set: Remove local, add params Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | configure.ac » ('j') | plugins/l2tpipsec.c » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Makefile.plugins
diff --git a/Makefile.plugins b/Makefile.plugins
index 683828cf856da2967302b2c3853a473f789e86f4..540ab6ab3d417a69097fbe44a1254a759a5021ed 100644
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -141,9 +141,29 @@ plugins_openvpn_la_LDFLAGS = $(plugin_ldflags)
endif
endif
+if L2TPIPSEC
+if L2TPIPSEC_BUILTIN
+builtin_modules += l2tpipsec
+builtin_sources += plugins/l2tpipsec.c
+builtin_cflags += -DL2TPIPSEC=\"@L2TPIPSEC@\"
+else
+plugin_LTLIBRARIES += plugins/l2tpipsec.la
+plugin_objects += $(plugins_l2tpipsec_la_OBJECTS)
+plugins_l2tpipsec_la_SOURCES = plugins/vpn.h plugins/vpn.c plugins/l2tipsec.c
+plugins_l2tpipsec_la_CFLAGS = $(plugin_cflags) -DL2TPIPSEC=\"@L2TPIPSEC@\" \
+ -DSTATEDIR=\""$(statedir)"\" \
+ -DSCRIPTDIR=\""$(build_scriptdir)"\"
+plugins_l2tpipsec_la_LDFLAGS = $(plugin_ldflags)
+endif
+endif
+
+if L2TPIPSEC_BUILTIN
+builtin_sources += plugins/vpn.h plugins/vpn.c
+else
if OPENVPN_BUILTIN
builtin_sources += plugins/vpn.h plugins/vpn.c
endif
+endif
if PORTAL_CHECK
if PORTAL_CHECK_BUILTIN
@@ -279,6 +299,11 @@ script_SCRIPTS += scripts/60-flimflam.sh
scripts_pppd_script_LDADD = @DBUS_LIBS@
endif
+if L2TPIPSEC
+script_LTLIBRARIES += scripts/libppp-plugin.la
+scripts_libppp_plugin_la_LIBADD = @DBUS_LIBS@
+endif
+
if NEWWIFI
script_DATA += scripts/wpa_supplicant.conf
endif
« no previous file with comments | « no previous file | configure.ac » ('j') | plugins/l2tpipsec.c » ('J')

Powered by Google App Engine
This is Rietveld 408576698