X-Git-Url: https://git.hcoop.net/hcoop/debian/courier-authlib.git/blobdiff_plain/1420868b3e321353480efbb7eb35e1e8d9943223..463a5c942956f42fce366796356201639cb0d92b:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7f4c09b..4e11ae8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,8 +17,8 @@ pkglibexecdir=$(libexecdir)/courier-authlib
 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
 sbin_PROGRAMS=authtest authenumerate authpasswd
 bin_PROGRAMS=courierauthconfig
@@ -48,13 +48,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
 
@@ -108,13 +109,11 @@ libauthshadow_la_LDFLAGS=$(commonldflags)
 
 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)
 
-authpgsqllib.lo: authpgsqllib.c authpgsqlrc.h
-
 if HAVE_AUTHPGSQL
 
 install-authpgsqlrc:
@@ -143,13 +142,11 @@ authpgsqlrc.h:
 # 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)
 
-authldaplib.lo: authldaplib.c authldaprc.h
-
 if HAVE_LDAP
 
 install-authldaprc:
@@ -177,13 +174,11 @@ authldaprc.h:
 
 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)
 
-authmysqllib.lo: authmysqllib.c authmysqlrc.h
-
 if HAVE_AUTHMYSQL
 install-authmysqlrc:
 	$(mkinstalldirs) $(DESTDIR)`dirname @authmysqlrc@` || :
@@ -210,13 +205,11 @@ authmysqlrc.h:
 
 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)
 
-authsqlitelib.lo: authsqlitelib.c authsqliterc.h
-
 if HAVE_AUTHSQLITE
 install-authsqliterc:
 	$(mkinstalldirs) $(DESTDIR)`dirname @authsqliterc@` || :
@@ -287,10 +280,20 @@ authdaemonrc.h:
 HTMLFILES=README.html NEWS.html INSTALL.html \
 	README.authsqlite.html README.authmysql.html README.authpostgres.html
 
+
+if HAVE_SGML
+
+GITFILES=authldaprc authmysqlrc authpgsqlrc authsqliterc authdaemonrc.in
+
+$(GITFILES): %: %.git
+	perl -p -e 's/\$$Id:[^\$$]*/\$$Id: '"`git log --pretty=format:\"%H\" -n 1 -- $<`-`date +%Y%m%d%H%M%S`/" <$< >$@.tmp
+	mv -f $@.tmp $@
+endif
+
 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 \
@@ -357,12 +360,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
 authdaemondprog_LDFLAGS=-export-dynamic $(modules:%=-dlopen %) @NETLIBS@
@@ -386,7 +391,8 @@ BUILT1=authlib.html authldaprc.h authmysqlrc.h authpgsqlrc.h authpiperc.h \
 	authchangepwdir.h sbindir.h \
 	pkglibdir.h pkgincludedir.h mailusergroup.h \
 	README_authlib.html
-BUILT_SOURCES=$(BUILT1) $(man3:%.3=%.html) $(man1:%.1=%.html)
+BUILT_SOURCES=$(BUILT1) $(GITFILES) $(man3:%.3=%.html) $(man1:%.1=%.html) \
+	authsqliterc.h authmysqlrc.h authpgsqlrc.h authldaprc.h
 
 authchangepwdir.h: config.status
 	echo '#define AUTHCHANGEPWDIR "$(pkglibexecdir)"' >authchangepwdir.h
@@ -462,14 +468,6 @@ authlib.3: authlib.3.in
 
 if HAVE_SGML
 
-GITFILES=authdaemonrc.in
-
-BUILT_SOURCES += $(GITFILES)
-
-$(GITFILES): %: %.git
-	perl -p -e 's/\$$Id:[^\$$]*/\$$Id: '"`git log --pretty=format:\"%H\" -n 1 -- $<`-`date +%Y%m%d%H%M%S`/" <$< >$@.tmp
-	mv -f $@.tmp $@
-
 authpasswd.html: authpasswd.sgml libs/docbook/sgml2html
 	libs/docbook/sgml2html authpasswd.sgml authpasswd.html
 
@@ -652,15 +650,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
 
 HTMLDOCFILES=$(HTMLFILES) README.authdebug.html README_authlib.html \
 	$(man3:%.3=%.html) $(man1:%.1=%.html) userdb/userdb.html userdb/makeuserdb.html userdb/userdbpw.html