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

Side by Side Diff: Makefile.am

Issue 6659006: flimflam: add support for multiple profiles (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/flimflam.git@master
Patch Set: more ers comments Created 9 years, 8 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 AM_MAKEFLAGS = --no-print-directory 2 AM_MAKEFLAGS = --no-print-directory
3 3
4 includedir = @includedir@/connman 4 includedir = @includedir@/connman
5 5
6 include_HEADERS = include/types.h include/log.h include/plugin.h \ 6 include_HEADERS = include/types.h include/log.h include/plugin.h \
7 include/security.h include/notifier.h \ 7 include/security.h include/notifier.h \
8 include/storage.h include/service.h \ 8 include/storage.h include/service.h \
9 include/device.h include/network.h include/inet.h \ 9 include/device.h include/network.h include/inet.h \
10 include/crypto.h include/blob.h 10 include/crypto.h include/blob.h
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 src/builtin.h $(local_headers) 73 src/builtin.h $(local_headers)
74 74
75 statedir = $(localstatedir)/run/flimflam 75 statedir = $(localstatedir)/run/flimflam
76 76
77 plugindir = $(libdir)/flimflam/plugins 77 plugindir = $(libdir)/flimflam/plugins
78 78
79 scriptdir = $(libdir)/flimflam/scripts 79 scriptdir = $(libdir)/flimflam/scripts
80 80
81 storagedir = $(localstatedir)/cache/flimflam 81 storagedir = $(localstatedir)/cache/flimflam
82 82
83 storage_homedir = @STORAGE_HOMEDIR@
84
83 testdir = $(libdir)/flimflam/test 85 testdir = $(libdir)/flimflam/test
84 86
85 if MAINTAINER_MODE 87 if MAINTAINER_MODE
86 build_plugindir = $(abs_top_srcdir)/plugins/.libs 88 build_plugindir = $(abs_top_srcdir)/plugins/.libs
87 build_scriptdir = $(abs_top_srcdir)/scripts 89 build_scriptdir = $(abs_top_srcdir)/scripts
88 else 90 else
89 build_plugindir = $(plugindir) 91 build_plugindir = $(plugindir)
90 build_scriptdir = $(scriptdir) 92 build_scriptdir = $(scriptdir)
91 endif 93 endif
92 94
93 AM_CFLAGS = -Wall -Werror \ 95 AM_CFLAGS = -Wall -Werror \
94 @UDEV_CFLAGS@ @NETLINK_CFLAGS@ @DBUS_CFLAGS@ \ 96 @UDEV_CFLAGS@ @NETLINK_CFLAGS@ @DBUS_CFLAGS@ \
95 @GLIB_CFLAGS@ @GTHREAD_CFLAGS@ @SSL_ROOTS_CFLAGS@ \ 97 @GLIB_CFLAGS@ @GTHREAD_CFLAGS@ @SSL_ROOTS_CFLAGS@ \
96 $(builtin_cflags) \ 98 $(builtin_cflags) \
97 -DCONNMAN_PLUGIN_BUILTIN \ 99 -DCONNMAN_PLUGIN_BUILTIN \
98 -DSTATEDIR=\""$(statedir)"\" \ 100 -DSTATEDIR=\""$(statedir)"\" \
99 -DPLUGINDIR=\""$(build_plugindir)"\" \ 101 -DPLUGINDIR=\""$(build_plugindir)"\" \
100 -DSCRIPTDIR=\""$(build_scriptdir)"\" \ 102 -DSCRIPTDIR=\""$(build_scriptdir)"\" \
101 » » » » -DSTORAGEDIR=\""$(storagedir)\"" 103 » » » » -DSTORAGEDIR=\""$(storagedir)\"" \
104 » » » » -DSTORAGE_HOMEDIR=\""${storage_homedir}"\"
102 105
103 INCLUDES = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus 106 INCLUDES = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus
104 107
105 EXTRA_DIST = src/genbuiltin src/flimflam-dbus.conf src/flimflam-polkit.conf 108 EXTRA_DIST = src/genbuiltin src/flimflam-dbus.conf src/flimflam-polkit.conf
106 109
107 110
108 script_DATA = 111 script_DATA =
109 script_PROGRAMS = 112 script_PROGRAMS =
110 script_SCRIPTS = 113 script_SCRIPTS =
111 script_LTLIBRARIES = 114 script_LTLIBRARIES =
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 include/connman/version.h: include/version.h 240 include/connman/version.h: include/version.h
238 $(AM_V_at)$(MKDIR_P) include/connman 241 $(AM_V_at)$(MKDIR_P) include/connman
239 $(AM_V_GEN)$(LN_S) $(abs_top_builddir)/$< $@ 242 $(AM_V_GEN)$(LN_S) $(abs_top_builddir)/$< $@
240 243
241 include/connman/%.h: include/%.h 244 include/connman/%.h: include/%.h
242 $(AM_V_at)$(MKDIR_P) include/connman 245 $(AM_V_at)$(MKDIR_P) include/connman
243 $(AM_V_GEN)$(LN_S) $(abs_top_srcdir)/$< $@ 246 $(AM_V_GEN)$(LN_S) $(abs_top_srcdir)/$< $@
244 247
245 clean-local: include/connman 248 clean-local: include/connman
246 @$(RM) -r $< 249 @$(RM) -r $<
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