2000-09-28 Joel Sherrill <joel@OARcorp.com>

* rtems_webserver/Makefile.am, rtems_webserver/base64.c,
	rtems_webserver/base64.c: Renamed base64.c to wbase64.c.
	* rtems_webserver/sock.c: Added file missed in merger.

c/src/exec/libnetworking/ChangeLog

@@ -1,3 +1,9 @@
+2000-09-28	Joel Sherrill <joel@OARcorp.com>
+
+	* rtems_webserver/Makefile.am, rtems_webserver/base64.c,
+	rtems_webserver/base64.c: Renamed base64.c to wbase64.c.
+	* rtems_webserver/sock.c: Added file missed in merger.
+
 2000-09-22	Joel Sherrill <joel@OARcorp.com>
 
 	* machine/types.h, pppd/pppd.h, rtems/rtems_bsdnet_internal.h,

c/src/libnetworking/ChangeLog

@@ -1,3 +1,9 @@
+2000-09-28	Joel Sherrill <joel@OARcorp.com>
+
+	* rtems_webserver/Makefile.am, rtems_webserver/base64.c,
+	rtems_webserver/base64.c: Renamed base64.c to wbase64.c.
+	* rtems_webserver/sock.c: Added file missed in merger.
+
 2000-09-22	Joel Sherrill <joel@OARcorp.com>
 
 	* machine/types.h, pppd/pppd.h, rtems/rtems_bsdnet_internal.h,

c/src/libnetworking/rtems_webserver/Makefile.am

@@ -7,10 +7,10 @@ AUTOMAKE_OPTIONS = foreign 1.4
 LIBNAME = lib.a
 LIB = $(ARCH)/$(LIBNAME)
 
-C_FILES = asp.c balloc.c base64.c default.c ejlex.c ejparse.c emfdb.c form.c \
+C_FILES = asp.c balloc.c default.c ejlex.c ejparse.c emfdb.c form.c \
     h.c handler.c md5c.c mime.c misc.c webpage.c ringq.c rom.c security.c \
-    socket.c sym.c uemf.c um.c url.c value.c webrom.c webs.c websuemf.c \
-    webmain.c
+    sock.c socket.c sym.c uemf.c um.c url.c value.c wbase64.c webrom.c webs.c \
+    websuemf.c webmain.c
 C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 OBJS = $(C_O_FILES)
@@ -53,7 +53,7 @@ endif
 
 EXTRA_DIST = asp.c balloc.c default.c ej.h ejlex.c ejparse.c form.c h.c \
     handler.c mime.c misc.c ringq.c rom.c rtems_webserver.h security.c \
-    socket.c sym.c uemf.c uemf.h um.h url.c value.c base64.c webcomp.c \
+    sock.c socket.c sym.c uemf.c uemf.h um.h url.c value.c wbase64.c webcomp.c \
     webmain.c webpage.c webrom.c webs.c webs.h websuemf.c wsIntrn.h
 
 include $(top_srcdir)/../../../automake/local.am