From: Aki Tuomi Date: Thu, 17 Jul 2014 14:44:19 +0000 (+0300) Subject: Automake integration X-Git-Tag: auth-3.4.0-rc1~71^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5077b4ccf45df1257b483c44a34e446344441f2;p=thirdparty%2Fpdns.git Automake integration --- diff --git a/configure.ac b/configure.ac index 3b3dfe6700..f6006b10b5 100644 --- a/configure.ac +++ b/configure.ac @@ -326,8 +326,11 @@ AC_CONFIG_FILES([ pdns/Makefile codedocs/Makefile pdns/pdns + pdns/ext/Makefile pdns/ext/yahttp/Makefile pdns/ext/yahttp/yahttp/Makefile + pdns/ext/polarssl-1.3.2/Makefile + pdns/ext/polarssl-1.3.2/library/Makefile modules/bindbackend/Makefile modules/db2backend/Makefile modules/geobackend/Makefile diff --git a/m4/pdns_with_system_polarssl.m4 b/m4/pdns_with_system_polarssl.m4 index 4e1ae22d4b..ab981503ee 100644 --- a/m4/pdns_with_system_polarssl.m4 +++ b/m4/pdns_with_system_polarssl.m4 @@ -27,9 +27,9 @@ AC_DEFUN([PDNS_WITH_SYSTEM_POLARSSL],[ [have_system_polarssl=no] ) - POLARSSL_SUBDIR=ext/polarssl-1.3.2 - POLARSSL_CFLAGS=-I\$\(top_srcdir\)/pdns/$POLARSSL_SUBDIR/include/ - POLARSSL_LIBS=\$\(top_builddir\)/pdns/$POLARSSL_SUBDIR/library/libpolarssl.a + POLARSSL_SUBDIR=polarssl-1.3.2 + POLARSSL_CFLAGS=-I\$\(top_srcdir\)/pdns/ext/$POLARSSL_SUBDIR/include/ + POLARSSL_LIBS="-L\$(top_builddir)/pdns/ext/$POLARSSL_SUBDIR/library/ -lpolarssl" AS_IF([test "x$have_system_polarssl" = "xyes"],[ POLARSSL_CFLAGS= diff --git a/pdns/Makefile.am b/pdns/Makefile.am index da8539b861..d3f0bcb4f5 100644 --- a/pdns/Makefile.am +++ b/pdns/Makefile.am @@ -23,7 +23,7 @@ EXTRA_DIST = dnslabeltext.rl dnslabeltext.cc mtasker.cc inflighter.cc docs/pdns_ docs/dnsreplay.8 docs/dnsscope.8 docs/dnswasher.8 docs/pdnssec.8 docs/zone2ldap.8 \ bind-dnssec.schema.sqlite3.sql bindparser.h named.conf.parsertest -SUBDIRS= $(POLARSSL_SUBDIR) ext/yahttp +SUBDIRS= ext BUILT_SOURCES=bind-dnssec.schema.sqlite3.sql.h version_generated.h bindparser.h CLEANFILES=version_generated.h diff --git a/pdns/ext/polarssl-1.3.2/Makefile b/pdns/ext/polarssl-1.3.2/Makefile deleted file mode 100644 index 8a4e50ea5e..0000000000 --- a/pdns/ext/polarssl-1.3.2/Makefile +++ /dev/null @@ -1,28 +0,0 @@ - -DESTDIR=/usr/local -PREFIX=polarssl_ - -.SILENT: - -all: - cd library && $(MAKE) all && cd .. - -lib: - cd library && $(MAKE) all && cd .. - -install: - -uninstall: - -clean: - cd library && $(MAKE) clean && cd .. - -check: - -distdir: - mkdir -p $(distdir) - cp ChangeLog LICENSE Makefile README.rst $(distdir) - mkdir $(distdir)/library - mkdir -p $(distdir)/include/polarssl - cp library/Makefile library/*.c $(distdir)/library - cp include/polarssl/*.h $(distdir)/include/polarssl diff --git a/pdns/ext/polarssl-1.3.2/Makefile.am b/pdns/ext/polarssl-1.3.2/Makefile.am new file mode 100644 index 0000000000..e59ea2e477 --- /dev/null +++ b/pdns/ext/polarssl-1.3.2/Makefile.am @@ -0,0 +1,4 @@ +SUBDIRS=library + +EXTRA_DIST=ChangeLog LICENSE README.rst include/polarssl/bignum.h include/polarssl/compat-1.2.h include/polarssl/blowfish.h include/polarssl/pk_wrap.h include/polarssl/md5.h include/polarssl/net.h include/polarssl/x509.h include/polarssl/aes.h include/polarssl/ctr_drbg.h include/polarssl/padlock.h include/polarssl/ssl_ciphersuites.h include/polarssl/cipher_wrap.h include/polarssl/pkcs11.h include/polarssl/asn1write.h include/polarssl/threading.h include/polarssl/md4.h include/polarssl/certs.h include/polarssl/des.h include/polarssl/bn_mul.h include/polarssl/md2.h include/polarssl/xtea.h include/polarssl/ecdh.h include/polarssl/asn1.h include/polarssl/oid.h include/polarssl/pbkdf2.h include/polarssl/debug.h include/polarssl/base64.h include/polarssl/config.h include/polarssl/havege.h include/polarssl/camellia.h include/polarssl/rsa.h include/polarssl/ecdsa.h include/polarssl/md_wrap.h include/polarssl/gcm.h include/polarssl/x509_csr.h include/polarssl/pem.h include/polarssl/entropy_poll.h include/polarssl/pkcs12.h include/polarssl/md.h include/polarssl/openssl.h include/polarssl/ecp.h include/polarssl/version.h include/polarssl/x509_crl.h include/polarssl/sha512.h include/polarssl/entropy.h include/polarssl/pk.h include/polarssl/cipher.h include/polarssl/arc4.h include/polarssl/x509_crt.h include/polarssl/ssl_cache.h include/polarssl/sha1.h include/polarssl/pkcs5.h include/polarssl/memory.h include/polarssl/dhm.h include/polarssl/timing.h include/polarssl/ssl.h include/polarssl/error.h include/polarssl/sha256.h + diff --git a/pdns/ext/polarssl-1.3.2/library/Makefile b/pdns/ext/polarssl-1.3.2/library/Makefile deleted file mode 100644 index 37ad5b3c55..0000000000 --- a/pdns/ext/polarssl-1.3.2/library/Makefile +++ /dev/null @@ -1,109 +0,0 @@ - -# Also see "include/polarssl/config.h" - -# To compile on MinGW: add "-lws2_32" to LDFLAGS or define WINDOWS in your -# environment -# -CFLAGS += -I../include -D_FILE_OFFSET_BITS=64 -Wall -W -Wdeclaration-after-statement -CFLAGS += -fPIC -OFLAGS = -O2 - -ifdef DEBUG -CFLAGS += -g3 -endif - -# MicroBlaze specific options: -# CFLAGS += -mno-xl-soft-mul -mxl-barrel-shift - -# To compile on Plan9: -# CFLAGS += -D_BSD_EXTENSION - -# To compile as a shared library: -ifdef SHARED -CFLAGS += -fPIC -endif - -SONAME=libpolarssl.so.5 - -DLEXT=so.5 -# OSX shared library extension: -# DLEXT=dylib - -# Windows shared library extension: -ifdef WINDOWS -DLEXT=dll -LDFLAGS += -lws2_32 -endif - -OBJS= aes.o arc4.o asn1parse.o \ - asn1write.o base64.o bignum.o \ - blowfish.o camellia.o \ - certs.o cipher.o cipher_wrap.o \ - ctr_drbg.o debug.o des.o \ - dhm.o ecdh.o ecdsa.o \ - ecp.o \ - entropy.o entropy_poll.o \ - error.o gcm.o havege.o \ - md.o md_wrap.o md2.o \ - md4.o md5.o memory.o \ - memory_buffer_alloc.o net.o \ - oid.o \ - padlock.o pbkdf2.o pem.o \ - pkcs5.o pkcs11.o pkcs12.o \ - pk.o pk_wrap.o pkparse.o \ - pkwrite.o \ - rsa.o sha1.o sha256.o \ - sha512.o ssl_cache.o ssl_cli.o \ - ssl_srv.o ssl_ciphersuites.o \ - ssl_tls.o threading.o timing.o \ - version.o \ - x509.o x509_create.o \ - x509_crl.o x509_crt.o x509_csr.o \ - x509write_crt.o x509write_csr.o \ - xtea.o - -.SILENT: - -ifndef SHARED -all: static -else -all: shared -endif - -static: libpolarssl.a - -shared: libpolarssl.$(DLEXT) libpolarssl.so - -libpolarssl.a: $(OBJS) - echo " AR $@" - $(AR) r $@ $(OBJS) - echo " RL $@" - $(AR) s $@ - -libpolarssl.${DLEXT}: libpolarssl.a - echo " LD $@" - $(CC) ${LDFLAGS} -shared -Wl,-soname,$(SONAME) -o $@ $(OBJS) - -libpolarssl.so: libpolarssl.${DLEXT} - echo " LN $@ -> libpolarssl.${DLEXT}" - ln -sf libpolarssl.${DLEXT} $@ - -libpolarssl.dylib: libpolarssl.a - echo " LD $@" - $(CC) ${LDFLAGS} -dynamiclib -o $@ $(OBJS) - -libpolarssl.dll: libpolarssl.a - echo " LD $@" - $(CC) -shared -Wl,-soname,$@ -o $@ $(OBJS) -lws2_32 -lwinmm -lgdi32 - -.c.o: - echo " CC $<" - $(CC) $(CFLAGS) $(OFLAGS) -c $< - -clean: -ifndef WINDOWS - rm -f *.o libpolarssl.* -endif -ifdef WINDOWS - del /Q /F *.o libpolarssl.* -endif