Revert changes relative to lib/*.[ch] recent renaming

This reverts renaming and usage of lib/*.h header files done
28-12-2012, reverting 2 commits:

  f871de0... build: make use of 76 lib/*.h renamed files
  ffd8e12... build: rename 76 lib/*.h files

This also reverts removal of redundant include guard (redundant thanks
to changes in above commits) done 2-12-2013, reverting 1 commit:

  c087374... curl_setup.h: remove redundant include guard

This also reverts renaming and usage of lib/*.c source files done
3-12-2013, reverting 3 commits:

  13606bb... build: make use of 93 lib/*.c renamed files
  5b6e792... build: rename 93 lib/*.c files
  7d83dff... build: commit 13606bbfde follow-up 1

Start of related discussion thread:

  http://curl.haxx.se/mail/lib-2013-01/0012.html

Asking for confirmation on pushing this revertion commit:

  http://curl.haxx.se/mail/lib-2013-01/0048.html

Confirmation summary:

  http://curl.haxx.se/mail/lib-2013-01/0079.html

NOTICE: The list of 2 files that have been modified by other
intermixed commits, while renamed, and also by at least one
of the 6 commits this one reverts follows below. These 2 files
will exhibit a hole in history unless git's '--follow' option
is used when viewing logs.

  lib/curl_imap.h
  lib/curl_smtp.h

1 files changed, 17 insertions, 17 deletions

diff --git a/tests/server/Makefile.inc b/tests/server/Makefile.inc
index b0c32bdf2..4a12ea872 100644
--- a/tests/server/Makefile.inc
+++ b/tests/server/Makefile.inc
@@ -1,29 +1,29 @@
 noinst_PROGRAMS = getpart resolve rtspd sockfilt sws tftpd fake_ntlm
 
 CURLX_SRCS = \
- $(top_srcdir)/lib/curl_mprintf.c \
- $(top_srcdir)/lib/curl_nonblock.c \
- $(top_srcdir)/lib/curl_strequal.c \
- $(top_srcdir)/lib/curl_strtoofft.c \
- $(top_srcdir)/lib/curl_timeval.c \
- $(top_srcdir)/lib/curl_warnless.c
+ $(top_srcdir)/lib/mprintf.c \
+ $(top_srcdir)/lib/nonblock.c \
+ $(top_srcdir)/lib/strequal.c \
+ $(top_srcdir)/lib/strtoofft.c \
+ $(top_srcdir)/lib/timeval.c \
+ $(top_srcdir)/lib/warnless.c
 
 CURLX_HDRS = \
  $(top_srcdir)/lib/curlx.h \
- $(top_srcdir)/lib/curl_nonblock.h \
- $(top_srcdir)/lib/curl_strequal.h \
- $(top_srcdir)/lib/curl_strtoofft.h \
- $(top_srcdir)/lib/curl_timeval.h \
- $(top_srcdir)/lib/curl_warnless.h
+ $(top_srcdir)/lib/nonblock.h \
+ $(top_srcdir)/lib/strequal.h \
+ $(top_srcdir)/lib/strtoofft.h \
+ $(top_srcdir)/lib/timeval.h \
+ $(top_srcdir)/lib/warnless.h
 
 USEFUL = \
  getpart.c \
  getpart.h \
  server_setup.h \
- $(top_srcdir)/lib/curl_base64.c \
+ $(top_srcdir)/lib/base64.c \
  $(top_srcdir)/lib/curl_base64.h \
- $(top_srcdir)/lib/curl_memdebug.c \
- $(top_srcdir)/lib/curl_memdebug.h
+ $(top_srcdir)/lib/memdebug.c \
+ $(top_srcdir)/lib/memdebug.h
 
 UTIL = \
  util.c \
@@ -48,21 +48,21 @@ rtspd_CFLAGS = $(AM_CFLAGS)
 sockfilt_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
  server_sockaddr.h \
  sockfilt.c \
- $(top_srcdir)/lib/curl_inet_pton.c
+ $(top_srcdir)/lib/inet_pton.c
 sockfilt_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
 sockfilt_CFLAGS = $(AM_CFLAGS)
 
 sws_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
  server_sockaddr.h \
  sws.c \
- $(top_srcdir)/lib/curl_inet_pton.c
+ $(top_srcdir)/lib/inet_pton.c
 sws_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
 sws_CFLAGS = $(AM_CFLAGS)
 
 tftpd_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
  server_sockaddr.h \
  tftpd.c \
- server_tftp.h
+ tftp.h
 tftpd_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
 tftpd_CFLAGS = $(AM_CFLAGS)