Move GResolv source file sinto GWeb directory

diff --git a/Makefile.am b/Makefile.am
index 4551dce..4e6ecf1 100644 (file)
--- 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
similarity index 100%
rename from gresolv/gresolv.c
rename to gweb/gresolv.c

diff --git a/gresolv/gresolv.h b/gweb/gresolv.h
similarity index 100%
rename from gresolv/gresolv.h
rename to gweb/gresolv.h

diff --git a/gweb/gweb.c b/gweb/gweb.c
index cf6c714..39f8ecf 100644 (file)
--- 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 {

diff --git a/src/wpad.c b/src/wpad.c
index b224d92..e10b275 100644 (file)
--- a/src/wpad.c
+++ b/src/wpad.c
@@ -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 d6919e9..7cb2f6f 100644 (file)
--- 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 a78fd5d..b127489 100644 (file)
--- 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;