src/Makefile.am: remove RebindTest.cpp from the sources

rebuild Makefile.in

diff --git a/contrib/ldapc++/Makefile.in b/contrib/ldapc++/Makefile.in
index ba6ae63dce73aa713e4a363533b433b5860f4b58..92a5e7412e03f9f7aa19d5dbf6185a2296015b93 100644 (file)
--- a/contrib/ldapc++/Makefile.in
+++ b/contrib/ldapc++/Makefile.in
@@ -80,10 +80,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ./src/config.h
 CONFIG_CLEAN_FILES = 
-DIST_COMMON =  README AUTHORS ChangeLog INSTALL Makefile.am Makefile.in \
-NEWS TODO aclocal.m4 config.guess config.sub configure configure.in \
-install-sh ltconfig ltmain.sh missing mkinstalldirs src/config.h.in \
-src/stamp-h.in
+DIST_COMMON =  README AUTHORS Makefile.am Makefile.in TODO aclocal.m4 \
+config.guess config.sub configure configure.in install-sh ltconfig \
+ltmain.sh missing mkinstalldirs
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -107,34 +106,6 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
        cd $(srcdir) && $(AUTOCONF)
 
-src/config.h: src/stamp-h
-       @if test ! -f $@; then \
-               rm -f src/stamp-h; \
-               $(MAKE) src/stamp-h; \
-       else :; fi
-src/stamp-h: $(srcdir)/src/config.h.in $(top_builddir)/config.status
-       cd $(top_builddir) \
-         && CONFIG_FILES= CONFIG_HEADERS=src/config.h \
-            $(SHELL) ./config.status
-       @echo timestamp > src/stamp-h 2> /dev/null
-$(srcdir)/src/config.h.in: $(srcdir)/src/stamp-h.in
-       @if test ! -f $@; then \
-               rm -f $(srcdir)/src/stamp-h.in; \
-               $(MAKE) $(srcdir)/src/stamp-h.in; \
-       else :; fi
-$(srcdir)/src/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-       cd $(top_srcdir) && $(AUTOHEADER)
-       @echo timestamp > $(srcdir)/src/stamp-h.in 2> /dev/null
-
-mostlyclean-hdr:
-
-clean-hdr:
-
-distclean-hdr:
-       -rm -f src/config.h
-
-maintainer-clean-hdr:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -323,33 +294,33 @@ distclean-generic:
        -rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-hdr mostlyclean-tags mostlyclean-generic
+mostlyclean-am:  mostlyclean-tags mostlyclean-generic
 
 mostlyclean: mostlyclean-recursive
 
-clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am
+clean-am:  clean-tags clean-generic mostlyclean-am
 
 clean: clean-recursive
 
-distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am
+distclean-am:  distclean-tags distclean-generic clean-am
        -rm -f libtool
 
 distclean: distclean-recursive
        -rm -f config.status
 
-maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-tags \
-               maintainer-clean-generic distclean-am
+maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
+               distclean-am
        @echo "This command is intended for maintainers to use;"
        @echo "it deletes files that may require special tools to rebuild."
 
 maintainer-clean: maintainer-clean-recursive
        -rm -f config.status
 
-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-install-data-recursive uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+.PHONY: install-data-recursive uninstall-data-recursive \
+install-exec-recursive uninstall-exec-recursive installdirs-recursive \
+uninstalldirs-recursive all-recursive check-recursive \
+installcheck-recursive info-recursive dvi-recursive \
+mostlyclean-recursive distclean-recursive clean-recursive \
 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
 distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
 dvi-am dvi check check-am installcheck-am installcheck install-exec-am \

diff --git a/contrib/ldapc++/src/Makefile.am b/contrib/ldapc++/src/Makefile.am
index a04d80d38be83821c11b858584e1c863b1f7f9df..b1a6bfaeffe5bf41a4268dcb062f889404b7453a 100644 (file)
--- a/contrib/ldapc++/src/Makefile.am
+++ b/contrib/ldapc++/src/Makefile.am
@@ -6,41 +6,40 @@
 lib_LTLIBRARIES = libldapcpp.la
 
 libldapcpp_la_SOURCES = LDAPAddRequest.cpp \
-                       LDAPAsynConnection.cpp \
-                       LDAPAttribute.cpp \
-                       LDAPAttributeList.cpp \
-                       LDAPBindRequest.cpp \
-                       LDAPCompareRequest.cpp \
+            LDAPAsynConnection.cpp \
+            LDAPAttribute.cpp \
+            LDAPAttributeList.cpp \
+            LDAPBindRequest.cpp \
+            LDAPCompareRequest.cpp \
             LDAPConnection.cpp \
-                       LDAPConstraints.cpp \
-                       LDAPControl.cpp \
-                       LDAPControlSet.cpp \
-                       LDAPDeleteRequest.cpp \
-                       LDAPEntry.cpp \
-                       LDAPEntryList.cpp \
-                       LDAPException.cpp \
-                       LDAPExtRequest.cpp \
-                       LDAPExtResult.cpp \
-                       LDAPMessage.cpp \
-                       LDAPMessageQueue.cpp \
-                       LDAPModDNRequest.cpp \
-                       LDAPModification.cpp \
-                       LDAPModifyRequest.cpp \
-                       LDAPModList.cpp \
-                       LDAPRebind.cpp \
-                       LDAPRebindAuth.cpp \
-                       LDAPReferralException.cpp \
+            LDAPConstraints.cpp \
+            LDAPControl.cpp \
+            LDAPControlSet.cpp \
+            LDAPDeleteRequest.cpp \
+            LDAPEntry.cpp \
+            LDAPEntryList.cpp \
+            LDAPException.cpp \
+            LDAPExtRequest.cpp \
+            LDAPExtResult.cpp \
+            LDAPMessage.cpp \
+            LDAPMessageQueue.cpp \
+            LDAPModDNRequest.cpp \
+            LDAPModification.cpp \
+            LDAPModifyRequest.cpp \
+            LDAPModList.cpp \
+            LDAPRebind.cpp \
+            LDAPRebindAuth.cpp \
+            LDAPReferralException.cpp \
             LDAPReferenceList.cpp \
             LDAPRequest.cpp \
-                       LDAPResult.cpp \
-                       LDAPSearchReference.cpp \
-                       LDAPSearchRequest.cpp \
-                       LDAPSearchResult.cpp \
-                       LDAPSearchResults.cpp \
-                       LDAPUrl.cpp \
-                       LDAPUrlList.cpp \
-                       StringList.cpp \
-                       RebindTest.cpp
+            LDAPResult.cpp \
+            LDAPSearchReference.cpp \
+            LDAPSearchRequest.cpp \
+            LDAPSearchResult.cpp \
+            LDAPSearchResults.cpp \
+            LDAPUrl.cpp \
+            LDAPUrlList.cpp \
+            StringList.cpp 
 
 include_HEADERS = LDAPAsynConnection.h \
                         LDAPAttribute.h \
@@ -79,7 +78,7 @@ noinst_HEADERS = LDAPAddRequest.h \
 
 libldapcpp_la_LIBADD = -lldap -llber
 libldapcpp_la_LDFLAGS = -version-info 0:1:0
-                       
+            
 noinst_PROGRAMS = main
 
 main_SOURCES = main.cpp

diff --git a/contrib/ldapc++/src/Makefile.in b/contrib/ldapc++/src/Makefile.in
index 9605af623d0537a62801b62dac916c561385eff4..aeca82c2686bd429226a44e70522f33e33e0687b 100644 (file)
--- a/contrib/ldapc++/src/Makefile.in
+++ b/contrib/ldapc++/src/Makefile.in
@@ -76,7 +76,7 @@ VERSION = @VERSION@
 
 lib_LTLIBRARIES = libldapcpp.la
 
-libldapcpp_la_SOURCES = LDAPAddRequest.cpp                     LDAPAsynConnection.cpp                  LDAPAttribute.cpp                       LDAPAttributeList.cpp                   LDAPBindRequest.cpp                     LDAPCompareRequest.cpp             LDAPConnection.cpp                   LDAPConstraints.cpp                     LDAPControl.cpp                         LDAPControlSet.cpp                      LDAPDeleteRequest.cpp                   LDAPEntry.cpp                   LDAPEntryList.cpp                       LDAPException.cpp                       LDAPExtRequest.cpp                      LDAPExtResult.cpp                       LDAPMessage.cpp                         LDAPMessageQueue.cpp                    LDAPModDNRequest.cpp                    LDAPModification.cpp                    LDAPModifyRequest.cpp                   LDAPModList.cpp                         LDAPRebind.cpp                  LDAPRebindAuth.cpp                      LDAPReferralException.cpp             LDAPReferenceList.cpp             LDAPRequest.cpp                         LDAPResult.cpp                  LDAPSearchReference.cpp                         LDAPSearchRequest.cpp                   LDAPSearchResult.cpp                    LDAPSearchResults.cpp                   LDAPUrl.cpp                     LDAPUrlList.cpp                         StringList.cpp                  RebindTest.cpp
+libldapcpp_la_SOURCES = LDAPAddRequest.cpp             LDAPAsynConnection.cpp             LDAPAttribute.cpp             LDAPAttributeList.cpp             LDAPBindRequest.cpp             LDAPCompareRequest.cpp             LDAPConnection.cpp             LDAPConstraints.cpp             LDAPControl.cpp             LDAPControlSet.cpp             LDAPDeleteRequest.cpp             LDAPEntry.cpp             LDAPEntryList.cpp             LDAPException.cpp             LDAPExtRequest.cpp             LDAPExtResult.cpp             LDAPMessage.cpp             LDAPMessageQueue.cpp             LDAPModDNRequest.cpp             LDAPModification.cpp             LDAPModifyRequest.cpp             LDAPModList.cpp             LDAPRebind.cpp             LDAPRebindAuth.cpp             LDAPReferralException.cpp             LDAPReferenceList.cpp             LDAPRequest.cpp             LDAPResult.cpp             LDAPSearchReference.cpp             LDAPSearchRequest.cpp             LDAPSearchResult.cpp             LDAPSearchResults.cpp             LDAPUrl.cpp             LDAPUrlList.cpp             StringList.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 
@@ -113,7 +113,7 @@ LDAPModification.lo LDAPModifyRequest.lo LDAPModList.lo LDAPRebind.lo \
 LDAPRebindAuth.lo LDAPReferralException.lo LDAPReferenceList.lo \
 LDAPRequest.lo LDAPResult.lo LDAPSearchReference.lo \
 LDAPSearchRequest.lo LDAPSearchResult.lo LDAPSearchResults.lo \
-LDAPUrl.lo LDAPUrlList.lo StringList.lo RebindTest.lo
+LDAPUrl.lo LDAPUrlList.lo StringList.lo
 PROGRAMS =  $(noinst_PROGRAMS)
 
 main_OBJECTS =  main.o
@@ -145,7 +145,7 @@ DEP_FILES =  .deps/LDAPAddRequest.P .deps/LDAPAsynConnection.P \
 .deps/LDAPReferralException.P .deps/LDAPRequest.P .deps/LDAPResult.P \
 .deps/LDAPSearchReference.P .deps/LDAPSearchRequest.P \
 .deps/LDAPSearchResult.P .deps/LDAPSearchResults.P .deps/LDAPUrl.P \
-.deps/LDAPUrlList.P .deps/RebindTest.P .deps/StringList.P .deps/main.P
+.deps/LDAPUrlList.P .deps/StringList.P .deps/main.P
 SOURCES = $(libldapcpp_la_SOURCES) $(main_SOURCES)
 OBJECTS = $(libldapcpp_la_OBJECTS) $(main_OBJECTS)
 

diff --git a/contrib/ldapc++/src/main.cpp b/contrib/ldapc++/src/main.cpp
index 7735ba779fbed8cc9e09b5513abb17c341412294..595941e29c18cd5723b7ff72f6cf4eca1321b99f 100644 (file)
--- a/contrib/ldapc++/src/main.cpp
+++ b/contrib/ldapc++/src/main.cpp
@@ -15,7 +15,6 @@
 #include "LDAPException.h"
 #include "LDAPModification.h"
 #include "LDAPReferralException.h"
-#include "RebindTest.h"
 
 #include"debug.h"