Merge remote branch 'origin/mdb.master'

[openldap] / contrib / ldapc++ / src / Makefile.am

diff --git a/contrib/ldapc++/src/Makefile.am b/contrib/ldapc++/src/Makefile.am
index 8a1cf211dcd1a7fd6baf62e5d2c3d31080a9f2cc..c1a24217ddf02e18478a1918f896806f40126b68 100644 (file)
--- a/contrib/ldapc++/src/Makefile.am
+++ b/contrib/ldapc++/src/Makefile.am
@@ -1,5 +1,7 @@
-##
-# Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+# $OpenLDAP$
+
+###
+# Copyright 2000-2012 The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 ##
 
@@ -9,9 +11,10 @@ libldapcpp_la_SOURCES = LDAPAddRequest.cpp \
                        LDAPAsynConnection.cpp \
                        LDAPAttribute.cpp \
                        LDAPAttributeList.cpp \
+                       LDAPAttrType.cpp \
                        LDAPBindRequest.cpp \
                        LDAPCompareRequest.cpp \
-            LDAPConnection.cpp \
+                       LDAPConnection.cpp \
                        LDAPConstraints.cpp \
                        LDAPControl.cpp \
                        LDAPControlSet.cpp \
@@ -27,61 +30,74 @@ libldapcpp_la_SOURCES = LDAPAddRequest.cpp \
                        LDAPModification.cpp \
                        LDAPModifyRequest.cpp \
                        LDAPModList.cpp \
+                       LDAPObjClass.cpp \
                        LDAPRebind.cpp \
                        LDAPRebindAuth.cpp \
-                       LDAPReferralException.cpp \
-            LDAPReferenceList.cpp \
-            LDAPRequest.cpp \
+                       LDAPReferenceList.cpp \
+                       LDAPRequest.cpp \
                        LDAPResult.cpp \
+                       LDAPSaslBindResult.cpp \
+                       LDAPSchema.cpp \
                        LDAPSearchReference.cpp \
                        LDAPSearchRequest.cpp \
                        LDAPSearchResult.cpp \
                        LDAPSearchResults.cpp \
                        LDAPUrl.cpp \
                        LDAPUrlList.cpp \
-                       StringList.cpp 
+                       LdifReader.cpp \
+                       LdifWriter.cpp \
+                       SaslInteraction.cpp \
+                       SaslInteractionHandler.cpp \
+                       StringList.cpp \
+                       TlsOptions.cpp
 
 include_HEADERS = LDAPAsynConnection.h \
-                        LDAPAttribute.h \
-                        LDAPAttributeList.h \
-                        LDAPConnection.h \
-                        LDAPConstraints.h \
-                        LDAPControl.h \
-                        LDAPEntry.h \
-                        LDAPEntryList.h \
-                        LDAPException.h \
-                        LDAPExtResult.h \
-                        LDAPMessage.h \
-                        LDAPMessageQueue.h \
-                        LDAPModification.h \
-                        LDAPModList.h \
-                        LDAPRebind.h \
-                        LDAPRebindAuth.h \
-                        LDAPReferralException.h \
-                        LDAPReferenceList.h \
-                        LDAPResult.h \
-                        LDAPSearchReference.h \
-                        LDAPSearchResult.h \
-                        LDAPUrl.h \
-                        LDAPUrlList.h \
-                        StringList.h 
+                       LDAPAttribute.h \
+                       LDAPAttributeList.h \
+                       LDAPAttrType.h \
+                       LDAPConnection.h \
+                       LDAPConstraints.h \
+                       LDAPControl.h \
+                       LDAPControlSet.h \
+                       LDAPEntry.h \
+                       LDAPEntryList.h \
+                       LDAPException.h \
+                       LDAPExtResult.h \
+                       LDAPMessage.h \
+                       LDAPMessageQueue.h \
+                       LDAPModification.h \
+                       LDAPModList.h \
+                       LDAPObjClass.h \
+                       LDAPRebind.h \
+                       LDAPRebindAuth.h \
+                       LDAPReferenceList.h \
+                       LDAPResult.h \
+                       LDAPSaslBindResult.h \
+                       LDAPSchema.h \
+                       LDAPSearchReference.h \
+                       LDAPSearchResult.h \
+                       LDAPSearchResults.h \
+                       LDAPUrl.h \
+                       LDAPUrlList.h \
+                       LdifReader.h \
+                       LdifWriter.h \
+                       SaslInteraction.h \
+                       SaslInteractionHandler.h \
+                       StringList.h \
+                       TlsOptions.h
 
-noinst_HEADERS = LDAPAddRequest.h \
-                LDAPBindRequest.h \
-                LDAPCompareRequest.h \
-                LDAPDeleteRequest.h \
-                LDAPExtRequest.h \
-                LDAPModDNRequest.h \
-                LDAPModifyRequest.h \
-                LDAPRequest.h \
-                LDAPSearchRequest.h 
+noinst_HEADERS = ac/time.h \
+               debug.h \
+               LDAPAddRequest.h \
+               LDAPBindRequest.h \
+               LDAPCompareRequest.h \
+               LDAPDeleteRequest.h \
+               LDAPExtRequest.h \
+               LDAPModDNRequest.h \
+               LDAPModifyRequest.h \
+               LDAPRequest.h \
+               LDAPSearchRequest.h
 
 libldapcpp_la_LIBADD = -lldap -llber
-libldapcpp_la_LDFLAGS = -version-info 0:1:0
-                       
-noinst_PROGRAMS = main
-
-main_SOURCES = main.cpp
-main_LDADD = ./libldapcpp.la 
-
+libldapcpp_la_LDFLAGS = -version-info @OPENLDAP_CPP_API_VERSION@