diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2010-10-04 18:08:49 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2010-10-04 18:08:49 +0200 |
| commit | 3ede326ea0d22c4e264f8ab154acfd84eea69147 (patch) | |
| tree | ef0aeaa0492932c47578bcd9a614abf96aea8dee | |
| parent | 32578a6c5c7d59981f636a332b6dd753207db1ee (diff) | |
| download | connman-3ede326ea0d22c4e264f8ab154acfd84eea69147.tar.gz connman-3ede326ea0d22c4e264f8ab154acfd84eea69147.tar.bz2 connman-3ede326ea0d22c4e264f8ab154acfd84eea69147.zip | |
Move GResolv source file sinto GWeb directory
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | gweb/gresolv.c (renamed from gresolv/gresolv.c) | 0 | ||||
| -rw-r--r-- | gweb/gresolv.h (renamed from gresolv/gresolv.h) | 0 | ||||
| -rw-r--r-- | gweb/gweb.c | 3 | ||||
| -rw-r--r-- | src/wpad.c | 2 | ||||
| -rw-r--r-- | tools/resolv-test.c | 2 | ||||
| -rw-r--r-- | tools/wpad-test.c | 2 |
7 files changed, 9 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 4551dcee..4e6ecf1e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,9 +28,7 @@ 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 +gweb_sources = gweb/gweb.h gweb/gweb.c gweb/gresolv.h gweb/gresolv.c gsupplicant_sources = gsupplicant/gsupplicant.h gsupplicant/dbus.h \ gsupplicant/supplicant.c gsupplicant/dbus.c @@ -60,7 +58,7 @@ noinst_PROGRAMS = sbin_PROGRAMS = src/connmand -src_connmand_SOURCES = $(gdbus_sources) $(gdhcp_sources) $(gresolv_sources) \ +src_connmand_SOURCES = $(gdbus_sources) $(gdhcp_sources) \ $(gweb_sources) $(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 \ @@ -143,13 +141,13 @@ tools_supplicant_test_SOURCES = $(gdbus_sources) tools/supplicant-test.c \ tools/supplicant.h tools/supplicant.c tools_supplicant_test_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ -tools_web_test_SOURCES = $(gresolv_sources) $(gweb_sources) tools/web-test.c +tools_web_test_SOURCES = $(gweb_sources) tools/web-test.c tools_web_test_LDADD = @GLIB_LIBS@ -lresolv -tools_resolv_test_SOURCES = $(gresolv_sources) tools/resolv-test.c +tools_resolv_test_SOURCES = $(gweb_sources) 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_sources) tools/wpad-test.c tools_wpad_test_LDADD = @GLIB_LIBS@ -lresolv tools_dhcp_test_SOURCES = $(gdhcp_sources) tools/dhcp-test.c diff --git a/gresolv/gresolv.c b/gweb/gresolv.c index afd0653d..afd0653d 100644 --- a/gresolv/gresolv.c +++ b/gweb/gresolv.c diff --git a/gresolv/gresolv.h b/gweb/gresolv.h index 1bcaf44a..1bcaf44a 100644 --- a/gresolv/gresolv.h +++ b/gweb/gresolv.h diff --git a/gweb/gweb.c b/gweb/gweb.c index cf6c7147..39f8ecfb 100644 --- a/gweb/gweb.c +++ b/gweb/gweb.c @@ -32,8 +32,7 @@ #include <sys/socket.h> #include <arpa/inet.h> -#include <gresolv/gresolv.h> - +#include "gresolv.h" #include "gweb.h" struct web_session { @@ -26,7 +26,7 @@ #include <stdlib.h> #include <string.h> -#include <gresolv/gresolv.h> +#include <gweb/gresolv.h> #include "connman.h" diff --git a/tools/resolv-test.c b/tools/resolv-test.c index d6919e99..7cb2f6f8 100644 --- a/tools/resolv-test.c +++ b/tools/resolv-test.c @@ -28,7 +28,7 @@ #include <string.h> #include <signal.h> -#include <gresolv/gresolv.h> +#include <gweb/gresolv.h> static GTimer *timer; diff --git a/tools/wpad-test.c b/tools/wpad-test.c index a78fd5db..b1274898 100644 --- a/tools/wpad-test.c +++ b/tools/wpad-test.c @@ -29,7 +29,7 @@ #include <string.h> #include <signal.h> -#include <gresolv/gresolv.h> +#include <gweb/gresolv.h> static GTimer *timer; |