3 files changed, 44 insertions, 26 deletions
diff --git a/ipa-server/ipa-slapi-plugins/dna/Makefile b/ipa-server/ipa-slapi-plugins/dna/Makefile
deleted file mode 100644
index 1e37d779..00000000
--- a/ipa-server/ipa-slapi-plugins/dna/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-include ../../Makefile.common
-
-SONAME = libipa-dna-plugin.so
-LDFLAGS += -llber
-CFLAGS += -I/usr/include/$(DIRSRV) -I/usr/include/nss3 -I/usr/include/mozldap -I/usr/include/nspr4 -fPIC -DPIC
-
-OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
-
-all: $(OBJS)
-	$(CC) $(LDFLAGS) $(OBJS) -Wl,-soname -Wl,$(SONAME) -shared -o $(SONAME)
-
-%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-install:
-	mkdir -p $(PLUGINDIR); \
-	install -m 644 $(SONAME) $(PLUGINDIR); \
-	install -m 644 *.ldif $(SHAREDIR)
-
-clean:
-	rm -f *.o
-	rm -f $(SONAME)
-	rm -f *~
-
-
diff --git a/ipa-server/ipa-slapi-plugins/dna/Makefile.am b/ipa-server/ipa-slapi-plugins/dna/Makefile.am
new file mode 100644
index 00000000..d8d6d1d7
--- /dev/null
+++ b/ipa-server/ipa-slapi-plugins/dna/Makefile.am
@@ -0,0 +1,41 @@
+NULL =
+
+INCLUDES =							\
+	-I.							\
+	-I$(srcdir)						\
+	-DPREFIX=\""$(prefix)"\" 				\
+	-DBINDIR=\""$(bindir)"\"				\
+	-DLIBDIR=\""$(libdir)"\" 				\
+	-DLIBEXECDIR=\""$(libexecdir)"\"			\
+	-DDATADIR=\""$(datadir)"\"				\
+	$(MOZLDAP_CFLAGS)					\
+	$(LDAP_CFLAGS)						\
+	$(KRB5_CFLAGS)						\
+	$(WARN_CFLAGS)						\
+	$(NULL)
+
+plugindir = $(libdir)/dirsrv/plugins
+plugin_LTLIBRARIES = 			\
+	libipa-dna-plugin.la		\
+	$(NULL)
+
+libipa_dna_plugin_la_SOURCES = 		\
+	dna.c				\
+	$(NULL)
+
+libipa_dna_plugin_la_LIBADD = 		\
+	$(MOZLDAP_LIBS)			\
+	$(NULL)
+
+appdir = $(IPA_DATA_DIR)
+app_DATA =			\
+	dna-conf.ldif		\
+	$(NULL)
+
+EXTRA_DIST =			\
+	$(app_DATA)		\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
diff --git a/ipa-server/ipa-slapi-plugins/dna/dna.c b/ipa-server/ipa-slapi-plugins/dna/dna.c
index 399f89f0..7c8dad1a 100644
--- a/ipa-server/ipa-slapi-plugins/dna/dna.c
+++ b/ipa-server/ipa-slapi-plugins/dna/dna.c
@@ -45,7 +45,9 @@
 /**
  * Distributed Numeric Assignment plug-in 
  */
-#include "slapi-plugin.h"
+
+#include <dirsrv/slapi-plugin.h>
+
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>