move some remaining files into the server/ directory

git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/libnss_ldapd@39 ef36b2f9-881f-0410-afb5-c4e39611909c

16 files changed, 7 insertions, 27 deletions

diff --git a/Makefile.am b/Makefile.am
index 699bfa4..4f15d48 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,9 +36,7 @@ nss_ldap_so_LDFLAGS = @nss_ldap_so_LDFLAGS@
 nslcd_SOURCES = nslcd.c nslcd.h \
         nslcd-server.c nslcd-server.h \
         log.c log.h \
-        xmalloc.c xmalloc.h \
-        ldap-nss.c ldap-schema.c util.c resolve.c \
-        dnsconfig.c pagectrl.c
+        xmalloc.c xmalloc.h
 nslcd_LDADD = server/libserver.a
 
 testnss_SOURCES = testnss.c nslcd-client.c nslcd-client.h nslcd.h
@@ -58,15 +56,6 @@ NSS_VERS = $(shell ls /lib/libnss_files.so.? | tail -n 1 | sed -e 's/\/lib\/libn
 NSS_LDAP_NSS_VERSIONED = libnss_ldap.so.$(NSS_VERS)
 endif
 
-##if USE_NATIVE_LINKER
-##NATIVE_LINK = $(nss_ldap_so_LD) $(AM_LDFLAGS) -o $@
-##else
-##GNU_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-##endif
-### This is horrible but appears to be the only way to work with
-### recent versions of automake. Any better ideas, let me know.
-##LINK = $(NATIVE_LINK) $(GNU_LINK)
-
 INST_UID=root
 if AIX
 INST_GID=system
diff --git a/nslcd.c b/nslcd.c
index 072c09e..a72b7ed 100644
--- a/nslcd.c
+++ b/nslcd.c
@@ -28,17 +28,6 @@
 #include <sys/wait.h>
 #include <string.h>
 #include <stdio.h>
-#ifdef HAVE_LBER_H
-#include <lber.h>
-#endif /* HAVE_LBER_H */
-#ifdef HAVE_LDAP_H
-#include <ldap.h>
-#endif /* HAVE_LDAP_H */
-#if defined(HAVE_THREAD_H)
-#include <thread.h>
-#elif defined(HAVE_PTHREAD_H)
-#include <pthread.h>
-#endif
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif /* HAVE_GETOPT_H */
@@ -47,13 +36,12 @@
 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/socket.h>
 #ifdef HAVE_GRP_H
 #include <grp.h>
 #endif /* HAVE_GRP_H */
-#include <sys/stat.h>
 
-#include "ldap-nss.h"
-#include "util.h"
 #include "nslcd.h"
 #include "nslcd-server.h"
 #include "xmalloc.h"
diff --git a/server/Makefile.am b/server/Makefile.am
index 53cf81e..72d004a 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -22,4 +22,7 @@ noinst_LIBRARIES = libserver.a
 
 libserver_a_SOURCES = common.c common.h \
                       aliases.c automount.c ethers.c group.c hosts.c netgroup.c \
-                      networks.c passwd.c protocols.c rpc.c services.c shadow.c
+                      networks.c passwd.c protocols.c rpc.c services.c shadow.c \
+                      dnsconfig.c dnsconfig.h ldap-nss.c ldap-nss.h ldap-parse.h \
+                      ldap-schema.c ldap-schema.h pagectrl.c pagectrl.h \
+                      resolve.c resolve.h util.c util.h
diff --git a/dnsconfig.c b/server/dnsconfig.c
index 80efbb1..80efbb1 100644
--- a/dnsconfig.c
+++ b/server/dnsconfig.c
diff --git a/dnsconfig.h b/server/dnsconfig.h
index 8d8b963..8d8b963 100644
--- a/dnsconfig.h
+++ b/server/dnsconfig.h
diff --git a/ldap-nss.c b/server/ldap-nss.c
index f5d4539..f5d4539 100644
--- a/ldap-nss.c
+++ b/server/ldap-nss.c
diff --git a/ldap-nss.h b/server/ldap-nss.h
index c2bf8e3..c2bf8e3 100644
--- a/ldap-nss.h
+++ b/server/ldap-nss.h
diff --git a/ldap-parse.h b/server/ldap-parse.h
index c1e1f1f..c1e1f1f 100644
--- a/ldap-parse.h
+++ b/server/ldap-parse.h
diff --git a/ldap-schema.c b/server/ldap-schema.c
index a0354eb..a0354eb 100644
--- a/ldap-schema.c
+++ b/server/ldap-schema.c
diff --git a/ldap-schema.h b/server/ldap-schema.h
index b7cfd14..b7cfd14 100644
--- a/ldap-schema.h
+++ b/server/ldap-schema.h
diff --git a/pagectrl.c b/server/pagectrl.c
index 7020b88..7020b88 100644
--- a/pagectrl.c
+++ b/server/pagectrl.c
diff --git a/pagectrl.h b/server/pagectrl.h
index b282dfa..b282dfa 100644
--- a/pagectrl.h
+++ b/server/pagectrl.h
diff --git a/resolve.c b/server/resolve.c
index 470d33d..470d33d 100644
--- a/resolve.c
+++ b/server/resolve.c
diff --git a/resolve.h b/server/resolve.h
index 62b2574..62b2574 100644
--- a/resolve.h
+++ b/server/resolve.h
diff --git a/util.c b/server/util.c
index 786d0a8..786d0a8 100644
--- a/util.c
+++ b/server/util.c
diff --git a/util.h b/server/util.h
index ea0d57f..ea0d57f 100644
--- a/util.h
+++ b/server/util.h