[Fedora-directory-commits] ldapserver Makefile.am, 1.4, 1.5 Makefile.in, 1.4, 1.5

[Doctor Conrad]

Author: nkinder

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25655

Modified Files:
	Makefile.am Makefile.in 
Log Message:
Resolves: 211554

make install now uses FHS paths.



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.am	19 Oct 2006 15:54:32 -0000	1.4
+++ Makefile.am	20 Oct 2006 21:16:32 -0000	1.5
@@ -42,21 +42,78 @@
 	perl $(srcdir)/ldap/servers/slapd/mkDBErrStrs.pl -i @db_incdir@ -o .
 
 #------------------------
+# Install Paths
+#------------------------
+bindir = @prefix@/usr/bin
+configdir = @sysconfdir@/$(PACKAGE)/config
+datadir = @prefix@/usr/share/$(PACKAGE)/data
+plugindir = @prefix@/usr/lib/$(PACKAGE)/plugins
+propertydir = @sysconfdir@/$(PACKAGE)/property
+schemadir = @sysconfdir@/$(PACKAGE)/schema
+serverdir = @prefix@/usr/lib/$(PACKAGE)
+
+#------------------------
 # Build Products
 #------------------------
-bin_PROGRAMS = dbscan ds_newinst dsktune ldap-agent ldclt ldif \
-	migratecred mmldif ns-slapd pwdhash rsearch
-noinst_PROGRAMS = makstrdb
-lib_LTLIBRARIES = libslapd.la libback-ldbm.la libds_admin.la libns-dshttpd.la \
-	libacl-plugin.la libattr-unique-plugin.la libchainingdb-plugin.la \
+server_PROGRAMS = dbscan-bin ds_newinst-bin dsktune-bin ldap-agent-bin ldif-bin \
+	migratecred-bin mmldif-bin ns-slapd pwdhash-bin
+
+bin_PROGRAMS = infadd-bin ldclt-bin rsearch-bin
+
+server_LTLIBRARIES = libslapd.la libback-ldbm.la libds_admin.la libns-dshttpd.la
+
+plugin_LTLIBRARIES = libacl-plugin.la libattr-unique-plugin.la libchainingdb-plugin.la \
 	libcos-plugin.la libdes-plugin.la libdistrib-plugin.la \
 	libhttp-client-plugin.la libcollation-plugin.la libpam-passthru-plugin.la \
 	libpassthru-plugin.la libpresence-plugin.la libpwdstorage-plugin.la \
 	libreferint-plugin.la libreplication-plugin.la libretrocl-plugin.la \
 	libroles-plugin.la libstatechange-plugin.la libsyntax-plugin.la \
 	libviews-plugin.la
+
+nodist_property_DATA = ns-slapd.properties
+
+noinst_PROGRAMS = makstrdb
+
 noinst_LIBRARIES = libavl.a libldaputil.a
-nodist_data_DATA = ns-slapd.properties
+
+#------------------------
+# Installed Files
+#------------------------
+config_DATA = $(srcdir)/lib/ldaputil/certmap.conf \
+	$(srcdir)/ldap/schema/slapd-collations.conf
+
+data_DATA = $(srcdir)/ldap/ldif/Ace.ldif \
+	$(srcdir)/ldap/ldif/commonTasks.ldif \
+	$(srcdir)/ldap/ldif/European.ldif \
+	$(srcdir)/ldap/ldif/Eurosuffix.ldif \
+	$(srcdir)/ldap/ldif/Example.ldif \
+	$(srcdir)/ldap/ldif/Example-roles.ldif \
+	$(srcdir)/ldap/ldif/Example-views.ldif \
+	$(srcdir)/ldap/ldif/roledit.ldif \
+	$(srcdir)/ldap/ldif/tasks.ldif \
+	$(srcdir)/ldap/ldif/template.ldif \
+	$(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-FamilyNames \
+	$(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-GivenNames \
+	$(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-OrgUnits
+
+schema_DATA = $(srcdir)/ldap/schema/00core.ldif \
+	$(srcdir)/ldap/schema/05rfc2247.ldif \
+	$(srcdir)/ldap/schema/05rfc2927.ldif \
+	$(srcdir)/ldap/schema/10presence.ldif \
+	$(srcdir)/ldap/schema/10rfc2307.ldif \
+	$(srcdir)/ldap/schema/20subscriber.ldif \
+	$(srcdir)/ldap/schema/25java-object.ldif \
+	$(srcdir)/ldap/schema/28pilot.ldif \
+	$(srcdir)/ldap/schema/30ns-common.ldif \
+	$(srcdir)/ldap/schema/50ns-admin.ldif \
+	$(srcdir)/ldap/schema/50ns-certificate.ldif \
+	$(srcdir)/ldap/schema/50ns-directory.ldif \
+	$(srcdir)/ldap/schema/50ns-value.ldif \
+	$(srcdir)/ldap/schema/50ns-web.ldif \
+	$(srcdir)/ldap/schema/60pam-plugin.ldif \
+	$(srcdir)/ldap/schema/99user.ldif
+
+bin_SCRIPTS = $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl
 
 
 #////////////////////////////////////////////////////////////////
@@ -633,42 +690,52 @@
 #------------------------
 # dbscan
 #------------------------
-dbscan_SOURCES = ldap/servers/slapd/tools/dbscan.c
+dbscan_bin_SOURCES = ldap/servers/slapd/tools/dbscan.c
 
-dbscan_CPPFLAGS = @db_inc@ $(AM_CPPFLAGS)
-dbscan_LDADD = $(NSPR_LINK) $(DB_LINK)
+dbscan_bin_CPPFLAGS = @db_inc@ $(AM_CPPFLAGS)
+dbscan_bin_LDADD = $(NSPR_LINK) $(DB_LINK)
 
 #------------------------
 # ds_newinst
 #------------------------
-ds_newinst_SOURCES = ldap/admin/src/cfg_sspt.c \
+ds_newinst_bin_SOURCES = ldap/admin/src/cfg_sspt.c \
 	ldap/admin/src/create_instance.c \
 	ldap/admin/src/ds_newinst.c \
 	ldap/admin/src/script-gen.c
 
-ds_newinst_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @ldapsdk_inc@
@nss_inc@ @nspr_inc@
-ds_newinst_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK)
+ds_newinst_bin_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @ldapsdk_inc@
@nss_inc@ @nspr_inc@
+ds_newinst_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK)
$(SASL_LINK)
 
 #------------------------
 # dsktune
 #------------------------
-dsktune_SOURCES = ldap/systools/idsktune.c \
+dsktune_bin_SOURCES = ldap/systools/idsktune.c \
 	ldap/systools/pio.c
 
 #------------------------
+# infadd
+#------------------------
+infadd_bin_SOURCES = ldap/servers/slapd/tools/rsearch/addthread.c \
+	ldap/servers/slapd/tools/rsearch/infadd.c \
+	ldap/servers/slapd/tools/rsearch/nametable.c
+
+infadd_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
+infadd_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK)
+
+#------------------------
 # ldap-agent
 #------------------------
-ldap_agent_SOURCES = ldap/servers/snmp/main.c \
+ldap_agent_bin_SOURCES = ldap/servers/snmp/main.c \
 	ldap/servers/snmp/ldap-agent.c \
 	ldap/servers/slapd/agtmmap.c
 
-ldap_agent_CPPFLAGS = $(AM_CPPFLAGS) @netsnmp_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-ldap_agent_LDADD = $(NETSNMP_LINK)
+ldap_agent_bin_CPPFLAGS = $(AM_CPPFLAGS) @netsnmp_inc@ @ldapsdk_inc@ @nss_inc@
@nspr_inc@
+ldap_agent_bin_LDADD = $(NETSNMP_LINK)
 
 #------------------------
 # ldclt
 #------------------------
-ldclt_SOURCES = ldap/servers/slapd/tools/ldclt/data.c \
+ldclt_bin_SOURCES = ldap/servers/slapd/tools/ldclt/data.c \
 	ldap/servers/slapd/tools/ldclt/ldapfct.c \
 	ldap/servers/slapd/tools/ldclt/ldclt.c \
 	ldap/servers/slapd/tools/ldclt/ldcltU.c \
@@ -681,35 +748,35 @@
 	ldap/servers/slapd/tools/ldclt/workarounds.c
 
 if SOLARIS
-ldclt_SOURCES += ldap/servers/slapd/tools/ldclt/opCheck.c
+ldclt_bin_SOURCES += ldap/servers/slapd/tools/ldclt/opCheck.c
 endif
 
-ldclt_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-ldclt_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK)
+ldclt_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
+ldclt_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK)
 
 #------------------------
 # ldif
 #------------------------
-ldif_SOURCES = ldap/servers/slapd/tools/ldif.c
+ldif_bin_SOURCES = ldap/servers/slapd/tools/ldif.c
 
-ldif_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-ldif_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK)
+ldif_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
+ldif_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK)
 
 #------------------------
 # migratecred
 #------------------------
-migratecred_SOURCES = ldap/servers/slapd/tools/migratecred.c
+migratecred_bin_SOURCES = ldap/servers/slapd/tools/migratecred.c
 
-migratecred_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-migratecred_LDADD = libslapd.la $(NSPR_LINK) $(NSS_LINK) $(SVRCORE_LINK) $(LDAPSDK_LINK)
$(SASL_LINK)
+migratecred_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
+migratecred_bin_LDADD = libslapd.la $(NSPR_LINK) $(NSS_LINK) $(SVRCORE_LINK)
$(LDAPSDK_LINK) $(SASL_LINK)
 
 #------------------------
 # mmldif
 #------------------------
-mmldif_SOURCES = ldap/servers/slapd/tools/mmldif.c
+mmldif_bin_SOURCES = ldap/servers/slapd/tools/mmldif.c
 
-mmldif_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-mmldif_LDADD = libslapd.la $(NSPR_LINK) $(NSS_LINK) $(SVRCORE_LINK) $(LDAPSDK_LINK)
$(SASL_LINK)
+mmldif_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
+mmldif_bin_LDADD = libslapd.la $(NSPR_LINK) $(NSS_LINK) $(SVRCORE_LINK) $(LDAPSDK_LINK)
$(SASL_LINK)
 
 #------------------------
 # ns-slapd
@@ -756,18 +823,18 @@
 #------------------------
 # pwdhash
 #------------------------
-pwdhash_SOURCES = ldap/servers/slapd/tools/pwenc.c
+pwdhash_bin_SOURCES = ldap/servers/slapd/tools/pwenc.c
 
-pwdhash_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-pwdhash_LDADD = libslapd.la $(NSPR_LINK) $(NSS_LINK) $(SVRCORE_LINK) $(LDAPSDK_LINK)
$(SASL_LINK)
+pwdhash_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
+pwdhash_bin_LDADD = libslapd.la $(NSPR_LINK) $(NSS_LINK) $(SVRCORE_LINK) $(LDAPSDK_LINK)
$(SASL_LINK)
 
 #------------------------
 # rsearch
 #------------------------
-rsearch_SOURCES = ldap/servers/slapd/tools/rsearch/nametable.c \
+rsearch_bin_SOURCES = ldap/servers/slapd/tools/rsearch/nametable.c \
 	ldap/servers/slapd/tools/rsearch/rsearch.c \
 	ldap/servers/slapd/tools/rsearch/sdattable.c \
 	ldap/servers/slapd/tools/rsearch/searchthread.c
 
-rsearch_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-rsearch_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK)
+rsearch_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
+rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK)


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.4 -r 1.5 Makefile.in
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.in	19 Oct 2006 15:54:32 -0000	1.4
+++ Makefile.in	20 Oct 2006 21:16:32 -0000	1.5
@@ -17,7 +17,8 @@
 
 
 
-SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) $(libacl_plugin_la_SOURCES)
$(libattr_unique_plugin_la_SOURCES) $(libback_ldbm_la_SOURCES)
$(libchainingdb_plugin_la_SOURCES) $(libcollation_plugin_la_SOURCES)
$(libcos_plugin_la_SOURCES) $(libdes_plugin_la_SOURCES) $(libdistrib_plugin_la_SOURCES)
$(libds_admin_la_SOURCES) $(libhttp_client_plugin_la_SOURCES) $(libns_dshttpd_la_SOURCES)
$(libpam_passthru_plugin_la_SOURCES) $(libpassthru_plugin_la_SOURCES)
$(libpresence_plugin_la_SOURCES) $(libpwdstorage_plugin_la_SOURCES)
$(libreferint_plugin_la_SOURCES) $(libreplication_plugin_la_SOURCES)
$(libretrocl_plugin_la_SOURCES) $(libroles_plugin_la_SOURCES) $(libslapd_la_SOURCES)
$(libstatechange_plugin_la_SOURCES) $(libsyntax_plugin_la_SOURCES)
$(libviews_plugin_la_SOURCES) $(dbscan_SOURCES) $(ds_newinst_SOURCES) $(dsktune_SOURCES)
$(ldap_agent_SOURCES) $(ldclt_SOURCES) $(ldif_SOURCES) $(makstrdb_SOURCES)
$(migratecred_SOURCES) $(mmldif_SOURCES) $(ns_slapd_SOURCES) $(pwdhash_S!
 OURCES) $(rsearch_SOURCES)
+
+SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) $(libacl_plugin_la_SOURCES)
$(libattr_unique_plugin_la_SOURCES) $(libback_ldbm_la_SOURCES)
$(libchainingdb_plugin_la_SOURCES) $(libcollation_plugin_la_SOURCES)
$(libcos_plugin_la_SOURCES) $(libdes_plugin_la_SOURCES) $(libdistrib_plugin_la_SOURCES)
$(libds_admin_la_SOURCES) $(libhttp_client_plugin_la_SOURCES) $(libns_dshttpd_la_SOURCES)
$(libpam_passthru_plugin_la_SOURCES) $(libpassthru_plugin_la_SOURCES)
$(libpresence_plugin_la_SOURCES) $(libpwdstorage_plugin_la_SOURCES)
$(libreferint_plugin_la_SOURCES) $(libreplication_plugin_la_SOURCES)
$(libretrocl_plugin_la_SOURCES) $(libroles_plugin_la_SOURCES) $(libslapd_la_SOURCES)
$(libstatechange_plugin_la_SOURCES) $(libsyntax_plugin_la_SOURCES)
$(libviews_plugin_la_SOURCES) $(dbscan_bin_SOURCES) $(ds_newinst_bin_SOURCES)
$(dsktune_bin_SOURCES) $(infadd_bin_SOURCES) $(ldap_agent_bin_SOURCES)
$(ldclt_bin_SOURCES) $(ldif_bin_SOURCES) $(makstrdb_SOURCES) $(migratecred_bin_SOURCES)!
  $(mmldif_bin_SOURCES) $(ns_slapd_SOURCES) $(pwdhash_bin_SOURCES) $(rsearch_bin_SOURCES)
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -41,10 +42,12 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-bin_PROGRAMS = dbscan$(EXEEXT) ds_newinst$(EXEEXT) dsktune$(EXEEXT) \
-	ldap-agent$(EXEEXT) ldclt$(EXEEXT) ldif$(EXEEXT) \
-	migratecred$(EXEEXT) mmldif$(EXEEXT) ns-slapd$(EXEEXT) \
-	pwdhash$(EXEEXT) rsearch$(EXEEXT)
+server_PROGRAMS = dbscan-bin$(EXEEXT) ds_newinst-bin$(EXEEXT) \
+	dsktune-bin$(EXEEXT) ldap-agent-bin$(EXEEXT) ldif-bin$(EXEEXT) \
+	migratecred-bin$(EXEEXT) mmldif-bin$(EXEEXT) ns-slapd$(EXEEXT) \
+	pwdhash-bin$(EXEEXT)
+bin_PROGRAMS = infadd-bin$(EXEEXT) ldclt-bin$(EXEEXT) \
+	rsearch-bin$(EXEEXT)
 noinst_PROGRAMS = makstrdb$(EXEEXT)
 @SOLARIS_TRUE@am__append_1 = ldap/servers/slapd/tools/ldclt/opCheck.c
 DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
@@ -88,10 +91,14 @@
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(datadir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
+am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(serverdir)"
\
+	"$(DESTDIR)$(bindir)" "$(DESTDIR)$(serverdir)" \
+	"$(DESTDIR)$(bindir)" "$(DESTDIR)$(configdir)" \
+	"$(DESTDIR)$(datadir)" "$(DESTDIR)$(propertydir)" \
+	"$(DESTDIR)$(schemadir)"
+pluginLTLIBRARIES_INSTALL = $(INSTALL)
+serverLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(plugin_LTLIBRARIES) $(server_LTLIBRARIES)
 libacl_plugin_la_DEPENDENCIES = libns-dshttpd.la
 am_libacl_plugin_la_OBJECTS =  \
 	ldap/servers/plugins/acl/libacl_plugin_la-acl.lo \
@@ -526,28 +533,38 @@
 	ldap/servers/plugins/views/libviews_plugin_la-views.lo
 libviews_plugin_la_OBJECTS = $(am_libviews_plugin_la_OBJECTS)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
-am_dbscan_OBJECTS = ldap/servers/slapd/tools/dbscan-dbscan.$(OBJEXT)
-dbscan_OBJECTS = $(am_dbscan_OBJECTS)
-dbscan_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am_ds_newinst_OBJECTS = ldap/admin/src/ds_newinst-cfg_sspt.$(OBJEXT) \
-	ldap/admin/src/ds_newinst-create_instance.$(OBJEXT) \
-	ldap/admin/src/ds_newinst-ds_newinst.$(OBJEXT) \
-	ldap/admin/src/ds_newinst-script-gen.$(OBJEXT)
-ds_newinst_OBJECTS = $(am_ds_newinst_OBJECTS)
-ds_newinst_DEPENDENCIES = libds_admin.la $(am__DEPENDENCIES_1) \
+serverPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(server_PROGRAMS)
+am_dbscan_bin_OBJECTS =  \
+	ldap/servers/slapd/tools/dbscan_bin-dbscan.$(OBJEXT)
+dbscan_bin_OBJECTS = $(am_dbscan_bin_OBJECTS)
+dbscan_bin_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am_ds_newinst_bin_OBJECTS =  \
+	ldap/admin/src/ds_newinst_bin-cfg_sspt.$(OBJEXT) \
+	ldap/admin/src/ds_newinst_bin-create_instance.$(OBJEXT) \
+	ldap/admin/src/ds_newinst_bin-ds_newinst.$(OBJEXT) \
+	ldap/admin/src/ds_newinst_bin-script-gen.$(OBJEXT)
+ds_newinst_bin_OBJECTS = $(am_ds_newinst_bin_OBJECTS)
+ds_newinst_bin_DEPENDENCIES = libds_admin.la $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-am_dsktune_OBJECTS = ldap/systools/idsktune.$(OBJEXT) \
+am_dsktune_bin_OBJECTS = ldap/systools/idsktune.$(OBJEXT) \
 	ldap/systools/pio.$(OBJEXT)
-dsktune_OBJECTS = $(am_dsktune_OBJECTS)
-dsktune_LDADD = $(LDADD)
-am_ldap_agent_OBJECTS = ldap/servers/snmp/ldap_agent-main.$(OBJEXT) \
-	ldap/servers/snmp/ldap_agent-ldap-agent.$(OBJEXT) \
-	ldap/servers/slapd/ldap_agent-agtmmap.$(OBJEXT)
-ldap_agent_OBJECTS = $(am_ldap_agent_OBJECTS)
-ldap_agent_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__ldclt_SOURCES_DIST = ldap/servers/slapd/tools/ldclt/data.c \
+dsktune_bin_OBJECTS = $(am_dsktune_bin_OBJECTS)
+dsktune_bin_LDADD = $(LDADD)
+am_infadd_bin_OBJECTS = ldap/servers/slapd/tools/rsearch/infadd_bin-addthread.$(OBJEXT)
\
+	ldap/servers/slapd/tools/rsearch/infadd_bin-infadd.$(OBJEXT) \
+	ldap/servers/slapd/tools/rsearch/infadd_bin-nametable.$(OBJEXT)
+infadd_bin_OBJECTS = $(am_infadd_bin_OBJECTS)
+infadd_bin_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am_ldap_agent_bin_OBJECTS =  \
+	ldap/servers/snmp/ldap_agent_bin-main.$(OBJEXT) \
+	ldap/servers/snmp/ldap_agent_bin-ldap-agent.$(OBJEXT) \
+	ldap/servers/slapd/ldap_agent_bin-agtmmap.$(OBJEXT)
+ldap_agent_bin_OBJECTS = $(am_ldap_agent_bin_OBJECTS)
+ldap_agent_bin_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am__ldclt_bin_SOURCES_DIST = ldap/servers/slapd/tools/ldclt/data.c \
 	ldap/servers/slapd/tools/ldclt/ldapfct.c \
 	ldap/servers/slapd/tools/ldclt/ldclt.c \
 	ldap/servers/slapd/tools/ldclt/ldcltU.c \
@@ -559,39 +576,40 @@
 	ldap/servers/slapd/tools/ldclt/version.c \
 	ldap/servers/slapd/tools/ldclt/workarounds.c \
 	ldap/servers/slapd/tools/ldclt/opCheck.c
-@SOLARIS_TRUE@am__objects_3 = ldap/servers/slapd/tools/ldclt/ldclt-opCheck.$(OBJEXT)
-am_ldclt_OBJECTS =  \
-	ldap/servers/slapd/tools/ldclt/ldclt-data.$(OBJEXT) \
-	ldap/servers/slapd/tools/ldclt/ldclt-ldapfct.$(OBJEXT) \
-	ldap/servers/slapd/tools/ldclt/ldclt-ldclt.$(OBJEXT) \
-	ldap/servers/slapd/tools/ldclt/ldclt-ldcltU.$(OBJEXT) \
-	ldap/servers/slapd/tools/ldclt/ldclt-parser.$(OBJEXT) \
-	ldap/servers/slapd/tools/ldclt/ldclt-port.$(OBJEXT) \
-	ldap/servers/slapd/tools/ldclt/ldclt-scalab01.$(OBJEXT) \
-	ldap/servers/slapd/tools/ldclt/ldclt-threadMain.$(OBJEXT) \
-	ldap/servers/slapd/tools/ldclt/ldclt-utils.$(OBJEXT) \
-	ldap/servers/slapd/tools/ldclt/ldclt-version.$(OBJEXT) \
-	ldap/servers/slapd/tools/ldclt/ldclt-workarounds.$(OBJEXT) \
+@SOLARIS_TRUE@am__objects_3 = ldap/servers/slapd/tools/ldclt/ldclt_bin-opCheck.$(OBJEXT)
+am_ldclt_bin_OBJECTS =  \
+	ldap/servers/slapd/tools/ldclt/ldclt_bin-data.$(OBJEXT) \
+	ldap/servers/slapd/tools/ldclt/ldclt_bin-ldapfct.$(OBJEXT) \
+	ldap/servers/slapd/tools/ldclt/ldclt_bin-ldclt.$(OBJEXT) \
+	ldap/servers/slapd/tools/ldclt/ldclt_bin-ldcltU.$(OBJEXT) \
+	ldap/servers/slapd/tools/ldclt/ldclt_bin-parser.$(OBJEXT) \
+	ldap/servers/slapd/tools/ldclt/ldclt_bin-port.$(OBJEXT) \
+	ldap/servers/slapd/tools/ldclt/ldclt_bin-scalab01.$(OBJEXT) \
+	ldap/servers/slapd/tools/ldclt/ldclt_bin-threadMain.$(OBJEXT) \
+	ldap/servers/slapd/tools/ldclt/ldclt_bin-utils.$(OBJEXT) \
+	ldap/servers/slapd/tools/ldclt/ldclt_bin-version.$(OBJEXT) \
+	ldap/servers/slapd/tools/ldclt/ldclt_bin-workarounds.$(OBJEXT) \
 	$(am__objects_3)
-ldclt_OBJECTS = $(am_ldclt_OBJECTS)
-ldclt_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ldclt_bin_OBJECTS = $(am_ldclt_bin_OBJECTS)
+ldclt_bin_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am_ldif_OBJECTS = ldap/servers/slapd/tools/ldif-ldif.$(OBJEXT)
-ldif_OBJECTS = $(am_ldif_OBJECTS)
-ldif_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+am_ldif_bin_OBJECTS =  \
+	ldap/servers/slapd/tools/ldif_bin-ldif.$(OBJEXT)
+ldif_bin_OBJECTS = $(am_ldif_bin_OBJECTS)
+ldif_bin_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_makstrdb_OBJECTS = lib/libsi18n/makstrdb-makstrdb.$(OBJEXT)
 makstrdb_OBJECTS = $(am_makstrdb_OBJECTS)
 makstrdb_LDADD = $(LDADD)
-am_migratecred_OBJECTS =  \
-	ldap/servers/slapd/tools/migratecred-migratecred.$(OBJEXT)
-migratecred_OBJECTS = $(am_migratecred_OBJECTS)
-migratecred_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1) \
+am_migratecred_bin_OBJECTS =
ldap/servers/slapd/tools/migratecred_bin-migratecred.$(OBJEXT)
+migratecred_bin_OBJECTS = $(am_migratecred_bin_OBJECTS)
+migratecred_bin_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am_mmldif_OBJECTS = ldap/servers/slapd/tools/mmldif-mmldif.$(OBJEXT)
-mmldif_OBJECTS = $(am_mmldif_OBJECTS)
-mmldif_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1) \
+am_mmldif_bin_OBJECTS =  \
+	ldap/servers/slapd/tools/mmldif_bin-mmldif.$(OBJEXT)
+mmldif_bin_OBJECTS = $(am_mmldif_bin_OBJECTS)
+mmldif_bin_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_ns_slapd_OBJECTS = ldap/servers/slapd/ns_slapd-abandon.$(OBJEXT) \
@@ -632,19 +650,21 @@
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-am_pwdhash_OBJECTS = ldap/servers/slapd/tools/pwdhash-pwenc.$(OBJEXT)
-pwdhash_OBJECTS = $(am_pwdhash_OBJECTS)
-pwdhash_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1) \
+am_pwdhash_bin_OBJECTS =  \
+	ldap/servers/slapd/tools/pwdhash_bin-pwenc.$(OBJEXT)
+pwdhash_bin_OBJECTS = $(am_pwdhash_bin_OBJECTS)
+pwdhash_bin_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am_rsearch_OBJECTS =  \
-	ldap/servers/slapd/tools/rsearch/rsearch-nametable.$(OBJEXT) \
-	ldap/servers/slapd/tools/rsearch/rsearch-rsearch.$(OBJEXT) \
-	ldap/servers/slapd/tools/rsearch/rsearch-sdattable.$(OBJEXT) \
-	ldap/servers/slapd/tools/rsearch/rsearch-searchthread.$(OBJEXT)
-rsearch_OBJECTS = $(am_rsearch_OBJECTS)
-rsearch_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+am_rsearch_bin_OBJECTS = ldap/servers/slapd/tools/rsearch/rsearch_bin-nametable.$(OBJEXT)
\
+	ldap/servers/slapd/tools/rsearch/rsearch_bin-rsearch.$(OBJEXT) \
[...1708 lines suppressed...]
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(rsearch_CPPFLAGS)
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
ldap/servers/slapd/tools/rsearch/rsearch-searchthread.o -MD -MP -MF
"ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch-searchthread.Tpo" -c -o
ldap/servers/slapd/tools/rsearch/rsearch-searchthread.o `test -f
'ldap/servers/slapd/tools/rsearch/searchthread.c' || echo
'$(srcdir)/'`ldap/servers/slapd/tools/rsearch/searchthread.c; \
-@am__fastdepCC_TRUE@	then mv -f
"ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch-searchthread.Tpo"
"ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch-searchthread.Po"; else rm -f
"ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch-searchthread.Tpo"; exit 1;
fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/slapd/tools/rsearch/searchthread.c'
object='ldap/servers/slapd/tools/rsearch/rsearch-searchthread.o' libtool=no
@AMDEPBACKSLASH@
+ldap/servers/slapd/tools/rsearch/rsearch_bin-searchthread.o:
ldap/servers/slapd/tools/rsearch/searchthread.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(rsearch_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
ldap/servers/slapd/tools/rsearch/rsearch_bin-searchthread.o -MD -MP -MF
"ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch_bin-searchthread.Tpo" -c -o
ldap/servers/slapd/tools/rsearch/rsearch_bin-searchthread.o `test -f
'ldap/servers/slapd/tools/rsearch/searchthread.c' || echo
'$(srcdir)/'`ldap/servers/slapd/tools/rsearch/searchthread.c; \
+@am__fastdepCC_TRUE@	then mv -f
"ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch_bin-searchthread.Tpo"
"ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch_bin-searchthread.Po"; else
rm -f "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch_bin-searchthread.Tpo";
exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/slapd/tools/rsearch/searchthread.c'
object='ldap/servers/slapd/tools/rsearch/rsearch_bin-searchthread.o' libtool=no
@AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp)
@AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(rsearch_CPPFLAGS)
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
ldap/servers/slapd/tools/rsearch/rsearch-searchthread.o `test -f
'ldap/servers/slapd/tools/rsearch/searchthread.c' || echo
'$(srcdir)/'`ldap/servers/slapd/tools/rsearch/searchthread.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(rsearch_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
ldap/servers/slapd/tools/rsearch/rsearch_bin-searchthread.o `test -f
'ldap/servers/slapd/tools/rsearch/searchthread.c' || echo
'$(srcdir)/'`ldap/servers/slapd/tools/rsearch/searchthread.c
 
-ldap/servers/slapd/tools/rsearch/rsearch-searchthread.obj:
ldap/servers/slapd/tools/rsearch/searchthread.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(rsearch_CPPFLAGS)
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
ldap/servers/slapd/tools/rsearch/rsearch-searchthread.obj -MD -MP -MF
"ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch-searchthread.Tpo" -c -o
ldap/servers/slapd/tools/rsearch/rsearch-searchthread.obj `if test -f
'ldap/servers/slapd/tools/rsearch/searchthread.c'; then $(CYGPATH_W)
'ldap/servers/slapd/tools/rsearch/searchthread.c'; else $(CYGPATH_W)
'$(srcdir)/ldap/servers/slapd/tools/rsearch/searchthread.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f
"ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch-searchthread.Tpo"
"ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch-searchthread.Po"; else rm -f
"ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch-searchthread.Tpo"; exit 1;
fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/slapd/tools/rsearch/searchthread.c'
object='ldap/servers/slapd/tools/rsearch/rsearch-searchthread.obj' libtool=no
@AMDEPBACKSLASH@
+ldap/servers/slapd/tools/rsearch/rsearch_bin-searchthread.obj:
ldap/servers/slapd/tools/rsearch/searchthread.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(rsearch_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
ldap/servers/slapd/tools/rsearch/rsearch_bin-searchthread.obj -MD -MP -MF
"ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch_bin-searchthread.Tpo" -c -o
ldap/servers/slapd/tools/rsearch/rsearch_bin-searchthread.obj `if test -f
'ldap/servers/slapd/tools/rsearch/searchthread.c'; then $(CYGPATH_W)
'ldap/servers/slapd/tools/rsearch/searchthread.c'; else $(CYGPATH_W)
'$(srcdir)/ldap/servers/slapd/tools/rsearch/searchthread.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f
"ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch_bin-searchthread.Tpo"
"ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch_bin-searchthread.Po"; else
rm -f "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch_bin-searchthread.Tpo";
exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/slapd/tools/rsearch/searchthread.c'
object='ldap/servers/slapd/tools/rsearch/rsearch_bin-searchthread.obj' libtool=no
@AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp)
@AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(rsearch_CPPFLAGS)
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
ldap/servers/slapd/tools/rsearch/rsearch-searchthread.obj `if test -f
'ldap/servers/slapd/tools/rsearch/searchthread.c'; then $(CYGPATH_W)
'ldap/servers/slapd/tools/rsearch/searchthread.c'; else $(CYGPATH_W)
'$(srcdir)/ldap/servers/slapd/tools/rsearch/searchthread.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(rsearch_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
ldap/servers/slapd/tools/rsearch/rsearch_bin-searchthread.obj `if test -f
'ldap/servers/slapd/tools/rsearch/searchthread.c'; then $(CYGPATH_W)
'ldap/servers/slapd/tools/rsearch/searchthread.c'; else $(CYGPATH_W)
'$(srcdir)/ldap/servers/slapd/tools/rsearch/searchthread.c'; fi`
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
@@ -8147,23 +8368,74 @@
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
-install-nodist_dataDATA: $(nodist_data_DATA)
+install-configDATA: $(config_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)"
+	@list='$(config_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(configDATA_INSTALL) '$$d$$p'
'$(DESTDIR)$(configdir)/$$f'"; \
+	  $(configDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(configdir)/$$f"; \
+	done
+
+uninstall-configDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(config_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(configdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(configdir)/$$f"; \
+	done
+install-dataDATA: $(data_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)"
-	@list='$(nodist_data_DATA)'; for p in $$list; do \
+	@list='$(data_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " $(nodist_dataDATA_INSTALL) '$$d$$p'
'$(DESTDIR)$(datadir)/$$f'"; \
-	  $(nodist_dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
+	  echo " $(dataDATA_INSTALL) '$$d$$p'
'$(DESTDIR)$(datadir)/$$f'"; \
+	  $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
 	done
 
-uninstall-nodist_dataDATA:
+uninstall-dataDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(nodist_data_DATA)'; for p in $$list; do \
+	@list='$(data_DATA)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
 	  echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(datadir)/$$f"; \
 	done
+install-nodist_propertyDATA: $(nodist_property_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(propertydir)" || $(mkdir_p) "$(DESTDIR)$(propertydir)"
+	@list='$(nodist_property_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(nodist_propertyDATA_INSTALL) '$$d$$p'
'$(DESTDIR)$(propertydir)/$$f'"; \
+	  $(nodist_propertyDATA_INSTALL) "$$d$$p"
"$(DESTDIR)$(propertydir)/$$f"; \
+	done
+
+uninstall-nodist_propertyDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(nodist_property_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(propertydir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(propertydir)/$$f"; \
+	done
+install-schemaDATA: $(schema_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(schemadir)" || $(mkdir_p) "$(DESTDIR)$(schemadir)"
+	@list='$(schema_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(schemaDATA_INSTALL) '$$d$$p'
'$(DESTDIR)$(schemadir)/$$f'"; \
+	  $(schemaDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemadir)/$$f"; \
+	done
+
+uninstall-schemaDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(schema_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(schemadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(schemadir)/$$f"; \
+	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -8343,11 +8615,10 @@
 check-am: all-am
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(DATA)
-install-binPROGRAMS: install-libLTLIBRARIES
-
+all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \
+		$(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
"$(DESTDIR)$(datadir)"; do \
+	for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(serverdir)"
"$(DESTDIR)$(bindir)" "$(DESTDIR)$(serverdir)"
"$(DESTDIR)$(bindir)" "$(DESTDIR)$(configdir)"
"$(DESTDIR)$(datadir)" "$(DESTDIR)$(propertydir)"
"$(DESTDIR)$(schemadir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
@@ -8449,9 +8720,10 @@
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-am
 
-clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
-	clean-libtool clean-noinstLIBRARIES clean-noinstPROGRAMS \
-	mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic clean-libtool \
+	clean-noinstLIBRARIES clean-noinstPROGRAMS \
+	clean-pluginLTLIBRARIES clean-serverLTLIBRARIES \
+	clean-serverPROGRAMS mostlyclean-am
 
 distclean: distclean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -8470,9 +8742,12 @@
 
 info-am:
 
-install-data-am: install-nodist_dataDATA
+install-data-am: install-configDATA install-dataDATA \
+	install-nodist_propertyDATA install-pluginLTLIBRARIES \
+	install-schemaDATA install-serverLTLIBRARIES \
+	install-serverPROGRAMS
 
-install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+install-exec-am: install-binPROGRAMS install-binSCRIPTS
 
 install-info: install-info-am
 
@@ -8500,26 +8775,35 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
-	uninstall-libLTLIBRARIES uninstall-nodist_dataDATA
+uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
+	uninstall-configDATA uninstall-dataDATA uninstall-info-am \
+	uninstall-nodist_propertyDATA uninstall-pluginLTLIBRARIES \
+	uninstall-schemaDATA uninstall-serverLTLIBRARIES \
+	uninstall-serverPROGRAMS
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-	clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
-	clean-libtool clean-noinstLIBRARIES clean-noinstPROGRAMS ctags \
-	dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \
-	dist-zip distcheck distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags \
-	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-libLTLIBRARIES \
-	install-man install-nodist_dataDATA install-strip installcheck \
+	clean-binPROGRAMS clean-generic clean-libtool \
+	clean-noinstLIBRARIES clean-noinstPROGRAMS \
+	clean-pluginLTLIBRARIES clean-serverLTLIBRARIES \
+	clean-serverPROGRAMS ctags dist dist-all dist-bzip2 dist-gzip \
+	dist-shar dist-tarZ dist-zip distcheck distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-binPROGRAMS install-binSCRIPTS install-configDATA \
+	install-data install-data-am install-dataDATA install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-nodist_propertyDATA install-pluginLTLIBRARIES \
+	install-schemaDATA install-serverLTLIBRARIES \
+	install-serverPROGRAMS install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-info-am uninstall-libLTLIBRARIES \
-	uninstall-nodist_dataDATA
+	uninstall-binSCRIPTS uninstall-configDATA uninstall-dataDATA \
+	uninstall-info-am uninstall-nodist_propertyDATA \
+	uninstall-pluginLTLIBRARIES uninstall-schemaDATA \
+	uninstall-serverLTLIBRARIES uninstall-serverPROGRAMS
 
 
 dirver.h: Makefile