diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2010-11-04 17:57:08 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-11-04 17:58:33 +0100 |
| commit | a4b1cedc2259acb78201d988a5f9483424386c42 (patch) | |
| tree | ff2e5c90510581cde8add14365fbd16b5bd0de80 | |
| parent | 035d6119b86a6c353ee0d17427ab2b3094a6573a (diff) | |
| download | connman-a4b1cedc2259acb78201d988a5f9483424386c42.tar.gz connman-a4b1cedc2259acb78201d988a5f9483424386c42.tar.bz2 connman-a4b1cedc2259acb78201d988a5f9483424386c42.zip | |
Fix wifi plugin build issues when not built-in.
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | Makefile.plugins | 8 |
2 files changed, 6 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index fbbde998..55ff2745 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,9 +31,6 @@ gdhcp_sources = gdhcp/gdhcp.h gdhcp/common.h gdhcp/common.c gdhcp/client.c gweb_sources = gweb/gweb.h gweb/gweb.c gweb/gresolv.h gweb/gresolv.c \ gweb/giognutls.h gweb/giognutls.c -gsupplicant_sources = gsupplicant/gsupplicant.h gsupplicant/dbus.h \ - gsupplicant/supplicant.c gsupplicant/dbus.c - if DATAFILES dbusconfdir = @DBUS_CONFDIR@ @@ -75,10 +72,6 @@ src_connmand_SOURCES = $(gdbus_sources) $(gdhcp_sources) \ src/session.c src/tethering.c src/ondemand.c \ src/wpad.c src/stats.c src/iptables.c -if WIFI -src_connmand_SOURCES += $(gsupplicant_sources) -endif - src_connmand_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ \ @CAPNG_LIBS@ @XTABLES_LIBS@ -lresolv -ldl diff --git a/Makefile.plugins b/Makefile.plugins index da0c12d3..07aa1db9 100644 --- a/Makefile.plugins +++ b/Makefile.plugins @@ -31,17 +31,21 @@ 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 +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 +plugins_wifi_la_SOURCES = plugins/wifi.c $(gsupplicant_sources) plugins_wifi_la_CFLAGS = $(plugin_cflags) plugins_wifi_la_LDFLAGS = $(plugin_ldflags) |