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

Side by Side 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: Add gateway when requested 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | configure.ac » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 plugin_cflags = -Wall -Werror -fvisibility=hidden \ 2 plugin_cflags = -Wall -Werror -fvisibility=hidden \
3 -I$(srcdir)/gdbus @DBUS_CFLAGS@ \ 3 -I$(srcdir)/gdbus @DBUS_CFLAGS@ \
4 @GLIB_CFLAGS@ @SSL_ROOTS_CFLAGS@ 4 @GLIB_CFLAGS@ @SSL_ROOTS_CFLAGS@
5 plugin_ldflags = -no-undefined -module -avoid-version 5 plugin_ldflags = -no-undefined -module -avoid-version
6 6
7 7
8 if LOOPBACK 8 if LOOPBACK
9 if LOOPBACK_BUILTIN 9 if LOOPBACK_BUILTIN
10 builtin_modules += loopback 10 builtin_modules += loopback
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 plugin_LTLIBRARIES += plugins/openvpn.la 134 plugin_LTLIBRARIES += plugins/openvpn.la
135 plugin_objects += $(plugins_openvpn_la_OBJECTS) 135 plugin_objects += $(plugins_openvpn_la_OBJECTS)
136 plugins_openvpn_la_SOURCES = plugins/vpn.h plugins/vpn.c plugins/openvpn.c 136 plugins_openvpn_la_SOURCES = plugins/vpn.h plugins/vpn.c plugins/openvpn.c
137 plugins_openvpn_la_CFLAGS = $(plugin_cflags) -DOPENVPN=\"@OPENVPN@\" \ 137 plugins_openvpn_la_CFLAGS = $(plugin_cflags) -DOPENVPN=\"@OPENVPN@\" \
138 -DSTATEDIR=\""$(statedir)"\" \ 138 -DSTATEDIR=\""$(statedir)"\" \
139 -DSCRIPTDIR=\""$(build_scriptdir)"\" 139 -DSCRIPTDIR=\""$(build_scriptdir)"\"
140 plugins_openvpn_la_LDFLAGS = $(plugin_ldflags) 140 plugins_openvpn_la_LDFLAGS = $(plugin_ldflags)
141 endif 141 endif
142 endif 142 endif
143 143
144 if L2TPIPSEC
145 if L2TPIPSEC_BUILTIN
146 builtin_modules += l2tpipsec
147 builtin_sources += plugins/l2tpipsec.c
148 builtin_cflags += -DL2TPIPSEC=\"@L2TPIPSEC@\"
149 else
150 plugin_LTLIBRARIES += plugins/l2tpipsec.la
151 plugin_objects += $(plugins_l2tpipsec_la_OBJECTS)
152 plugins_l2tpipsec_la_SOURCES = plugins/vpn.h plugins/vpn.c plugins/l2tipsec.c
153 plugins_l2tpipsec_la_CFLAGS = $(plugin_cflags) -DL2TPIPSEC=\"@L2TPIPSEC@\" \
154 -DSTATEDIR=\""$(statedir)"\" \
155 -DSCRIPTDIR=\""$(build_scriptdir)"\"
156 plugins_l2tpipsec_la_LDFLAGS = $(plugin_ldflags)
157 endif
158 endif
159
160 if L2TPIPSEC_BUILTIN
161 builtin_sources += plugins/vpn.h plugins/vpn.c
162 else
144 if OPENVPN_BUILTIN 163 if OPENVPN_BUILTIN
145 builtin_sources += plugins/vpn.h plugins/vpn.c 164 builtin_sources += plugins/vpn.h plugins/vpn.c
146 endif 165 endif
166 endif
147 167
148 if PORTAL_CHECK 168 if PORTAL_CHECK
149 if PORTAL_CHECK_BUILTIN 169 if PORTAL_CHECK_BUILTIN
150 builtin_modules += portal_check 170 builtin_modules += portal_check
151 builtin_sources += plugins/portal_check.c 171 builtin_sources += plugins/portal_check.c
152 builtin_cflags += 172 builtin_cflags +=
153 builtin_libadd += -lcurl 173 builtin_libadd += -lcurl
154 else 174 else
155 plugin_LTLIBRARIES += plugins/portal_check.la 175 plugin_LTLIBRARIES += plugins/portal_check.la
156 plugin_objects += $(plugins_portal_check_la_OBJECTS) 176 plugin_objects += $(plugins_portal_check_la_OBJECTS)
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 endif 292 endif
273 endif 293 endif
274 294
275 if PPPD 295 if PPPD
276 script_PROGRAMS += scripts/pppd-script 296 script_PROGRAMS += scripts/pppd-script
277 script_SCRIPTS += scripts/60-flimflam.sh 297 script_SCRIPTS += scripts/60-flimflam.sh
278 298
279 scripts_pppd_script_LDADD = @DBUS_LIBS@ 299 scripts_pppd_script_LDADD = @DBUS_LIBS@
280 endif 300 endif
281 301
302 if L2TPIPSEC
303 script_LTLIBRARIES += scripts/libppp-plugin.la
304 scripts_libppp_plugin_la_LIBADD = @DBUS_LIBS@
305 endif
306
282 if NEWWIFI 307 if NEWWIFI
283 script_DATA += scripts/wpa_supplicant.conf 308 script_DATA += scripts/wpa_supplicant.conf
284 endif 309 endif
285 310
286 if OPENVPN 311 if OPENVPN
287 script_PROGRAMS += scripts/openvpn-script 312 script_PROGRAMS += scripts/openvpn-script
288 313
289 scripts_openvpn_script_LDADD = @DBUS_LIBS@ 314 scripts_openvpn_script_LDADD = @DBUS_LIBS@
290 endif 315 endif
291 316
292 EXTRA_DIST += plugins/polkit.policy scripts/dhclient.conf 317 EXTRA_DIST += plugins/polkit.policy scripts/dhclient.conf
293 318
294 plugins/flimflam.policy: plugins/polkit.policy 319 plugins/flimflam.policy: plugins/polkit.policy
295 if POLKIT 320 if POLKIT
296 $(AM_V_GEN)cp $< $@ 321 $(AM_V_GEN)cp $< $@
297 endif 322 endif
OLDNEW
« no previous file with comments | « no previous file | configure.ac » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698