diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2010-10-30 15:04:03 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2010-10-30 15:04:03 +0200 |
| commit | b78b15020124785be38dec7fdbf5cc345517109a (patch) | |
| tree | 3896a54aee2d49f405a5b00b2c21c42b22594e80 /Makefile.am | |
| parent | 3f06a3d031f45bc45033f9088ebca9d0a5e9d45a (diff) | |
| download | connman-b78b15020124785be38dec7fdbf5cc345517109a.tar.gz connman-b78b15020124785be38dec7fdbf5cc345517109a.tar.bz2 connman-b78b15020124785be38dec7fdbf5cc345517109a.zip | |
Split usage of gweb/gresolv.[ch] and gweb/gweb.[ch] a little bit
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 72703689..fbbde998 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,7 +28,8 @@ 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 -gweb_sources = gweb/gweb.h gweb/gweb.c gweb/gresolv.h gweb/gresolv.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 @@ -59,7 +60,8 @@ noinst_PROGRAMS = sbin_PROGRAMS = src/connmand src_connmand_SOURCES = $(gdbus_sources) $(gdhcp_sources) \ - $(gweb_sources) $(builtin_sources) src/connman.ver \ + 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 \ @@ -136,8 +138,8 @@ noinst_PROGRAMS += tools/wispr tools/wifi-scan \ tools/iptables-test tools/tap-test tools/wpad-test \ tools/stats-ringbuffer-dump -tools_wispr_SOURCES = tools/wispr.c gweb/giognutls.h gweb/giognutls.c -tools_wispr_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ +tools_wispr_SOURCES = $(gweb_sources) tools/wispr.c +tools_wispr_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ -lresolv tools_wifi_scan_LDADD = @GLIB_LIBS@ @NETLINK_LIBS@ @@ -147,12 +149,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@ -lresolv +tools_web_test_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ -lresolv -tools_resolv_test_SOURCES = $(gweb_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 = $(gweb_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 |