Autotool ipa-server - patch from William Jon McCann <mccann@jhu.edu>.

41 files changed, 1103 insertions, 241 deletions

diff --git a/ipa-server/.hgignore b/ipa-server/.hgignore
new file mode 100644
index 000000000..23fc0bb55
--- /dev/null
+++ b/ipa-server/.hgignore
@@ -0,0 +1,32 @@
+Makefile
+Makefile.in
+aclocal.m4
+config.cache
+autom4te.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+configure.scan
+compile
+depcomp
+intl
+libtool
+ltconfig
+ltmain.sh
+missing
+mkinstalldirs
+install-sh
+stamp-h
+stamp-h1
+stamp-h.in
+version.h
+intl
+macros
+INSTALL
+ChangeLog
+ipa-server-*.tar.gz
+*~
diff --git a/ipa-server/Makefile b/ipa-server/Makefile
deleted file mode 100644
index dacba8485..000000000
--- a/ipa-server/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-include Makefile.common
-
-SUBDIRS=ipa-install xmlrpc-server ipa-kpasswd ipa-slapi-plugins ipa-gui
-
-all:
-	@for subdir in $(SUBDIRS); do \
-		(cd $$subdir && $(MAKE) $@) || exit 1; \
-	done
-
-install-ipaserver:
-	-mkdir -p $(PYTHONDIR)
-	install -m 644 ipaserver/*.py $(PYTHONDIR)
-
-install: install-ipaserver
-	@for subdir in $(SUBDIRS); do \
-		(cd $$subdir && $(MAKE) $@) || exit 1; \
-	done
-
-clean:
-	@for subdir in $(SUBDIRS); do \
-		(cd $$subdir && $(MAKE) $@) || exit 1; \
-	done
-	rm -f *~
-	rm -f ipaserver/*~
-
-test:
diff --git a/ipa-server/Makefile.am b/ipa-server/Makefile.am
new file mode 100644
index 000000000..b5da3f566
--- /dev/null
+++ b/ipa-server/Makefile.am
@@ -0,0 +1,66 @@
+# This file will be processed with automake-1.7 to create Makefile.in
+
+AUTOMAKE_OPTIONS = 1.7
+
+NULL =
+
+SUBDIRS =			\
+	ipa-gui			\
+	ipa-install		\
+	ipa-kpasswd		\
+	ipaserver		\
+	ipa-slapi-plugins	\
+	xmlrpc-server		\
+	$(NULL)
+
+EXTRA_DIST =			\
+	freeipa-server.spec	\
+	COPYING			\
+	AUTHORS			\
+	INSTALL			\
+	README			\
+	HACKING			\
+	NEWS			\
+	ChangeLog		\
+	$(NULL)
+
+DISTCLEANFILES =		\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	intltool-*.in		\
+	compile			\
+	configure		\
+	INSTALL			\
+	install-sh		\
+	missing			\
+	mkinstalldirs		\
+	config.guess		\
+	ltmain.sh		\
+	config.sub		\
+	depcomp			\
+	Makefile.in		\
+	config.h.*		\
+	aclocal.m4		\
+	$(NULL)
+
+# Creating ChangeLog from hg log (taken from cairo/Makefile.am):
+
+ChangeLog: $(srcdir)/ChangeLog
+
+$(srcdir)/ChangeLog:
+	@if test -d "$(srcdir)/../.hg"; then \
+	  (cd "$(srcdir)" && \
+	  ./missing --run hg log --verbose) | fmt --split-only > $@.tmp \
+	  && mv -f $@.tmp $@ \
+	  || ($(RM) $@.tmp; \
+	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
+	      (test -f $@ || echo hg log is required to generate this file >> $@)); \
+	else \
+	  test -f $@ || \
+	  (echo A hg checkout and hg -log is required to generate ChangeLog >&2 && \
+	  echo A hg checkout and hg log is required to generate this file >> $@); \
+	fi
+
+.PHONY: ChangeLog $(srcdir)/ChangeLog
diff --git a/ipa-server/Makefile.common b/ipa-server/Makefile.common
deleted file mode 100644
index 0ca3e2130..000000000
--- a/ipa-server/Makefile.common
+++ /dev/null
@@ -1,21 +0,0 @@
-# set to 1 to produce a debug build of all subprojects
-#export DEBUG=1
-
-# set to 1 to build for 64bit
-#export BUILD64=0
-
-ifeq ($(DEBUG),1)
-	export CFLAGS = -g -Wall -Wshadow
-	export LDFLAGS = -g
-else
-	export CFLAGS = -O2 -Wall -Wshadow
-endif
-
-DIRSRV=dirsrv
-PREFIX?=$(DESTDIR)/usr
-LIBDIR?=$(DESTDIR)/usr/lib
-SHAREDIR?=$(PREFIX)/share/ipa
-PLUGINDIR?=$(LIBDIR)/$(DIRSRV)/plugins
-SBINDIR?=$(PREFIX)/sbin
-INITDIR?=$(DESTDIR)/etc/rc.d/init.d
-PYTHONDIR?=$(SHAREDIR)/ipaserver
\ No newline at end of file
diff --git a/ipa-server/autogen.sh b/ipa-server/autogen.sh
new file mode 100644
index 000000000..2e80fc216
--- /dev/null
+++ b/ipa-server/autogen.sh
@@ -0,0 +1,175 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+set -e
+
+PACKAGE=freeipa-server
+
+LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
+LIBTOOLIZE_FLAGS="--copy --force"
+AUTOHEADER=${AUTOHEADER-autoheader}
+AUTOMAKE_FLAGS="--add-missing --gnu"
+AUTOCONF=${AUTOCONF-autoconf}
+
+# automake 1.8 requires autoconf 2.58
+# automake 1.7 requires autoconf 2.54
+automake_min_vers=1.7
+aclocal_min_vers=$automake_min_vers
+autoconf_min_vers=2.54
+libtoolize_min_vers=1.4
+
+# The awk-based string->number conversion we use needs a C locale to work 
+# as expected. Setting LC_ALL overrides whether the user set LC_ALL,
+# LC_NUMERIC, or LANG.
+LC_ALL=C
+
+ARGV0=$0
+
+# Allow invocation from a separate build directory; in that case, we change
+# to the source directory to run the auto*, then change back before running configure
+srcdir=`dirname $ARGV0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+
+cd $srcdir
+
+if ($AUTOCONF --version) < /dev/null > /dev/null 2>&1 ; then
+    if ($AUTOCONF --version | head -n 1 | awk 'NR==1 { if( $(NF) >= '$autoconf_min_vers') \
+			       exit 1; exit 0; }');
+    then
+       echo "$ARGV0: ERROR: \`$AUTOCONF' is too old."
+       $AUTOCONF --version
+       echo "           (version $autoconf_min_vers or newer is required)"
+       DIE="yes"
+    fi
+else
+    echo $AUTOCONF: command not found
+    echo
+    echo "$ARGV0: ERROR: You must have \`autoconf' installed to compile $PACKAGE."
+    echo "           (version $autoconf_min_vers or newer is required)"
+    DIE="yes"
+fi
+
+#
+# Hunt for an appropriate version of automake and aclocal; we can't
+# assume that 'automake' is necessarily the most recent installed version
+#
+# We check automake first to allow it to be a newer version than we know about.
+#
+if test x"$AUTOMAKE" = x || test x"$ACLOCAL" = x ; then
+  am_ver=""
+  for ver in "" "-1.9" "-1.8" "-1.7" ; do
+    am="automake$ver"
+    if ($am --version) < /dev/null > /dev/null 2>&1 ; then
+      if ($am --version | head -n 1 | awk 'NR==1 { if( $(NF) >= '$automake_min_vers') \
+	  		 exit 1; exit 0; }'); then : ; else
+         am_ver=$ver
+         break;
+      fi
+    fi
+  done
+
+  AUTOMAKE=${AUTOMAKE-automake$am_ver}
+  ACLOCAL=${ACLOCAL-aclocal$am_ver}
+fi
+
+#
+# Now repeat the tests with the copies we decided upon and error out if they
+# aren't sufficiently new.
+#
+if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 ; then
+  if ($AUTOMAKE --version | head -n 1 | awk 'NR==1 { if( $(NF) >= '$automake_min_vers') \
+			     exit 1; exit 0; }');
+     then
+     echo "$ARGV0: ERROR: \`$AUTOMAKE' is too old."
+     $AUTOMAKE --version
+     echo "           (version $automake_min_vers or newer is required)"
+     DIE="yes"
+  fi
+  if ($ACLOCAL --version) < /dev/null > /dev/null 2>&1; then
+    if ($ACLOCAL --version | head -n 1 | awk 'NR==1 { if( $(NF) >= '$aclocal_min_vers' ) \
+						exit 1; exit 0; }' );
+    then
+      echo "$ARGV0: ERROR: \`$ACLOCAL' is too old."
+      $ACLOCAL --version
+      echo "           (version $aclocal_min_vers or newer is required)"
+      DIE="yes"
+    fi
+  else
+    echo $ACLOCAL: command not found
+    echo
+    echo "$ARGV0: ERROR: Missing \`$ACLOCAL'"
+    echo "           The version of $AUTOMAKE installed doesn't appear recent enough."
+    DIE="yes"
+  fi
+else
+    echo $AUTOMAKE: command not found
+    echo
+    echo "$ARGV0: ERROR: You must have \`automake' installed to compile $PACKAGE."
+    echo "           (version $automake_min_vers or newer is required)"
+    DIE="yes"
+fi
+
+if ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 ; then
+    if ($LIBTOOLIZE --version | awk 'NR==1 { if( $4 >= '$libtoolize_min_vers') \
+			       exit 1; exit 0; }');
+    then
+       echo "$ARGV0: ERROR: \`$LIBTOOLIZE' is too old."
+       echo "           (version $libtoolize_min_vers or newer is required)"
+       DIE="yes"
+    fi
+else
+    echo $LIBTOOLIZE: command not found
+    echo
+    echo "$ARGV0: ERROR: You must have \`libtoolize' installed to compile $PACKAGE."
+    echo "           (version $libtoolize_min_vers or newer is required)"
+    DIE="yes"
+fi
+
+if test -z "$ACLOCAL_FLAGS"; then
+    acdir=`$ACLOCAL --print-ac-dir`
+    if [ ! -f $acdir/pkg.m4 ]; then
+	echo "$ARGV0: Error: Could not find pkg-config macros."
+	echo "        (Looked in $acdir/pkg.m4)"
+	echo "        If pkg.m4 is available in /another/directory, please set"
+	echo "        ACLOCAL_FLAGS=\"-I /another/directory\""
+	echo "        Otherwise, please install pkg-config."
+	echo ""
+	echo "pkg-config is available from:"
+	echo "http://www.freedesktop.org/software/pkgconfig/"
+	DIE=yes
+    fi
+fi
+
+if test "X$DIE" != X; then
+  exit 1
+fi
+
+
+if test -z "$*"; then
+  echo "$ARGV0:	Note: \`./configure' will be run with no arguments."
+  echo "		If you wish to pass any to it, please specify them on the"
+  echo "		\`$0' command line."
+  echo
+fi
+
+do_cmd() {
+    echo "$ARGV0: running \`$@'"
+    $@
+}
+
+do_cmd $LIBTOOLIZE $LIBTOOLIZE_FLAGS
+
+do_cmd $ACLOCAL $ACLOCAL_FLAGS
+
+do_cmd $AUTOHEADER
+
+do_cmd $AUTOMAKE $AUTOMAKE_FLAGS
+
+do_cmd $AUTOCONF
+
+cd $ORIGDIR || exit 1
+
+rm -f config.cache
+
+do_cmd $srcdir/configure --cache-file=config.cache --disable-static --enable-maintainer-mode --enable-gtk-doc ${1+"$@"} && echo "Now type \`make' to compile" || exit 1
diff --git a/ipa-server/configure.ac b/ipa-server/configure.ac
new file mode 100644
index 000000000..f8360f333
--- /dev/null
+++ b/ipa-server/configure.ac
@@ -0,0 +1,252 @@
+AC_PREREQ(2.59c)
+AC_INIT([freeipa-server],
+        [0.4],
+        [https://hosted.fedoraproject.org/projects/freeipa/newticket])
+
+AC_CONFIG_SRCDIR([ipaserver/ipaldap.py])
+AC_CONFIG_HEADERS([config.h])
+
+AM_INIT_AUTOMAKE
+
+AM_MAINTAINER_MODE
+AC_PROG_CC
+AC_STDC_HEADERS
+AC_DISABLE_STATIC
+AC_PROG_LIBTOOL
+
+AC_HEADER_STDC
+
+AC_SUBST(VERSION)
+
+dnl ---------------------------------------------------------------------------
+dnl - Check for DS slapi plugin
+dnl ---------------------------------------------------------------------------
+
+AC_CHECK_HEADER(dirsrv/slapi-plugin.h)
+
+dnl ---------------------------------------------------------------------------
+dnl - Check for KRB5
+dnl ---------------------------------------------------------------------------
+
+KRB5_LIBS=
+AC_CHECK_HEADER(krb5.h)
+
+krb5_impl=mit
+
+if test "x$ac_cv_header_krb5_h" = "xyes" ; then
+  dnl lazy check for Heimdal Kerberos
+  AC_CHECK_HEADERS(heim_err.h)
+  if test $ac_cv_header_heim_err_h = yes ; then
+    krb5_impl=heimdal
+  else
+    krb5_impl=mit
+  fi
+
+  if test "x$krb5_impl" = "xmit"; then
+    AC_CHECK_LIB(k5crypto, main,
+      [krb5crypto=k5crypto],
+      [krb5crypto=crypto])
+
+    AC_CHECK_LIB(krb5, main,
+      [have_krb5=yes
+	KRB5_LIBS="-lkrb5 -l$krb5crypto -lcom_err"],
+      [have_krb5=no],
+      [-l$krb5crypto -lcom_err])
+
+  elif test "x$krb5_impl" = "xheimdal"; then
+    AC_CHECK_LIB(des, main,
+      [krb5crypto=des],
+      [krb5crypto=crypto])
+
+    AC_CHECK_LIB(krb5, main,
+      [have_krb5=yes
+	KRB5_LIBS="-lkrb5 -l$krb5crypto -lasn1 -lroken -lcom_err"],
+      [have_krb5=no],
+      [-l$krb5crypto -lasn1 -lroken -lcom_err])
+
+    AC_DEFINE(HAVE_HEIMDAL_KERBEROS, 1,
+      [define if you have HEIMDAL Kerberos])
+
+  else
+    have_krb5=no
+    AC_MSG_WARN([Unrecognized Kerberos5 Implementation])
+  fi
+
+  if test "x$have_krb5" = "xyes" ; then
+    ol_link_krb5=yes
+
+    AC_DEFINE(HAVE_KRB5, 1,
+      [define if you have Kerberos V])
+
+  else
+    AC_MSG_ERROR([Required Kerberos 5 support not available])
+  fi
+
+fi
+
+AC_SUBST(KRB5_LIBS)
+
+dnl ---------------------------------------------------------------------------
+dnl - Check for LDAP
+dnl ---------------------------------------------------------------------------
+
+LDAP_LIBS=
+AC_CHECK_HEADER(ldap.h)
+AC_CHECK_HEADER(lber.h)
+
+AC_CHECK_LIB(ldap, ldap_search, with_ldap=yes)
+dnl Check for other libraries we need to link with to get the main routines.
+test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes], , -llber) }
+test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes], , -llber -lkrb) }
+test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes with_ldap_des=yes], , -llber -lkrb -ldes) }
+dnl Recently, we need -lber even though the main routines are elsewhere,
+dnl because otherwise be get link errors w.r.t. ber_pvt_opt_on.  So just
+dnl check for that (it's a variable not a fun but that doesn't seem to
+dnl matter in these checks)  and stick in -lber if so.  Can't hurt (even to
+dnl stick it in always shouldn't hurt, I don't think) ... #### Someone who
+dnl #### understands LDAP needs to fix this properly.
+test "$with_ldap_lber" != "yes" && { AC_CHECK_LIB(lber, ber_pvt_opt_on, with_ldap_lber=yes) }
+
+if test "$with_ldap" = "yes"; then
+  if test "$with_ldap_des" = "yes" ; then
+    LDAP_LIBS="${LDAP_LIBS} -ldes"
+  fi
+  if test "$with_ldap_krb" = "yes" ; then
+    LDAP_LIBS="${LDAP_LIBS} -lkrb"
+  fi
+  if test "$with_ldap_lber" = "yes" ; then
+    LDAP_LIBS="${LDAP_LIBS} -llber"
+  fi
+  LDAP_LIBS="${LDAP_LIBS} -lldap"
+else
+  AC_MSG_ERROR([LDAP not found])
+fi
+
+AC_SUBST(LDAP_LIBS)
+
+dnl ---------------------------------------------------------------------------
+dnl - Check for Mozilla LDAP SDK
+dnl ---------------------------------------------------------------------------
+
+PKG_CHECK_MODULES(MOZLDAP, mozldap > 6)
+
+dnl ---------------------------------------------------------------------------
+dnl - Check for Python
+dnl ---------------------------------------------------------------------------
+
+AC_MSG_NOTICE([Checking for Python])
+have_python=no
+AM_PATH_PYTHON(2.3)
+
+if test "x$PYTHON" = "x" ; then
+  AC_MSG_ERROR([Python not found])
+fi
+
+dnl ---------------------------------------------------------------------------
+dnl - Set the data install directory since we don't use pkgdatadir
+dnl ---------------------------------------------------------------------------
+
+IPA_DATA_DIR="$datadir/ipa"
+AC_SUBST(IPA_DATA_DIR)
+
+dnl ---------------------------------------------------------------------------
+dnl Finish
+dnl ---------------------------------------------------------------------------
+
+# Turn on the additional warnings last, so -Werror doesn't affect other tests.
+
+AC_ARG_ENABLE(more-warnings,
+	[AC_HELP_STRING([--enable-more-warnings],
+	[Maximum compiler warnings])],
+	set_more_warnings="$enableval",[
+        	if test -d $srcdir/../.hg; then
+        		set_more_warnings=yes
+              	else
+                  	set_more_warnings=no
+              	fi
+        ])
+AC_MSG_CHECKING(for more warnings)
+if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
+        AC_MSG_RESULT(yes)
+        CFLAGS="\
+        -Wall \
+        -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
+        -Wnested-externs -Wpointer-arith \
+        -Wcast-align -Wsign-compare \
+        $CFLAGS"
+
+        for option in -Wno-strict-aliasing -Wno-sign-compare; do
+                SAVE_CFLAGS="$CFLAGS"
+                CFLAGS="$CFLAGS $option"
+                AC_MSG_CHECKING([whether gcc understands $option])
+                AC_TRY_COMPILE([], [],
+                        has_option=yes,
+                        has_option=no,)
+                if test $has_option = no; then
+                        CFLAGS="$SAVE_CFLAGS"
+                fi
+                AC_MSG_RESULT($has_option)
+                unset has_option
+                unset SAVE_CFLAGS
+        done
+        unset option
+else
+        AC_MSG_RESULT(no)
+fi
+
+# Flags
+
+AC_SUBST(CFLAGS)
+AC_SUBST(CPPFLAGS)
+AC_SUBST(LDFLAGS)
+
+# Files
+
+AC_CONFIG_FILES([
+    Makefile
+    ipa-gui/Makefile
+    ipa-gui/ipagui/Makefile
+    ipa-gui/ipagui/config/Makefile
+    ipa-gui/ipagui/forms/Makefile
+    ipa-gui/ipagui/helpers/Makefile
+    ipa-gui/ipagui/static/Makefile
+    ipa-gui/ipagui/static/css/Makefile
+    ipa-gui/ipagui/static/images/Makefile
+    ipa-gui/ipagui/static/javascript/Makefile
+    ipa-gui/ipagui/subcontrollers/Makefile
+    ipa-gui/ipagui/templates/Makefile
+    ipa-gui/ipagui/tests/Makefile
+    ipa-gui/ipa_gui.egg-info/Makefile
+    ipa-install/Makefile
+    ipa-install/share/Makefile
+    ipa-kpasswd/Makefile
+    ipaserver/Makefile
+    ipa-slapi-plugins/Makefile
+    ipa-slapi-plugins/dna/Makefile
+    ipa-slapi-plugins/ipa-memberof/Makefile
+    ipa-slapi-plugins/ipa-pwd-extop/Makefile
+    xmlrpc-server/Makefile
+    xmlrpc-server/test/Makefile
+])
+
+AC_OUTPUT
+
+echo "
+                    FreeIPA Server $VERSION
+                    ========================
+
+	prefix:                   ${prefix}
+	exec_prefix:              ${exec_prefix}
+        libdir:                   ${libdir}
+        bindir:                   ${bindir}
+        sbindir:                  ${sbindir}
+        sysconfdir:               ${sysconfdir}
+        localstatedir:            ${localstatedir}
+        datadir:                  ${datadir}
+	source code location:	  ${srcdir}
+	compiler:		  ${CC}
+	cflags:		          ${CFLAGS}
+        LDAP libs:                ${LDAP_LIBS}
+        KRB5 libs:                ${KRB5_LIBS}
+        Maintainer mode:          ${USE_MAINTAINER_MODE}
+"
diff --git a/ipa-server/ipa-gui/Makefile b/ipa-server/ipa-gui/Makefile
deleted file mode 100644
index 26ee7d313..000000000
--- a/ipa-server/ipa-gui/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-include ../Makefile.common
-
-IPAGUI_SUBDIRS=config forms helpers templates subcontrollers
-STATIC_SUBDIRS=css images javascript
-
-all: ;
-
-install:
-	-mkdir -p $(SHAREDIR)/ipagui
-	install -m 644 ipagui/*.py $(SHAREDIR)/ipagui
-
-	-mkdir -p $(SHAREDIR)/ipa_gui.egg-info
-	install -m 644 ipa_gui.egg-info/* $(SHAREDIR)/ipa_gui.egg-info
-
-	@for subdir in $(IPAGUI_SUBDIRS); do \
-		mkdir -p $(SHAREDIR)/ipagui/$$subdir; \
-		install -m 644 ipagui/$$subdir/*.py $(SHAREDIR)/ipagui/$$subdir; \
-	done
-
-	install -m 644 ipagui/config/*.cfg $(SHAREDIR)/ipagui/config
-	install -m 644 ipagui/templates/*.kid $(SHAREDIR)/ipagui/templates
-
-	-mkdir -p $(SHAREDIR)/ipagui/static
-	@for subdir in $(STATIC_SUBDIRS); do \
-		mkdir -p $(SHAREDIR)/ipagui/static/$$subdir; \
-		install -m 644 ipagui/static/$$subdir/* $(SHAREDIR)/ipagui/static/$$subdir; \
-	done
-
-	install -m 644 ipa-webgui.cfg $(SHAREDIR)
-
-	install -m 755 ipa-webgui $(SBINDIR)
-
-	-mkdir -p $(INITDIR)
-	install -m 755 ipa-webgui.init $(INITDIR)/ipa-webgui
-
-clean:
-	find . -name "*.pyc" -exec rm -f {} \;
-	find . -name "*~" -exec rm -f {} \;
diff --git a/ipa-server/ipa-gui/Makefile.am b/ipa-server/ipa-gui/Makefile.am
new file mode 100644
index 000000000..35f9ff9fd
--- /dev/null
+++ b/ipa-server/ipa-gui/Makefile.am
@@ -0,0 +1,44 @@
+NULL =
+
+SUBDIRS =			\
+	ipagui			\
+	ipa_gui.egg-info	\
+	$(NULL)
+
+sbin_SCRIPTS =			\
+	ipa-webgui		\
+	$(NULL)
+
+appdir = $(IPA_DATA_DIR)
+app_DATA =			\
+	ipa-webgui.cfg		\
+	$(NULL)
+
+EXTRA_DIST =			\
+	README.txt		\
+	$(sbin_SCRIPTS)		\
+	$(app_DATA)		\
+	ipa-webgui.init		\
+	dev.cfg			\
+	sample-prod.cfg		\
+	setup.py		\
+	start-ipagui.py		\
+	test.cfg		\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
+
+initdir=$(sysconfdir)/rc.d/init.d
+
+install-data-hook: ipa-webgui.init
+	if test '!' -d $(DESTDIR)$(initdir); then \
+		$(mkinstalldirs) $(DESTDIR)$(initdir); \
+		chmod 755 $(DESTDIR)$(initdir); \
+	fi
+
+	$(INSTALL_SCRIPT) $(srcdir)/ipa-webgui.init $(DESTDIR)$(initdir)/ipa-webgui
+
+uninstall-hook:
+	rm -f $(DESTDIR)$(initdir)/ipa-webgui
diff --git a/ipa-server/ipa-gui/ipa_gui.egg-info/Makefile.am b/ipa-server/ipa-gui/ipa_gui.egg-info/Makefile.am
new file mode 100644
index 000000000..dfd814f23
--- /dev/null
+++ b/ipa-server/ipa-gui/ipa_gui.egg-info/Makefile.am
@@ -0,0 +1,22 @@
+NULL =
+
+appdir = $(IPA_DATA_DIR)/ipa_gui.egg-info
+app_DATA =			\
+	dependency_links.txt	\
+	entry_points.txt	\
+	not-zip-safe		\
+	paster_plugins.txt	\
+	PKG-INFO		\
+	requires.txt		\
+	SOURCES.txt		\
+	sqlobject.txt		\
+	top_level.txt		\
+	$(NULL)
+
+EXTRA_DIST =			\
+	$(app_DATA)		\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
diff --git a/ipa-server/ipa-gui/ipagui/Makefile.am b/ipa-server/ipa-gui/ipagui/Makefile.am
new file mode 100644
index 000000000..683235678
--- /dev/null
+++ b/ipa-server/ipa-gui/ipagui/Makefile.am
@@ -0,0 +1,29 @@
+NULL =
+
+SUBDIRS =			\
+	config			\
+	forms			\
+	helpers			\
+	static			\
+	subcontrollers		\
+	templates		\
+	tests			\
+	$(NULL)
+
+appdir = $(IPA_DATA_DIR)/ipagui
+app_PYTHON = 			\
+	__init__.py		\
+	controllers.py		\
+	json.py			\
+	model.py		\
+	proxyprovider.py	\
+	proxyvisit.py		\
+	release.py		\
+	$(NULL)
+
+EXTRA_DIST =			\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
diff --git a/ipa-server/ipa-gui/ipagui/config/Makefile.am b/ipa-server/ipa-gui/ipagui/config/Makefile.am
new file mode 100644
index 000000000..5d5492841
--- /dev/null
+++ b/ipa-server/ipa-gui/ipagui/config/Makefile.am
@@ -0,0 +1,19 @@
+NULL =
+
+appdir = $(IPA_DATA_DIR)/ipagui/config
+app_PYTHON = 			\
+	__init__.py		\
+	$(NULL)
+
+app_DATA =			\
+	app.cfg			\
+	log.cfg			\
+	$(NULL)
+
+EXTRA_DIST =			\
+	$(app_DATA)		\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
diff --git a/ipa-server/ipa-gui/ipagui/forms/Makefile.am b/ipa-server/ipa-gui/ipagui/forms/Makefile.am
new file mode 100644
index 000000000..7945ce593
--- /dev/null
+++ b/ipa-server/ipa-gui/ipagui/forms/Makefile.am
@@ -0,0 +1,15 @@
+NULL =
+
+appdir = $(IPA_DATA_DIR)/ipagui/forms
+app_PYTHON = 			\
+	__init__.py		\
+	group.py		\
+	user.py			\
+	$(NULL)
+
+EXTRA_DIST =			\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
diff --git a/ipa-server/ipa-gui/ipagui/helpers/Makefile.am b/ipa-server/ipa-gui/ipagui/helpers/Makefile.am
new file mode 100644
index 000000000..490c8e4f1
--- /dev/null
+++ b/ipa-server/ipa-gui/ipagui/helpers/Makefile.am
@@ -0,0 +1,15 @@
+NULL =
+
+appdir = $(IPA_DATA_DIR)/ipagui/helpers
+app_PYTHON = 			\
+	__init__.py		\
+	ipahelper.py		\
+	userhelper.py		\
+	$(NULL)
+
+EXTRA_DIST =			\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
diff --git a/ipa-server/ipa-gui/ipagui/static/Makefile.am b/ipa-server/ipa-gui/ipagui/static/Makefile.am
new file mode 100644
index 000000000..11c213841
--- /dev/null
+++ b/ipa-server/ipa-gui/ipagui/static/Makefile.am
@@ -0,0 +1,11 @@
+NULL =
+
+SUBDIRS =			\
+	css			\
+	images			\
+	javascript		\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
diff --git a/ipa-server/ipa-gui/ipagui/static/css/Makefile.am b/ipa-server/ipa-gui/ipagui/static/css/Makefile.am
new file mode 100644
index 000000000..482893466
--- /dev/null
+++ b/ipa-server/ipa-gui/ipagui/static/css/Makefile.am
@@ -0,0 +1,14 @@
+NULL =
+
+appdir = $(IPA_DATA_DIR)/ipagui/static/css
+app_DATA = 			\
+	style.css		\
+	$(NULL)
+
+EXTRA_DIST =			\
+	$(app_DATA)		\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
diff --git a/ipa-server/ipa-gui/ipagui/static/images/Makefile.am b/ipa-server/ipa-gui/ipagui/static/images/Makefile.am
new file mode 100644
index 000000000..593cbe02f
--- /dev/null
+++ b/ipa-server/ipa-gui/ipagui/static/images/Makefile.am
@@ -0,0 +1,22 @@
+NULL =
+
+appdir = $(IPA_DATA_DIR)/ipagui/static/images
+app_DATA = 			\
+	down.gif		\
+	favicon.ico		\
+	header_inner.png	\
+	info.png		\
+	logo.png		\
+	ok.png			\
+	tg_under_the_hood.png	\
+	under_the_hood_blue.png	\
+	up.gif
+	$(NULL)
+
+EXTRA_DIST =			\
+	$(app_DATA)		\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
diff --git a/ipa-server/ipa-gui/ipagui/static/javascript/Makefile.am b/ipa-server/ipa-gui/ipagui/static/javascript/Makefile.am
new file mode 100644
index 000000000..ecf6164cf
--- /dev/null
+++ b/ipa-server/ipa-gui/ipagui/static/javascript/Makefile.am
@@ -0,0 +1,19 @@
+NULL =
+
+appdir = $(IPA_DATA_DIR)/ipagui/static/javascript
+app_DATA = 			\
+	dynamicedit.js		\
+	effects.js		\
+	ipautil.js		\
+	prototype.js		\
+	scriptaculous.js	\
+	tablekit.js		\
+	$(NULL)
+
+EXTRA_DIST =			\
+	$(app_DATA)		\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
diff --git a/ipa-server/ipa-gui/ipagui/subcontrollers/Makefile.am b/ipa-server/ipa-gui/ipagui/subcontrollers/Makefile.am
new file mode 100644
index 000000000..d7a26ea69
--- /dev/null
+++ b/ipa-server/ipa-gui/ipagui/subcontrollers/Makefile.am
@@ -0,0 +1,16 @@
+NULL =
+
+appdir = $(IPA_DATA_DIR)/ipagui/subcontrollers
+app_PYTHON = 			\
+	__init__.py		\
+	group.py		\
+	ipacontroller.py	\
+	user.py			\
+	$(NULL)
+
+EXTRA_DIST =			\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
diff --git a/ipa-server/ipa-gui/ipagui/templates/Makefile.am b/ipa-server/ipa-gui/ipagui/templates/Makefile.am
new file mode 100644
index 000000000..f168fec7b
--- /dev/null
+++ b/ipa-server/ipa-gui/ipagui/templates/Makefile.am
@@ -0,0 +1,35 @@
+NULL =
+
+appdir = $(IPA_DATA_DIR)/ipagui/templates
+app_PYTHON = 			\
+	__init__.py		\
+	$(NULL)
+
+app_DATA =			\
+	dynamiceditsearch.kid	\
+	groupeditform.kid	\
+	groupedit.kid		\
+	grouplayout.kid		\
+	grouplist.kid		\
+	groupnewform.kid	\
+	groupnew.kid		\
+	groupshow.kid		\
+	loginfailed.kid		\
+	master.kid		\
+	usereditform.kid	\
+	useredit.kid		\
+	userlayout.kid		\
+	userlist.kid		\
+	usernewform.kid		\
+	usernew.kid		\
+	usershow.kid		\
+	welcome.kid		\
+	$(NULL)
+
+EXTRA_DIST =			\
+	$(app_DATA)		\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
diff --git a/ipa-server/ipa-gui/ipagui/tests/Makefile.am b/ipa-server/ipa-gui/ipagui/tests/Makefile.am
new file mode 100644
index 000000000..9902fef72
--- /dev/null
+++ b/ipa-server/ipa-gui/ipagui/tests/Makefile.am
@@ -0,0 +1,15 @@
+NULL =
+
+appdir = $(IPA_DATA_DIR)/ipagui/tests
+app_PYTHON = 			\
+	__init__.py		\
+	test_controllers.py	\
+	test_model.py		\
+	$(NULL)
+
+EXTRA_DIST =			\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
diff --git a/ipa-server/ipa-install/Makefile b/ipa-server/ipa-install/Makefile
deleted file mode 100644
index a4d510f2a..000000000
--- a/ipa-server/ipa-install/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-include ../Makefile.common
-
-all: ;
-
-install:
-	-mkdir -p $(SBINDIR)
-	install -m 755 ipa-server-install $(SBINDIR)
-	install -m 755 ipa-server-setupssl $(SHAREDIR)
-
-	-mkdir -p $(SHAREDIR)
-	install -m 644 share/*.ldif $(SHAREDIR)
-	install -m 644 share/*.template $(SHAREDIR)
-
-	$(MAKE) -C test $@
-
-clean:
-	rm -f *~ *.pyc
-	rm -f share/*~
diff --git a/ipa-server/ipa-install/Makefile.am b/ipa-server/ipa-install/Makefile.am
new file mode 100644
index 000000000..9ecf7e20d
--- /dev/null
+++ b/ipa-server/ipa-install/Makefile.am
@@ -0,0 +1,24 @@
+NULL =
+
+SUBDIRS =			\
+	share			\
+	$(NULL)
+
+sbin_SCRIPTS =			\
+	ipa-server-install	\
+	$(NULL)
+
+appdir = $(IPA_DATA_DIR)
+app_SCRIPTS =			\
+	ipa-server-setupssl	\
+	$(NULL)
+
+EXTRA_DIST =			\
+	README			\
+	$(app_SCRIPTS)		\
+	$(sbin_SCRIPTS)		\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
diff --git a/ipa-server/ipa-install/share/Makefile b/ipa-server/ipa-install/share/Makefile
deleted file mode 100644
index e69de29bb..000000000
--- a/ipa-server/ipa-install/share/Makefile
+++ /dev/null
diff --git a/ipa-server/ipa-install/share/Makefile.am b/ipa-server/ipa-install/share/Makefile.am
new file mode 100644
index 000000000..b8049e414
--- /dev/null
+++ b/ipa-server/ipa-install/share/Makefile.am
@@ -0,0 +1,23 @@
+NULL =
+
+appdir = $(IPA_DATA_DIR)
+app_DATA =			\
+	60kerberos.ldif		\
+	60samba.ldif		\
+	bootstrap-template.ldif	\
+	default-aci.ldif	\
+	kerberos.ldif		\
+	bind.named.conf.template\
+	bind.zone.db.template	\
+	certmap.conf.template	\
+	kdc.conf.template	\
+	krb5.conf.template	\
+	$(NULL)
+
+EXTRA_DIST =			\
+	$(app_DATA)		\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
diff --git a/ipa-server/ipa-install/test/Makefile b/ipa-server/ipa-install/test/Makefile
deleted file mode 100644
index 402ea18db..000000000
--- a/ipa-server/ipa-install/test/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-SHAREDIR = $(DESTDIR)/usr/share/ipa
-
-install:
-	-mkdir -p $(SHAREDIR)
-#	install -m 644 *.ldif $(SHAREDIR)
-
-clean:
-	rm -f *~
diff --git a/ipa-server/ipa-kpasswd/Makefile b/ipa-server/ipa-kpasswd/Makefile
deleted file mode 100644
index 918f74d04..000000000
--- a/ipa-server/ipa-kpasswd/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-include ../Makefile.common
-
-LDFLAGS +=-lkrb5 -llber -lldap
-
-OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
-
-all: $(OBJS)
-	$(CC) $(LDFLAGS) $(OBJS) -o ipa_kpasswd
-
-%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-install:
-	echo $(SBINDIR)
-	-mkdir -p $(SBINDIR)
-	install -m 755 ipa_kpasswd $(SBINDIR)
-	-mkdir -p $(INITDIR)
-	install -m 755 ipa-kpasswd.init $(INITDIR)/ipa-kpasswd
-
-clean:
-	rm -f *.o
-	rm -f ipa_kpasswd
-	rm -f *~
diff --git a/ipa-server/ipa-kpasswd/Makefile.am b/ipa-server/ipa-kpasswd/Makefile.am
new file mode 100644
index 000000000..4c1cf8c74
--- /dev/null
+++ b/ipa-server/ipa-kpasswd/Makefile.am
@@ -0,0 +1,50 @@
+NULL =
+
+INCLUDES =							\
+	-I.							\
+	-I$(srcdir)						\
+	-DPREFIX=\""$(prefix)"\" 				\
+	-DBINDIR=\""$(bindir)"\"				\
+	-DLIBDIR=\""$(libdir)"\" 				\
+	-DLIBEXECDIR=\""$(libexecdir)"\"			\
+	-DDATADIR=\""$(datadir)"\"				\
+	$(LDAP_CFLAGS)						\
+	$(KRB5_CFLAGS)						\
+	$(WARN_CFLAGS)						\
+	$(NULL)
+
+sbin_PROGRAMS =			\
+	ipa-kpasswd		\
+	$(NULL)
+
+ipa_kpasswd_SOURCES = 		\
+	ipa_kpasswd.c		\
+	$(NULL)
+
+ipa_kpasswd_LDADD =		\
+	$(LDAP_LIBS)		\
+	$(KRB5_LIBS)		\
+	$(NULL)
+
+EXTRA_DIST =			\
+	README			\
+	ipa-kpasswd.init	\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
+
+initdir=$(sysconfdir)/rc.d/init.d
+
+install-data-hook: ipa-kpasswd.init
+
+	if test '!' -d $(DESTDIR)$(initdir); then \
+		$(mkinstalldirs) $(DESTDIR)$(initdir); \
+		chmod 755 $(DESTDIR)$(initdir); \
+	fi
+
+	$(INSTALL_SCRIPT) $(srcdir)/ipa-kpasswd.init $(DESTDIR)$(initdir)/ipa-kpasswd
+
+uninstall-hook:
+	rm -f $(DESTDIR)$(initdir)/ipa-kpasswd
diff --git a/ipa-server/ipa-slapi-plugins/Makefile b/ipa-server/ipa-slapi-plugins/Makefile
deleted file mode 100644
index 23bcd94bd..000000000
--- a/ipa-server/ipa-slapi-plugins/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-SUBDIRS=ipa-pwd-extop ipa-memberof dna
-
-all:
-	@for subdir in $(SUBDIRS); do \
-		(cd $$subdir && $(MAKE) $@) || exit 1; \
-	done
-
-install:
-	@for subdir in $(SUBDIRS); do \
-		(cd $$subdir && $(MAKE) $@) || exit 1; \
-	done
-
-clean:
-	@for subdir in $(SUBDIRS); do \
-		(cd $$subdir && $(MAKE) $@) || exit 1; \
-	done
-	rm -f *~
diff --git a/ipa-server/ipa-slapi-plugins/Makefile.am b/ipa-server/ipa-slapi-plugins/Makefile.am
new file mode 100644
index 000000000..134f29d2f
--- /dev/null
+++ b/ipa-server/ipa-slapi-plugins/Makefile.am
@@ -0,0 +1,15 @@
+NULL =
+
+SUBDIRS =			\
+	ipa-pwd-extop		\
+	ipa-memberof		\
+	dna			\
+	$(NULL)
+
+EXTRA_DIST =			\
+	README			\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
diff --git a/ipa-server/ipa-slapi-plugins/dna/Makefile b/ipa-server/ipa-slapi-plugins/dna/Makefile
deleted file mode 100644
index 1e37d7793..000000000
--- 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 000000000..d8d6d1d7b
--- /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 399f89f00..7c8dad1aa 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>
diff --git a/ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile b/ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile
deleted file mode 100644
index e13446c4b..000000000
--- a/ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-include ../../Makefile.common
-
-SONAME = libipa-memberof-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/ipa-memberof/Makefile.am b/ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile.am
new file mode 100644
index 000000000..bc236c32c
--- /dev/null
+++ b/ipa-server/ipa-slapi-plugins/ipa-memberof/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-memberof-plugin.la	\
+	$(NULL)
+
+libipa_memberof_plugin_la_SOURCES = 	\
+	ipa-memberof.c			\
+	$(NULL)
+
+libipa_memberof_plugin_la_LIBADD = 	\
+	$(MOZLDAP_LIBS)			\
+	$(NULL)
+
+appdir = $(IPA_DATA_DIR)
+app_DATA =			\
+	memberof-conf.ldif	\
+	$(NULL)
+
+EXTRA_DIST =			\
+	$(app_DATA)		\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
diff --git a/ipa-server/ipa-slapi-plugins/ipa-memberof/ipa-memberof.c b/ipa-server/ipa-slapi-plugins/ipa-memberof/ipa-memberof.c
index c247d2590..b23a04ae6 100644
--- a/ipa-server/ipa-slapi-plugins/ipa-memberof/ipa-memberof.c
+++ b/ipa-server/ipa-slapi-plugins/ipa-memberof/ipa-memberof.c
@@ -65,7 +65,8 @@
 #  include <config.h>
 #endif
 
-#include "slapi-plugin.h"
+#include <dirsrv/slapi-plugin.h>
+
 #include "string.h"
 #include "nspr.h"
 
diff --git a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile
deleted file mode 100644
index 034b8e60b..000000000
--- a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-include ../../Makefile.common
-
-SONAME = libipa_pwd_extop.so
-LDFLAGS += -lkrb5 -llber -lldap -llber -lssl
-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/ipa-pwd-extop/Makefile.am b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am
new file mode 100644
index 000000000..684243839
--- /dev/null
+++ b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am
@@ -0,0 +1,42 @@
+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_pwd_extop.la		\
+	$(NULL)
+
+libipa_pwd_extop_la_SOURCES = 		\
+	ipa_pwd_extop.c			\
+	$(NULL)
+
+libipa_pwd_extop_la_LIBADD = 		\
+	$(MOZLDAP_LIBS)			\
+	$(NULL)
+
+appdir = $(IPA_DATA_DIR)
+app_DATA =			\
+	pwd-extop-conf.ldif	\
+	$(NULL)
+
+EXTRA_DIST =			\
+	README			\
+	$(app_DATA)		\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
diff --git a/ipa-server/ipaserver/Makefile.am b/ipa-server/ipaserver/Makefile.am
new file mode 100644
index 000000000..c762f9994
--- /dev/null
+++ b/ipa-server/ipaserver/Makefile.am
@@ -0,0 +1,17 @@
+NULL =
+
+appdir = $(IPA_DATA_DIR)/ipaserver
+app_PYTHON = 			\
+	__init__.py		\
+	bindinstance.py		\
+	dsinstance.py		\
+	ipaldap.py		\
+	krbinstance.py		\
+	$(NULL)
+
+EXTRA_DIST =			\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
diff --git a/ipa-server/xmlrpc-server/Makefile b/ipa-server/xmlrpc-server/Makefile
deleted file mode 100644
index 80c24193a..000000000
--- a/ipa-server/xmlrpc-server/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-include ../Makefile.common
-
-all: ;
-
-install:
-	-mkdir -p $(SHAREDIR)
-	-mkdir -p $(SHAREDIR)/html
-	install -m 644 *.py $(SHAREDIR)/ipaserver
-	install -m 644 ipa.conf $(SHAREDIR)
-	install -m 644 *.html $(SHAREDIR)/html
-
-clean:
-	rm -f *~ *.pyc
diff --git a/ipa-server/xmlrpc-server/Makefile.am b/ipa-server/xmlrpc-server/Makefile.am
new file mode 100644
index 000000000..97d57ca15
--- /dev/null
+++ b/ipa-server/xmlrpc-server/Makefile.am
@@ -0,0 +1,32 @@
+NULL =
+
+SUBDIRS =			\
+	test			\
+	$(NULL)
+
+htmldir = $(IPA_DATA_DIR)/html
+html_DATA =			\
+	ssbrowser.html		\
+	unauthorized.html	\
+	$(NULL)
+
+serverdir = $(IPA_DATA_DIR)/ipaserver
+server_PYTHON =			\
+	funcs.py		\
+	ipaxmlrpc.py		\
+	$(NULL)
+
+appdir = $(IPA_DATA_DIR)
+app_DATA =			\
+	ipa.conf		\
+	$(NULL)
+
+EXTRA_DIST =			\
+	README			\
+	$(app_DATA)		\
+	$(html_DATA)		\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
diff --git a/ipa-server/xmlrpc-server/test/Makefile.am b/ipa-server/xmlrpc-server/test/Makefile.am
new file mode 100644
index 000000000..310d9d472
--- /dev/null
+++ b/ipa-server/xmlrpc-server/test/Makefile.am
@@ -0,0 +1,12 @@
+NULL =
+
+EXTRA_DIST =			\
+	README			\
+	test_methods.py		\
+	test_mod_python.py	\
+	test.py			\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in