more gl updates

diff --git a/.gitignore b/.gitignore
index 7232bd1f4744694616c6b2f7bf8b1fee16530bc1..31bc5f63f12fb34884f68260360a44ad0ca2b67f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -189,7 +189,6 @@ gl/Makefile
 gl/Makefile.in
 gl/alloca.h
 gl/arg-nonnull.h
-gl/arpa/
 gl/c++defs.h
 gl/dirent.h
 gl/getopt.h
@@ -671,6 +670,12 @@ src/srptool-args.c
 src/srptool-args.h
 src/tpmtool-args.c
 src/tpmtool-args.h
+src/gl/netdb.h
+src/gl/netinet/
+src/gl/signal.h
+src/gl/stdio.h
+src/gl/wchar.h
+src/gl/arpa/
 src/gl/alloca.h
 src/gl/arg-nonnull.h
 src/gl/c++defs.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 1d3b717124731c42ce3bbe38997dfe161ec10e53..a768f5778e84e852dc540b5e3927963475862077 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,7 +43,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
 AM_CPPFLAGS = \
        -I$(srcdir)/gl                          \
        -I$(srcdir)/../gl                       \
-       -I$(builddir)/src/gl                    \
+       -I$(builddir)/gl                        \
        -I$(builddir)/../gl                     \
        -I$(builddir)/../lib/includes           \
        -I$(srcdir)/../lib/includes             \

diff --git a/src/certtool-cfg.c b/src/certtool-cfg.c
index 338cbcac97ff5f55e397d7a97e4e0126774d218d..7539f35a497226bd3c3f72c3ff0ee19893038b8a 100644 (file)
--- a/src/certtool-cfg.c
+++ b/src/certtool-cfg.c
@@ -45,7 +45,6 @@
 #elif HAVE_WS2TCPIP_H
 #include <ws2tcpip.h>
 #endif
-#include <arpa/inet.h>
 
 /* Gnulib portability files. */
 #include <getpass.h>