X-Git-Url: https://git.hcoop.net/hcoop/debian/courier-authlib.git/blobdiff_plain/d50284c4aa46bdb558ab92276d4e3ebd856fe9a6..c4b6c7dec3b65316d62340fbd218f1ac73cbdcd2:/Makefile.in?pf=hcoop diff --git a/Makefile.in b/Makefile.in index 4b08cf3..f14452b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -100,7 +100,6 @@ sbin_PROGRAMS = authtest$(EXEEXT) authenumerate$(EXEEXT) \ bin_PROGRAMS = courierauthconfig$(EXEEXT) noinst_PROGRAMS = authdaemontest$(EXEEXT) authmksock$(EXEEXT) \ authdaemondprog$(EXEEXT) -@HAVE_SGML_TRUE@am__append_1 = $(GITFILES) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -163,29 +162,28 @@ libauthcustom_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ am__DEPENDENCIES_1 = am_libauthldap_la_OBJECTS = authldap.lo preauthldap.lo authldaplib.lo libauthldap_la_OBJECTS = $(am_libauthldap_la_OBJECTS) -libauthldap_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(libauthldap_la_LDFLAGS) $(LDFLAGS) -o \ - $@ +libauthldap_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(libauthldap_la_LDFLAGS) \ + $(LDFLAGS) -o $@ am_libauthmysql_la_OBJECTS = authmysql.lo preauthmysql.lo \ authmysqllib.lo libauthmysql_la_OBJECTS = $(am_libauthmysql_la_OBJECTS) -libauthmysql_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(libauthmysql_la_LDFLAGS) $(LDFLAGS) \ - -o $@ +libauthmysql_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(libauthmysql_la_LDFLAGS) \ + $(LDFLAGS) -o $@ am_libauthpam_la_OBJECTS = authpam.lo preauthpam.lo libauthpam_la_OBJECTS = $(am_libauthpam_la_OBJECTS) libauthpam_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libauthpam_la_LDFLAGS) $(LDFLAGS) -o $@ -am_libauthpgsql_la_OBJECTS = authpgsql.lo preauthpgsql.lo \ - authpgsqllib.lo +am_libauthpgsql_la_OBJECTS = authpgsql.lo authpgsqllib.lo libauthpgsql_la_OBJECTS = $(am_libauthpgsql_la_OBJECTS) -libauthpgsql_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(libauthpgsql_la_LDFLAGS) $(LDFLAGS) \ - -o $@ +libauthpgsql_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(libauthpgsql_la_LDFLAGS) \ + $(LDFLAGS) -o $@ am_libauthpipe_la_OBJECTS = authpipe.lo authpipelib.lo libauthpipe_la_OBJECTS = $(am_libauthpipe_la_OBJECTS) libauthpipe_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @@ -203,13 +201,12 @@ libauthshadow_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(libauthshadow_la_LDFLAGS) $(LDFLAGS) \ -o $@ -am_libauthsqlite_la_OBJECTS = authsqlite.lo preauthsqlite.lo \ - authsqlitelib.lo +am_libauthsqlite_la_OBJECTS = authsqlite.lo authsqlitelib.lo libauthsqlite_la_OBJECTS = $(am_libauthsqlite_la_OBJECTS) -libauthsqlite_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(libauthsqlite_la_LDFLAGS) $(LDFLAGS) \ - -o $@ +libauthsqlite_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(libauthsqlite_la_LDFLAGS) \ + $(LDFLAGS) -o $@ am__DEPENDENCIES_2 = userdb/libuserdb.la am_libauthuserdb_la_OBJECTS = authuserdb.lo preauthuserdb.lo \ preauthuserdbcommon.lo authuserdbpwd.lo @@ -230,16 +227,16 @@ libcourierauth_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(libcourierauth_la_LDFLAGS) $(LDFLAGS) \ -o $@ -am_libcourierauthcommon_la_OBJECTS = authgetconfig.lo \ +am_libcourierauthcommon_la_OBJECTS = authconfigfile.lo \ authpwdenumerate.lo authsaslfrombase64.lo authsasltobase64.lo \ authsyschangepwd.lo authsyscommon.lo authldapescape.lo \ cramlib.lo checkpassword.lo cryptpassword.lo \ checkpasswordmd5.lo checkpasswordsha1.lo libcourierauthcommon_la_OBJECTS = \ $(am_libcourierauthcommon_la_OBJECTS) -libcourierauthcommon_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(libcourierauthcommon_la_LDFLAGS) \ +libcourierauthcommon_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(libcourierauthcommon_la_LDFLAGS) \ $(LDFLAGS) -o $@ libcourierauthsasl_la_DEPENDENCIES = libcourierauthcommon.la \ libcourierauth.la @@ -264,12 +261,13 @@ libcourierauthsaslclient_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_CFLAGS) $(CFLAGS) $(libcourierauthsaslclient_la_LDFLAGS) \ $(LDFLAGS) -o $@ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(sbin_PROGRAMS) -am_authdaemondprog_OBJECTS = authdaemond.$(OBJEXT) +am_authdaemondprog_OBJECTS = authdaemond.$(OBJEXT) \ + authdaemondcpp.$(OBJEXT) authdaemondprog_OBJECTS = $(am_authdaemondprog_OBJECTS) -authdaemondprog_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(authdaemondprog_LDFLAGS) $(LDFLAGS) \ - -o $@ +authdaemondprog_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(authdaemondprog_LDFLAGS) \ + $(LDFLAGS) -o $@ am_authdaemontest_OBJECTS = authdaemontest.$(OBJEXT) authdaemontest_OBJECTS = $(am_authdaemontest_OBJECTS) authdaemontest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @@ -329,6 +327,24 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(libauthcustom_la_SOURCES) $(libauthldap_la_SOURCES) \ $(libauthmysql_la_SOURCES) $(libauthpam_la_SOURCES) \ $(libauthpgsql_la_SOURCES) $(libauthpipe_la_SOURCES) \ @@ -475,6 +491,10 @@ COURIERCONFIG = @COURIERCONFIG@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CRYPTLIBS = @CRYPTLIBS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -574,6 +594,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -645,8 +666,8 @@ modules = @LIBAUTHUSERDB@ \ pkglibexec_SCRIPTS = authsystem.passwd pkglib_LTLIBRARIES = libcourierauth.la \ - libcourierauthsasl.la libcourierauthsaslclient.la \ - libcourierauthcommon.la $(modules) + libcourierauthcommon.la libcourierauthsasl.la libcourierauthsaslclient.la \ + $(modules) sbin_SCRIPTS = authdaemond EXTRA_LTLIBRARIES = libauthuserdb.la \ @@ -672,13 +693,14 @@ commonlibadd = libcourierauthcommon.la libcourierauthcommon_t = @CRYPTLIBS@ libcourierauthcommon_la_SOURCES = \ auth.h courierauth.h \ - authgetconfig.c \ + authconfigfile.cpp \ + authconfigfile.h \ authpwdenumerate.c \ authsaslfrombase64.c authsasltobase64.c \ courierauthstaticlist.h \ authsyschangepwd.c authsyscommon.c \ authldapescape.c \ - cramlib.c cramlib.h \ + cramlib.c \ checkpassword.c cryptpassword.c \ checkpasswordmd5.c checkpasswordsha1.c @@ -726,28 +748,28 @@ libauthshadow_la_LDFLAGS = $(commonldflags) # The authpgsql module libauthpgsql_t = @PGSQL_LIBS@ @LIBM@ @NETLIBS@ -libauthpgsql_la_SOURCES = authpgsql.c preauthpgsql.c authpgsqllib.c authpgsql.h +libauthpgsql_la_SOURCES = authpgsql.c authpgsqllib.cpp authpgsql.h libauthpgsql_la_DEPENDENCIES = $(commonlibdep) libauthpgsql_la_LIBADD = $(commonlibadd) $(libauthpgsql_t) libauthpgsql_la_LDFLAGS = $(commonldflags) # The authldap module libauthldap_t = @LDAPLIBS@ @NETLIBS@ -libauthldap_la_SOURCES = authldap.c preauthldap.c authldaplib.c authldap.h +libauthldap_la_SOURCES = authldap.c preauthldap.c authldaplib.cpp authldap.h libauthldap_la_DEPENDENCIES = $(commonlibdep) libauthldap_la_LIBADD = $(commonlibadd) $(libauthldap_t) libauthldap_la_LDFLAGS = $(commonldflags) # The authmysql module libauthmysql_t = @MYSQL_LIBS@ @LIBM@ @NETLIBS@ -libauthmysql_la_SOURCES = authmysql.c preauthmysql.c authmysqllib.c authmysql.h +libauthmysql_la_SOURCES = authmysql.cpp preauthmysql.cpp authmysqllib.cpp authmysql.h libauthmysql_la_DEPENDENCIES = $(commonlibdep) libauthmysql_la_LIBADD = $(commonlibadd) $(libauthmysql_t) libauthmysql_la_LDFLAGS = $(commonldflags) # The authsqlite module libauthsqlite_t = @SQLITE_LIBS@ @NETLIBS@ -libauthsqlite_la_SOURCES = authsqlite.c preauthsqlite.c authsqlitelib.c authsqlite.h +libauthsqlite_la_SOURCES = authsqlite.cpp authsqlitelib.cpp authsqlite.h libauthsqlite_la_DEPENDENCIES = $(commonlibdep) libauthsqlite_la_LIBADD = $(commonlibadd) $(libauthsqlite_t) libauthsqlite_la_LDFLAGS = $(commonldflags) @@ -766,10 +788,11 @@ libauthpipe_la_LDFLAGS = $(commonldflags) HTMLFILES = README.html NEWS.html INSTALL.html \ README.authsqlite.html README.authmysql.html README.authpostgres.html +@HAVE_SGML_TRUE@GITFILES = authldaprc authmysqlrc authpgsqlrc authsqliterc authdaemonrc.in EXTRA_DIST = $(HTMLFILES) sysconftool COPYING COPYING.GPL\ authldap.schema \ authldap.ldif \ - authldaprc authmysqlrc authpgsqlrc authsqliterc README.ldap \ + $(GITFILES) README.ldap \ README.authmysql.myownquery \ README.authdebug.html.in \ courier-authlib.spec \ @@ -826,13 +849,14 @@ authenumerate_LDFLAGS = # # The main daemon. -authdaemondprog_SOURCES = authdaemond.c +authdaemondprog_SOURCES = authdaemond.c authdaemondcpp.cpp authdaemondprog_DEPENDENCIES = libcourierauthcommon.la \ + libcourierauth.la \ libs/liblock/liblock.la $(modules) \ libs/libhmac/libhmac.la libs/md5/libmd5.la libs/sha1/libsha1.la \ libs/rfc822/libencode.la libs/numlib/libnumlib.la -authdaemondprog_LDADD = $(LIBLTDL) libcourierauthcommon.la libs/liblock/liblock.la \ +authdaemondprog_LDADD = $(LIBLTDL) libcourierauthcommon.la libcourierauth.la libs/liblock/liblock.la \ libs/libhmac/libhmac.la libs/md5/libmd5.la libs/sha1/libsha1.la \ libs/rfc822/libencode.la libs/numlib/libnumlib.la @@ -854,10 +878,10 @@ BUILT1 = authlib.html authldaprc.h authmysqlrc.h authpgsqlrc.h authpiperc.h \ pkglibdir.h pkgincludedir.h mailusergroup.h \ README_authlib.html -BUILT_SOURCES = $(BUILT1) $(man3:%.3=%.html) $(man1:%.1=%.html) \ - $(am__append_1) +BUILT_SOURCES = $(BUILT1) $(GITFILES) $(man3:%.3=%.html) $(man1:%.1=%.html) \ + authsqliterc.h authmysqlrc.h authpgsqlrc.h authldaprc.h + noinst_DATA = $(BUILT_SOURCES) -@HAVE_SGML_TRUE@GITFILES = authdaemonrc.in HTMLDOCFILES = $(HTMLFILES) README.authdebug.html README_authlib.html \ $(man3:%.3=%.html) $(man1:%.1=%.html) userdb/userdb.html userdb/makeuserdb.html userdb/userdbpw.html @@ -865,7 +889,7 @@ all: $(BUILT_SOURCES) courier_auth_config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .cpp .lo .o .obj am--refresh: Makefile @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @@ -978,16 +1002,16 @@ libauthcustom.la: $(libauthcustom_la_OBJECTS) $(libauthcustom_la_DEPENDENCIES) $ $(AM_V_CCLD)$(libauthcustom_la_LINK) $(libauthcustom_la_OBJECTS) $(libauthcustom_la_LIBADD) $(LIBS) libauthldap.la: $(libauthldap_la_OBJECTS) $(libauthldap_la_DEPENDENCIES) $(EXTRA_libauthldap_la_DEPENDENCIES) - $(AM_V_CCLD)$(libauthldap_la_LINK) $(libauthldap_la_OBJECTS) $(libauthldap_la_LIBADD) $(LIBS) + $(AM_V_CXXLD)$(libauthldap_la_LINK) $(libauthldap_la_OBJECTS) $(libauthldap_la_LIBADD) $(LIBS) libauthmysql.la: $(libauthmysql_la_OBJECTS) $(libauthmysql_la_DEPENDENCIES) $(EXTRA_libauthmysql_la_DEPENDENCIES) - $(AM_V_CCLD)$(libauthmysql_la_LINK) $(libauthmysql_la_OBJECTS) $(libauthmysql_la_LIBADD) $(LIBS) + $(AM_V_CXXLD)$(libauthmysql_la_LINK) $(libauthmysql_la_OBJECTS) $(libauthmysql_la_LIBADD) $(LIBS) libauthpam.la: $(libauthpam_la_OBJECTS) $(libauthpam_la_DEPENDENCIES) $(EXTRA_libauthpam_la_DEPENDENCIES) $(AM_V_CCLD)$(libauthpam_la_LINK) $(libauthpam_la_OBJECTS) $(libauthpam_la_LIBADD) $(LIBS) libauthpgsql.la: $(libauthpgsql_la_OBJECTS) $(libauthpgsql_la_DEPENDENCIES) $(EXTRA_libauthpgsql_la_DEPENDENCIES) - $(AM_V_CCLD)$(libauthpgsql_la_LINK) $(libauthpgsql_la_OBJECTS) $(libauthpgsql_la_LIBADD) $(LIBS) + $(AM_V_CXXLD)$(libauthpgsql_la_LINK) $(libauthpgsql_la_OBJECTS) $(libauthpgsql_la_LIBADD) $(LIBS) libauthpipe.la: $(libauthpipe_la_OBJECTS) $(libauthpipe_la_DEPENDENCIES) $(EXTRA_libauthpipe_la_DEPENDENCIES) $(AM_V_CCLD)$(libauthpipe_la_LINK) $(libauthpipe_la_OBJECTS) $(libauthpipe_la_LIBADD) $(LIBS) @@ -999,7 +1023,7 @@ libauthshadow.la: $(libauthshadow_la_OBJECTS) $(libauthshadow_la_DEPENDENCIES) $ $(AM_V_CCLD)$(libauthshadow_la_LINK) $(libauthshadow_la_OBJECTS) $(libauthshadow_la_LIBADD) $(LIBS) libauthsqlite.la: $(libauthsqlite_la_OBJECTS) $(libauthsqlite_la_DEPENDENCIES) $(EXTRA_libauthsqlite_la_DEPENDENCIES) - $(AM_V_CCLD)$(libauthsqlite_la_LINK) $(libauthsqlite_la_OBJECTS) $(libauthsqlite_la_LIBADD) $(LIBS) + $(AM_V_CXXLD)$(libauthsqlite_la_LINK) $(libauthsqlite_la_OBJECTS) $(libauthsqlite_la_LIBADD) $(LIBS) libauthuserdb.la: $(libauthuserdb_la_OBJECTS) $(libauthuserdb_la_DEPENDENCIES) $(EXTRA_libauthuserdb_la_DEPENDENCIES) $(AM_V_CCLD)$(libauthuserdb_la_LINK) $(libauthuserdb_la_OBJECTS) $(libauthuserdb_la_LIBADD) $(LIBS) @@ -1008,7 +1032,7 @@ libcourierauth.la: $(libcourierauth_la_OBJECTS) $(libcourierauth_la_DEPENDENCIES $(AM_V_CCLD)$(libcourierauth_la_LINK) -rpath $(pkglibdir) $(libcourierauth_la_OBJECTS) $(libcourierauth_la_LIBADD) $(LIBS) libcourierauthcommon.la: $(libcourierauthcommon_la_OBJECTS) $(libcourierauthcommon_la_DEPENDENCIES) $(EXTRA_libcourierauthcommon_la_DEPENDENCIES) - $(AM_V_CCLD)$(libcourierauthcommon_la_LINK) -rpath $(pkglibdir) $(libcourierauthcommon_la_OBJECTS) $(libcourierauthcommon_la_LIBADD) $(LIBS) + $(AM_V_CXXLD)$(libcourierauthcommon_la_LINK) -rpath $(pkglibdir) $(libcourierauthcommon_la_OBJECTS) $(libcourierauthcommon_la_LIBADD) $(LIBS) libcourierauthsasl.la: $(libcourierauthsasl_la_OBJECTS) $(libcourierauthsasl_la_DEPENDENCIES) $(EXTRA_libcourierauthsasl_la_DEPENDENCIES) $(AM_V_CCLD)$(libcourierauthsasl_la_LINK) -rpath $(pkglibdir) $(libcourierauthsasl_la_OBJECTS) $(libcourierauthsasl_la_LIBADD) $(LIBS) @@ -1125,7 +1149,7 @@ clean-sbinPROGRAMS: authdaemondprog$(EXEEXT): $(authdaemondprog_OBJECTS) $(authdaemondprog_DEPENDENCIES) $(EXTRA_authdaemondprog_DEPENDENCIES) @rm -f authdaemondprog$(EXEEXT) - $(AM_V_CCLD)$(authdaemondprog_LINK) $(authdaemondprog_OBJECTS) $(authdaemondprog_LDADD) $(LIBS) + $(AM_V_CXXLD)$(authdaemondprog_LINK) $(authdaemondprog_OBJECTS) $(authdaemondprog_LDADD) $(LIBS) authdaemontest$(EXEEXT): $(authdaemontest_OBJECTS) $(authdaemontest_DEPENDENCIES) $(EXTRA_authdaemontest_DEPENDENCIES) @rm -f authdaemontest$(EXEEXT) @@ -1227,13 +1251,14 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authconfigfile.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authcustom.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authdaemon.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authdaemond.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authdaemondcpp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authdaemonlib.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authdaemontest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authenumerate.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authgetconfig.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authinfo.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authldap.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authldapescape.Plo@am__quote@ @@ -1284,10 +1309,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthldap.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthmysql.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthpam.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthpgsql.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthpwd.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthshadow.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthsqlite.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthuserdb.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthuserdbcommon.Plo@am__quote@ @@ -1312,6 +1335,27 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +.cpp.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cpp.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< + mostlyclean-libtool: -rm -f *.lo @@ -1602,7 +1646,7 @@ distdir: $(DISTFILES) ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz $(am__post_remove_distdir) dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 @@ -1627,7 +1671,7 @@ dist-shar: distdir @echo WARNING: "Support for shar distribution archives is" \ "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz $(am__post_remove_distdir) dist-zip: distdir @@ -1645,7 +1689,7 @@ dist dist-all: distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -1655,7 +1699,7 @@ distcheck: dist *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac @@ -1886,8 +1930,6 @@ uninstall-man: uninstall-man1 uninstall-man3 .PRECIOUS: Makefile -authpgsqllib.lo: authpgsqllib.c authpgsqlrc.h - @HAVE_AUTHPGSQL_TRUE@install-authpgsqlrc: @HAVE_AUTHPGSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authpgsqlrc@` || : @HAVE_AUTHPGSQL_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authpgsqlrc \ @@ -1907,8 +1949,6 @@ authpgsqllib.lo: authpgsqllib.c authpgsqlrc.h authpgsqlrc.h: echo "#define AUTHPGSQLRC \"@authpgsqlrc@\"" >authpgsqlrc.h -authldaplib.lo: authldaplib.c authldaprc.h - @HAVE_LDAP_TRUE@install-authldaprc: @HAVE_LDAP_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authldaprc@` || : @HAVE_LDAP_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authldaprc \ @@ -1928,8 +1968,6 @@ authldaplib.lo: authldaplib.c authldaprc.h authldaprc.h: echo "#define AUTHLDAPRC \"@authldaprc@\"" >authldaprc.h -authmysqllib.lo: authmysqllib.c authmysqlrc.h - @HAVE_AUTHMYSQL_TRUE@install-authmysqlrc: @HAVE_AUTHMYSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authmysqlrc@` || : @HAVE_AUTHMYSQL_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authmysqlrc \ @@ -1949,8 +1987,6 @@ authmysqllib.lo: authmysqllib.c authmysqlrc.h authmysqlrc.h: echo "#define AUTHMYSQLRC \"@authmysqlrc@\"" >authmysqlrc.h -authsqlitelib.lo: authsqlitelib.c authsqliterc.h - @HAVE_AUTHSQLITE_TRUE@install-authsqliterc: @HAVE_AUTHSQLITE_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authsqliterc@` || : @HAVE_AUTHSQLITE_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authsqliterc \ @@ -1993,6 +2029,10 @@ authdaemonrc.h: echo "#define AUTHDAEMONSOCK AUTHDAEMONVAR \"/socket\"" >>authdaemonrc.h echo "#define AUTHDAEMONLOCK AUTHDAEMONVAR \"/lock\"" >>authdaemonrc.h +@HAVE_SGML_TRUE@$(GITFILES): %: %.git +@HAVE_SGML_TRUE@ perl -p -e 's/\$$Id:[^\$$]*/\$$Id: '"`git log --pretty=format:\"%H\" -n 1 -- $<`-`date +%Y%m%d%H%M%S`/" <$< >$@.tmp +@HAVE_SGML_TRUE@ mv -f $@.tmp $@ + README: README.html links -dump -no-references README.html >README @@ -2072,10 +2112,6 @@ authlib.html: authlib.html.in authlib.3: authlib.3.in $(SHELL) ./config.status --file=authlib.3 -@HAVE_SGML_TRUE@$(GITFILES): %: %.git -@HAVE_SGML_TRUE@ perl -p -e 's/\$$Id:[^\$$]*/\$$Id: '"`git log --pretty=format:\"%H\" -n 1 -- $<`-`date +%Y%m%d%H%M%S`/" <$< >$@.tmp -@HAVE_SGML_TRUE@ mv -f $@.tmp $@ - @HAVE_SGML_TRUE@authpasswd.html: authpasswd.sgml libs/docbook/sgml2html @HAVE_SGML_TRUE@ libs/docbook/sgml2html authpasswd.sgml authpasswd.html @@ -2255,15 +2291,13 @@ bump.rpm.release: @PACKAGE@.spec @PACKAGE@.lpspec mv @PACKAGE@.lpspec.new @PACKAGE@.lpspec upload-beta: - test -z "$(SFPASSWD)" && exit 1; exit 0 rm -f @PACKAGE@-@VERSION@.tar.bz2.sig; gpg --detach-sign --default-key mrsam@courier-mta.com @PACKAGE@-@VERSION@.tar.bz2; test -f @PACKAGE@-@VERSION@.tar.bz2.sig || exit 1 - ~/src/sftools/release.pl mrsam $(SFPASSWD) courier authlib-devel `echo @VERSION@|sed 's/.*\(........\)/\1/'` @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig + ~/src/sftools/release.pl mrsam courier authlib-devel `echo @VERSION@|sed 's/.*\(........\)/\1/'` @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig upload-dist: - test -z "$(SFPASSWD)" && exit 1; exit 0 rm -f @PACKAGE@-@VERSION@.tar.bz2.sig; gpg --detach-sign --default-key mrsam@courier-mta.com @PACKAGE@-@VERSION@.tar.bz2; test -f @PACKAGE@-@VERSION@.tar.bz2.sig || exit 1 set -e; v="@PACKAGE@/@VERSION@/`date +%Y%m%d%H%M%S`"; git tag -s $$v -m 'Tag version @VERSION@'; cd libs; git tag -s $$v -m 'Tag version @VERSION@' - socksify ~/src/sftools/release.pl mrsam $(SFPASSWD) courier authlib @VERSION@ @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig + socksify ~/src/sftools/release.pl mrsam courier authlib @VERSION@ @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig htmldoc: $(HTMLDOCFILES) for f in $^; do d=`basename $$f`; test "$$d" = "README.html" && d="index.html"; tidy -i -q --tidy-mark no --doctype transitional --input-encoding utf8 --output-encoding utf8 -asxml <$$f >$$f.tmp ; xsltproc --nonet $$HOME/www/www.courier-mta.org/xsl/authlib.xsl $$f.tmp | perl -ne 's~\$(id):.*\$$~\$(id):'"$$h"'\$$~; print' >$$HOME/www/www.courier-mta.org/authlib/$$d; rm -f $$f.tmp; done