Arthur de Jong

Open Source / Free Software developer

summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArthur de Jong <arthur@arthurdejong.org>2007-06-11 20:40:48 +0200
committerArthur de Jong <arthur@arthurdejong.org>2007-06-11 20:40:48 +0200
commit3ead49c38ca05e0b00cabdbda16bf7d34833656f (patch)
tree17905d7a86bdfaba47591c551236895930b0bdd0
parent4c688ef3001dae3cbe870369ac0d8f8dfb2caa14 (diff)
move dict into the common directory
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-ldapd@279 ef36b2f9-881f-0410-afb5-c4e39611909c
-rw-r--r--common/Makefile.am4
-rw-r--r--common/dict.c (renamed from nslcd/dict.c)0
-rw-r--r--common/dict.h (renamed from nslcd/dict.h)0
-rw-r--r--nslcd/Makefile.am3
-rw-r--r--nslcd/cfg.h2
-rw-r--r--tests/dict/Makefile.am4
-rw-r--r--tests/dict/test_dict.c2
7 files changed, 8 insertions, 7 deletions
diff --git a/common/Makefile.am b/common/Makefile.am
index c922af5..8821959 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -17,7 +17,9 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301 USA
-noinst_LIBRARIES = libtio.a
+noinst_LIBRARIES = libtio.a libdict.a
libtio_a_SOURCES = tio.c tio.h
libtio_a_CFLAGS = -fPIC
+
+libdict_a_SOURCES = dict.c dict.h
diff --git a/nslcd/dict.c b/common/dict.c
index 84c30d7..84c30d7 100644
--- a/nslcd/dict.c
+++ b/common/dict.c
diff --git a/nslcd/dict.h b/common/dict.h
index 104c5a7..104c5a7 100644
--- a/nslcd/dict.h
+++ b/common/dict.h
diff --git a/nslcd/Makefile.am b/nslcd/Makefile.am
index 201ff0b..5d0cd44 100644
--- a/nslcd/Makefile.am
+++ b/nslcd/Makefile.am
@@ -31,7 +31,6 @@ nslcd_SOURCES = nslcd.c ../nslcd.h ../nslcd-common.h \
pagectrl.c pagectrl.h \
util.c util.h \
cfg.c cfg.h \
- dict.c dict.h \
alias.c ether.c group.c host.c netgroup.c network.c \
passwd.c protocol.c rpc.c service.c shadow.c
-nslcd_LDADD = @nslcd_LIBS@ ../common/libtio.a
+nslcd_LDADD = @nslcd_LIBS@ ../common/libtio.a ../common/libdict.a
diff --git a/nslcd/cfg.h b/nslcd/cfg.h
index b9009f9..67a6f98 100644
--- a/nslcd/cfg.h
+++ b/nslcd/cfg.h
@@ -27,7 +27,7 @@
#define _CFG_H
#include "ldap-nss.h"
-#include "dict.h"
+#include "common/dict.h"
#include "compat/attrs.h"
/* maximum number of URIs */
diff --git a/tests/dict/Makefile.am b/tests/dict/Makefile.am
index 0d67814..3e42007 100644
--- a/tests/dict/Makefile.am
+++ b/tests/dict/Makefile.am
@@ -19,5 +19,5 @@
noinst_PROGRAMS = test_dict
-test_dict_SOURCES = test_dict.c ../../nslcd/dict.h
-test_dict_LDADD = ../../nslcd/dict.o
+test_dict_SOURCES = test_dict.c ../../common/dict.h
+test_dict_LDADD = ../../common/dict.o
diff --git a/tests/dict/test_dict.c b/tests/dict/test_dict.c
index e89aa63..0524a1b 100644
--- a/tests/dict/test_dict.c
+++ b/tests/dict/test_dict.c
@@ -26,7 +26,7 @@
#include <string.h>
#include <assert.h>
-#include "../../nslcd/dict.h"
+#include "common/dict.h"
#include "compat/attrs.h"
/* the main program... */