Fix wifi plugin build issues when not built-in.

[framework/connectivity/connman.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6627e2f..55ff274 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,17 +28,19 @@ gdbus_sources = gdbus/gdbus.h gdbus/mainloop.c gdbus/watch.c \
 
 gdhcp_sources = gdhcp/gdhcp.h gdhcp/common.h gdhcp/common.c gdhcp/client.c
 
-gresolv_sources = gresolv/gresolv.h gresolv/gresolv.c
-
-gweb_sources = gweb/gweb.h gweb/gweb.c
-
-gsupplicant_sources = gsupplicant/gsupplicant.h gsupplicant/dbus.h \
-                       gsupplicant/supplicant.c gsupplicant/dbus.c
+gweb_sources = gweb/gweb.h gweb/gweb.c gweb/gresolv.h gweb/gresolv.c \
+                                       gweb/giognutls.h gweb/giognutls.c
 
 if DATAFILES
 dbusconfdir = @DBUS_CONFDIR@
 
 dbusconf_DATA = src/connman.conf
+
+if SYSTEMD
+systemdunitdir = @SYSTEMD_UNITDIR@
+
+systemdunit_DATA = src/connman.service
+endif
 endif
 
 plugin_LTLIBRARIES =
@@ -54,37 +56,27 @@ noinst_PROGRAMS =
 
 sbin_PROGRAMS = src/connmand
 
-src_connmand_SOURCES = $(gdbus_sources) $(gdhcp_sources) $(gresolv_sources) \
-                                       $(gweb_sources) $(builtin_sources) \
+src_connmand_SOURCES = $(gdbus_sources) $(gdhcp_sources) \
+                       gweb/gresolv.h gweb/gresolv.c \
+                       $(builtin_sources) src/connman.ver \
                        src/main.c src/connman.h src/log.c src/selftest.c \
                        src/error.c src/plugin.c src/task.c src/element.c \
                        src/device.c src/network.c src/connection.c \
                        src/manager.c src/profile.c src/service.c \
                        src/agent.c src/notifier.c src/provider.c \
-                       src/resolver.c src/ipconfig.c \
+                       src/resolver.c src/ipconfig.c src/detect.c \
                        src/ipv4.c src/dhcp.c src/rtnl.c src/inet.c \
                        src/utsname.c src/timeserver.c src/rfkill.c \
                        src/wifi.c src/storage.c src/dbus.c src/config.c \
                        src/technology.c src/counter.c src/location.c \
                        src/session.c src/tethering.c src/ondemand.c \
-                       src/wpad.c
-
-if UDEV
-src_connmand_SOURCES += src/udev.c
-else
-src_connmand_SOURCES += src/udev-compat.c
-endif
-
-if WIFI
-src_connmand_SOURCES += $(gsupplicant_sources)
-endif
+                       src/wpad.c src/stats.c src/iptables.c
 
 src_connmand_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ \
-                                       @CAPNG_LIBS@ @UDEV_LIBS@ -lresolv -ldl
-
-src_connmand_LDFLAGS = -Wl,--export-dynamic -Wl,--version-script=src/connman.ver
+                               @CAPNG_LIBS@ @XTABLES_LIBS@ -lresolv -ldl
 
-src_connmand_DEPENDENCIES = src/connman.ver
+src_connmand_LDFLAGS = -Wl,--export-dynamic \
+                               -Wl,--version-script=$(srcdir)/src/connman.ver
 
 CLEANFILES = src/connman.conf src/builtin.h $(local_headers)
 
@@ -104,8 +96,9 @@ build_plugindir = $(plugindir)
 build_scriptdir = $(scriptdir)
 endif
 
-AM_CFLAGS = @UDEV_CFLAGS@ @IPTC_CFLAGS@ @NETLINK_CFLAGS@ @CAPNG_CFLAGS@ \
-                       @DBUS_CFLAGS@ @GLIB_CFLAGS@ $(builtin_cflags) \
+AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@ @XTABLES_CFLAGS@ \
+                               @NETLINK_CFLAGS@ @GNUTLS_CFLAGS@ \
+                               $(builtin_cflags) \
                                -DCONNMAN_PLUGIN_BUILTIN \
                                -DSTATEDIR=\""$(statedir)"\" \
                                -DPLUGINDIR=\""$(build_plugindir)"\" \
@@ -131,10 +124,15 @@ client_cm_LDADD = @DBUS_LIBS@
 endif
 
 if TOOLS
-noinst_PROGRAMS += tools/wifi-scan tools/supplicant-test tools/dhcp-test \
+noinst_PROGRAMS += tools/wispr tools/wifi-scan \
+                       tools/supplicant-test tools/dhcp-test \
                        tools/addr-test tools/web-test tools/resolv-test \
                        tools/dbus-test tools/polkit-test tools/portal-test \
-                       tools/iptables-test tools/tap-test tools/wpad-test
+                       tools/iptables-test tools/tap-test tools/wpad-test \
+                       tools/stats-ringbuffer-dump
+
+tools_wispr_SOURCES = $(gweb_sources) tools/wispr.c
+tools_wispr_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ -lresolv
 
 tools_wifi_scan_LDADD = @GLIB_LIBS@ @NETLINK_LIBS@
 
@@ -144,12 +142,12 @@ tools_supplicant_test_SOURCES = $(gdbus_sources) tools/supplicant-test.c \
 tools_supplicant_test_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
 
 tools_web_test_SOURCES = $(gweb_sources) tools/web-test.c
-tools_web_test_LDADD = @GLIB_LIBS@
+tools_web_test_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ -lresolv
 
-tools_resolv_test_SOURCES = $(gresolv_sources) tools/resolv-test.c
+tools_resolv_test_SOURCES = gweb/gresolv.h gweb/gresolv.c tools/resolv-test.c
 tools_resolv_test_LDADD = @GLIB_LIBS@ -lresolv
 
-tools_wpad_test_SOURCES = $(gresolv_sources) tools/wpad-test.c
+tools_wpad_test_SOURCES = gweb/gresolv.h gweb/gresolv.c tools/wpad-test.c
 tools_wpad_test_LDADD = @GLIB_LIBS@ -lresolv
 
 tools_dhcp_test_SOURCES = $(gdhcp_sources) tools/dhcp-test.c
@@ -162,7 +160,7 @@ tools_polkit_test_LDADD = @DBUS_LIBS@
 
 tools_portal_test_LDADD = @GLIB_LIBS@
 
-tools_iptables_test_LDADD = @IPTC_LIBS@ -lip4tc -lxtables
+tools_iptables_test_LDADD = @GLIB_LIBS@ @XTABLES_LIBS@
 
 if DHCLIENT
 noinst_PROGRAMS += tools/dhclient-test
@@ -185,7 +183,7 @@ test_scripts = test/get-state test/list-profiles test/list-services \
                test/connect-vpn test/disconnect-vpn test/list-providers \
                test/monitor-manager test/test-counter test/set-ip-method \
                test/set-nameservers test/set-domains test/find-service \
-               test/get-services test/get-proxy-autoconfig \
+               test/get-services test/get-proxy-autoconfig test/set-proxy \
                test/enable-tethering test/disable-tethering test/backtrace
 
 if TEST
@@ -221,11 +219,11 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc \
                                --enable-pacrunner \
                                --enable-google \
                                --enable-meego \
-                               --enable-udev \
                                --enable-client \
                                --enable-portal \
                                --enable-hh2serial-gps \
                                --enable-ntpd \
+                               --enable-openconnect \
                                --enable-tools
 
 DISTCLEANFILES = $(pkgconfig_DATA)