X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.am;h=9d713aece841b1da3f85985ab66d2a4892b26260;hb=57156cc5738cfbf60e1b0ddf444ad6eec5964a0d;hp=eafbe4141f0478a16f7adc0f6b0291ad7e4238e0;hpb=d9724d24b091a9412992cc6883ca6a225fa1a88c;p=framework%2Fconnectivity%2Fconnman.git

diff --git a/Makefile.am b/Makefile.am
index eafbe41..9d713ae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,8 +27,13 @@ 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 \
 		gdhcp/server.c gdhcp/ipv4ll.h gdhcp/ipv4ll.c
 
-gweb_sources = gweb/gweb.h gweb/gweb.c gweb/gresolv.h gweb/gresolv.c \
-					gweb/giognutls.h gweb/giognutls.c
+gweb_sources = gweb/gweb.h gweb/gweb.c gweb/gresolv.h gweb/gresolv.c
+
+if WISPR
+gweb_sources += gweb/giognutls.h gweb/giognutls.c
+else
+gweb_sources += gweb/giognutls.h gweb/gionotls.c
+endif
 
 if DATAFILES
 
@@ -62,10 +67,7 @@ unit_objects =
 
 sbin_PROGRAMS = src/connmand
 
-src_connmand_SOURCES = $(gdbus_sources) $(gdhcp_sources) \
-			gweb/gweb.h gweb/gweb.c \
-			gweb/gresolv.h gweb/gresolv.c \
-			gweb/giognutls.h gweb/gionotls.c \
+src_connmand_SOURCES = $(gdbus_sources) $(gdhcp_sources) $(gweb_sources) \
 			$(builtin_sources) src/connman.ver \
 			src/main.c src/connman.h src/log.c \
 			src/error.c src/plugin.c src/task.c \
@@ -83,7 +85,7 @@ src_connmand_SOURCES = $(gdbus_sources) $(gdhcp_sources) \
 			src/ippool.c src/bridge.c src/nat.c
 
 src_connmand_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ \
-				@CAPNG_LIBS@ @XTABLES_LIBS@ -lresolv -ldl
+				@XTABLES_LIBS@ @GNUTLS_LIBS@ -lresolv -ldl
 
 src_connmand_LDFLAGS = -Wl,--export-dynamic \
 				-Wl,--version-script=$(srcdir)/src/connman.ver
@@ -110,7 +112,7 @@ build_plugindir = $(plugindir)
 build_scriptdir = $(scriptdir)
 endif
 
-AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@ @XTABLES_CFLAGS@ \
+AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ \
 				@GNUTLS_CFLAGS@ $(builtin_cflags) \
 				-DCONNMAN_PLUGIN_BUILTIN \
 				-DSTATEDIR=\""$(statedir)"\" \
@@ -122,7 +124,7 @@ AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@ @XTABLES_CFLAGS@ \
 INCLUDES = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus
 
 EXTRA_DIST = src/genbuiltin src/connman-dbus.conf src/connman-polkit.conf \
-		plugins/connman-nmcompat.conf
+						plugins/connman-nmcompat.conf
 
 
 script_DATA =
@@ -138,8 +140,15 @@ client_cm_SOURCES = client/main.c
 client_cm_LDADD = @DBUS_LIBS@
 endif
 
+if WISPR
+noinst_PROGRAMS += tools/wispr
+
+tools_wispr_SOURCES = $(gweb_sources) tools/wispr.c
+tools_wispr_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ -lresolv
+endif
+
 if TOOLS
-noinst_PROGRAMS += tools/wispr tools/supplicant-test \
+noinst_PROGRAMS += tools/supplicant-test \
 			tools/dhcp-test tools/dhcp-server-test \
 			tools/addr-test tools/web-test tools/resolv-test \
 			tools/dbus-test tools/polkit-test \
@@ -147,9 +156,6 @@ noinst_PROGRAMS += tools/wispr tools/supplicant-test \
 			tools/stats-tool tools/private-network-test \
 			unit/test-session unit/test-ippool unit/test-nat
 
-tools_wispr_SOURCES = $(gweb_sources) tools/wispr.c
-tools_wispr_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ -lresolv
-
 tools_supplicant_test_SOURCES = $(gdbus_sources) tools/supplicant-test.c \
 			tools/supplicant-dbus.h tools/supplicant-dbus.c \
 			tools/supplicant.h tools/supplicant.c
@@ -202,7 +208,7 @@ test_scripts = test/get-state test/list-services \
 		test/monitor-services test/test-clock \
 		test/simple-agent test/show-introspection test/test-compat \
 		test/test-manager test/test-connman test/monitor-connman \
-		test/connect-vpn test/disconnect-vpn test/monitor-manager \
+		test/connect-vpn test/disconnect-vpn \
 		test/test-counter test/set-ipv4-method test/set-ipv6-method \
 		test/get-services test/get-proxy-autoconfig test/set-proxy \
 		test/enable-tethering test/disable-tethering test/backtrace \
@@ -236,6 +242,8 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc \
 				--disable-datafiles \
 				--enable-hh2serial-gps \
 				--enable-openconnect \
+				--enable-openvpn \
+				--enable-vpnc \
 				--enable-nmcompat \
 				--enable-polkit