X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.am;h=9d713aece841b1da3f85985ab66d2a4892b26260;hb=57156cc5738cfbf60e1b0ddf444ad6eec5964a0d;hp=4bb85cf3387aaf97b180587af660bc762d6078ea;hpb=abdb18855f7981fb740f8db89f2356c572dab484;p=framework%2Fconnectivity%2Fconnman.git diff --git a/Makefile.am b/Makefile.am index 4bb85cf..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 \ @@ -80,10 +82,10 @@ src_connmand_SOURCES = $(gdbus_sources) $(gdhcp_sources) \ src/technology.c src/counter.c src/ntp.c \ src/session.c src/tethering.c src/wpad.c src/wispr.c \ src/stats.c src/iptables.c src/dnsproxy.c src/6to4.c \ - src/ippool.c + 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,17 +140,21 @@ 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 \ tools/iptables-test tools/tap-test tools/wpad-test \ tools/stats-tool tools/private-network-test \ - tools/alg-test unit/test-session - -tools_wispr_SOURCES = $(gweb_sources) tools/wispr.c -tools_wispr_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ -lresolv + unit/test-session unit/test-ippool unit/test-nat tools_supplicant_test_SOURCES = $(gdbus_sources) tools/supplicant-test.c \ tools/supplicant-dbus.h tools/supplicant-dbus.c \ @@ -181,28 +187,35 @@ tools_iptables_test_LDADD = @GLIB_LIBS@ @XTABLES_LIBS@ tools_private_network_test_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ -tools_alg_test_LDADD = @GLIB_LIBS@ - unit_test_session_SOURCES = $(gdbus_sources) src/log.c src/dbus.c \ unit/test-session.c unit/utils.c unit/manager-api.c \ unit/session-api.c unit/test-connman.h unit_test_session_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ -ldl unit_objects += $(unit_test_session_OBJECTS) + +unit_test_ippool_SOURCES = $(gdbus_sources) src/log.c src/dbus.c \ + src/ippool.c unit/test-ippool.c +unit_test_ippool_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ -ldl +unit_objects += $(unit_test_ippool_OBJECTS) + +unit_test_nat_SOURCES = $(gdbus_sources) src/log.c src/dbus.c \ + src/iptables.c src/nat.c unit/test-nat.c +unit_test_nat_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ @XTABLES_LIBS@ -ldl +unit_objects += $(unit_nat_ippool_OBJECTS) endif test_scripts = test/get-state test/list-services \ - test/connect-service test/monitor-services test/set-address \ + 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/set-nameservers test/set-domains test/find-service \ test/get-services test/get-proxy-autoconfig test/set-proxy \ test/enable-tethering test/disable-tethering test/backtrace \ - test/test-session test/provision-service test/test-supplicant \ + test/test-session test/test-supplicant \ test/test-new-supplicant test/service-move-before \ test/set-global-timeservers test/get-global-timeservers \ - test/test-clock + test/set-nameservers test/set-domains if TEST testdir = $(pkglibdir)/test @@ -216,6 +229,8 @@ EXTRA_DIST += doc/overview-api.txt doc/behavior-api.txt \ doc/manager-api.txt doc/agent-api.txt \ doc/service-api.txt doc/technology-api.txt \ doc/counter-api.txt doc/config-format.txt \ + doc/clock-api.txt doc/session-api.txt \ + doc/session-overview.txt doc/backtrace.txt \ doc/advanced-configuration.txt @@ -225,19 +240,12 @@ pkgconfig_DATA = connman.pc DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc \ --disable-datafiles \ - --enable-loopback \ - --enable-ethernet \ - --enable-wifi \ - --enable-bluetooth \ - --enable-ofono \ - --enable-pacrunner \ - --enable-google \ - --enable-meego \ - --enable-client \ --enable-hh2serial-gps \ - --enable-ntpd \ --enable-openconnect \ - --enable-tools + --enable-openvpn \ + --enable-vpnc \ + --enable-nmcompat \ + --enable-polkit DISTCLEANFILES = $(pkgconfig_DATA)