From: Ruben Kerkhof Date: Sat, 11 Oct 2014 16:14:41 +0000 (+0200) Subject: Cleanup the rest of the Makefile.am's X-Git-Tag: rec-3.7.0-rc1~189^2~2^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1814%2Fhead;p=thirdparty%2Fpdns.git Cleanup the rest of the Makefile.am's --- diff --git a/Makefile.am b/Makefile.am index 1d25c4c5b0..86f7c394c4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,22 +4,41 @@ if WITH_PDNS_SERVER SUBDIRS += pdns endif -EXTRA_DIST=README INSTALL NOTICE debian pdns.spec \ -codedocs/doxygen.conf contrib/powerdns.solaris.init.d \ -contrib/systemd-pdns.service contrib/systemd-pdns-recursor.service \ -bootstrap build-scripts/semistaticg++ pdns/docs/dnstcpbench.1 \ -pdns/docs/dnsdist.1 \ -build-scripts/redhat/pdns-server-test.spec \ -pdns/named.conf.parsertest regression-tests/zones/unit.test +EXTRA_DIST = \ + INSTALL \ + NOTICE \ + README \ + build-scripts/redhat/pdns-server-test.spec \ + build-scripts/semistaticg++ \ + codedocs/doxygen.conf \ + contrib/powerdns.solaris.init.d \ + contrib/systemd-pdns-recursor.service \ + contrib/systemd-pdns.service \ + debian \ + pdns.spec \ + pdns/docs/dnsdist.1 \ + pdns/docs/dnstcpbench.1 \ + pdns/named.conf.parsertest \ + regression-tests/zones/unit.test ACLOCAL_AMFLAGS = -I m4 -man8_MANS=pdns/docs/pdns_control.8 pdns/docs/pdnssec.8 pdns/docs/pdns_server.8 \ - pdns/docs/zone2ldap.8 pdns/docs/zone2sql.8 +man8_MANS = \ + pdns/docs/pdns_control.8 \ + pdns/docs/pdns_server.8 \ + pdns/docs/pdnssec.8 \ + pdns/docs/zone2ldap.8 \ + pdns/docs/zone2sql.8 if TOOLS - man8_MANS += pdns/docs/dnsreplay.8 pdns/docs/dnsscope.8 pdns/docs/dnswasher.8 - man1_MANS = pdns/docs/dnstcpbench.1 pdns/docs/dnsdist.1 +man8_MANS += \ + pdns/docs/dnsreplay.8 \ + pdns/docs/dnsscope.8 \ + pdns/docs/dnswasher.8 + +man1_MANS = \ + pdns/docs/dnsdist.1 \ + pdns/docs/dnstcpbench.1 endif pdns/docs/dnstcpbench.1: diff --git a/modules/Makefile.am b/modules/Makefile.am index 2af3f1799d..d800244be6 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -1,2 +1,21 @@ -SUBDIRS=@moduledirs@ -DIST_SUBDIRS=bindbackend db2backend geobackend gmysqlbackend goraclebackend gpgsqlbackend gsqlite3backend ldapbackend luabackend mydnsbackend opendbxbackend oraclebackend pipebackend tinydnsbackend remotebackend randombackend lmdbbackend geoipbackend +SUBDIRS= @moduledirs@ + +DIST_SUBDIRS = \ + bindbackend \ + db2backend \ + geobackend \ + geoipbackend \ + gmysqlbackend \ + goraclebackend \ + gpgsqlbackend \ + gsqlite3backend \ + ldapbackend \ + lmdbbackend \ + luabackend \ + mydnsbackend \ + opendbxbackend \ + oraclebackend \ + pipebackend \ + randombackend \ + remotebackend \ + tinydnsbackend diff --git a/modules/bindbackend/Makefile.am b/modules/bindbackend/Makefile.am index 0db7785180..fdcfd85528 100644 --- a/modules/bindbackend/Makefile.am +++ b/modules/bindbackend/Makefile.am @@ -4,13 +4,18 @@ AM_CPPFLAGS += -I../../pdns $(POLARSSL_CFLAGS) AM_LFLAGS = -i AM_YFLAGS = -d --verbose --debug -BUILT_SOURCES=../../pdns/bind-dnssec.schema.sqlite3.sql.h ../../pdns/bindlexer.l ../../pdns/bindparser.yy +BUILT_SOURCES = \ + ../../pdns/bind-dnssec.schema.sqlite3.sql.h \ + ../../pdns/bindlexer.l \ + ../../pdns/bindparser.yy -EXTRA_DIST=OBJECTFILES OBJECTLIBS +EXTRA_DIST = OBJECTFILES OBJECTLIBS -libbindbackend_la_SOURCES=bindbackend2.cc bindbackend2.hh binddnssec.cc +libbindbackend_la_SOURCES = \ + bindbackend2.cc bindbackend2.hh \ + binddnssec.cc -libbindbackend_la_LDFLAGS=-module -avoid-version +libbindbackend_la_LDFLAGS = -module -avoid-version ../../pdns/bind-dnssec.schema.sqlite3.sql.h: ../../pdns/bind-dnssec.schema.sqlite3.sql ( echo 'static char sqlCreate[] __attribute__((unused))=' ; sed 's/$$/"/g' ../../pdns/bind-dnssec.schema.sqlite3.sql | sed 's/^/"/g' ; echo ';' ) > $@ diff --git a/modules/db2backend/Makefile.am b/modules/db2backend/Makefile.am index 6d4c06d867..651837c8f6 100644 --- a/modules/db2backend/Makefile.am +++ b/modules/db2backend/Makefile.am @@ -1,6 +1,9 @@ pkglib_LTLIBRARIES = libdb2backend.la -libdb2backend_la_SOURCES=DB2Backend.cc DB2Backend.hh DB2Exception.cc DB2Exception.hh +libdb2backend_la_SOURCES = \ + DB2Backend.cc DB2Backend.hh \ + DB2Exception.cc DB2Exception.hh + libdb2backend_la_LDFLAGS = -module -avoid-version libdb2backend_la_LIBADD = -ldb2 diff --git a/modules/geobackend/Makefile.am b/modules/geobackend/Makefile.am index b562227942..3c777495c4 100644 --- a/modules/geobackend/Makefile.am +++ b/modules/geobackend/Makefile.am @@ -1,4 +1,9 @@ -EXTRA_DIST=OBJECTFILES OBJECTLIBS pkglib_LTLIBRARIES = libgeobackend.la -libgeobackend_la_SOURCES=geobackend.cc geobackend.hh ippreftree.cc ippreftree.hh -libgeobackend_la_LDFLAGS=-module -avoid-version + +EXTRA_DIST = OBJECTFILES OBJECTLIBS + +libgeobackend_la_SOURCES = \ + geobackend.cc geobackend.hh \ + ippreftree.cc ippreftree.hh + +libgeobackend_la_LDFLAGS = -module -avoid-version diff --git a/modules/geoipbackend/Makefile.am b/modules/geoipbackend/Makefile.am index 8e77168971..b0d0ee924c 100644 --- a/modules/geoipbackend/Makefile.am +++ b/modules/geoipbackend/Makefile.am @@ -1,6 +1,9 @@ AM_CPPFLAGS += $(YAML_CFLAGS) $(GEOIP_CFLAGS) + EXTRA_DIST = OBJECTFILES OBJECTLIBS + pkglib_LTLIBRARIES = libgeoipbackend.la + libgeoipbackend_la_SOURCES = geoipbackend.cc geoipbackend.hh libgeoipbackend_la_LDFLAGS = -module -avoid-version libgeoipbackend_la_LIBADD = $(YAML_LIBS) $(GEOIP_LIBS) diff --git a/modules/gmysqlbackend/Makefile.am b/modules/gmysqlbackend/Makefile.am index d49a73b813..a047192ccf 100644 --- a/modules/gmysqlbackend/Makefile.am +++ b/modules/gmysqlbackend/Makefile.am @@ -1,13 +1,22 @@ AM_CPPFLAGS += $(MYSQL_inc) + pkglib_LTLIBRARIES = libgmysqlbackend.la -EXTRA_DIST=OBJECTFILES OBJECTLIBS \ - schema.mysql.sql nodnssec-3.x_to_3.4.0_schema.mysql.sql dnssec-3.x_to_3.4.0_schema.mysql.sql +EXTRA_DIST = \ + OBJECTFILES \ + OBJECTLIBS \ + dnssec-3.x_to_3.4.0_schema.mysql.sql \ + nodnssec-3.x_to_3.4.0_schema.mysql.sql \ + schema.mysql.sql -dist_doc_DATA = schema.mysql.sql nodnssec-3.x_to_3.4.0_schema.mysql.sql dnssec-3.x_to_3.4.0_schema.mysql.sql +dist_doc_DATA = \ + dnssec-3.x_to_3.4.0_schema.mysql.sql \ + nodnssec-3.x_to_3.4.0_schema.mysql.sql \ + schema.mysql.sql -libgmysqlbackend_la_SOURCES=gmysqlbackend.cc gmysqlbackend.hh \ - smysql.hh smysql.cc +libgmysqlbackend_la_SOURCES = \ + gmysqlbackend.cc gmysqlbackend.hh \ + smysql.cc smysql.hh libgmysqlbackend_la_LDFLAGS = -module -avoid-version libgmysqlbackend_la_LIBADD = $(MYSQL_lib) diff --git a/modules/goraclebackend/Makefile.am b/modules/goraclebackend/Makefile.am index a6e5d80f23..f4fdf92478 100644 --- a/modules/goraclebackend/Makefile.am +++ b/modules/goraclebackend/Makefile.am @@ -1,12 +1,20 @@ AM_CPPFLAGS += $(ORACLE_CFLAGS) + pkglib_LTLIBRARIES = libgoraclebackend.la -EXTRA_DIST=OBJECTFILES OBJECTLIBS \ - schema.goracle.sql drop-schema.goracle.sql +EXTRA_DIST = \ + OBJECTFILES \ + OBJECTLIBS \ + drop-schema.goracle.sql \ + schema.goracle.sql -dist_doc_DATA = schema.goracle.sql drop-schema.goracle.sql +dist_doc_DATA = \ + drop-schema.goracle.sql \ + schema.goracle.sql -libgoraclebackend_la_SOURCES=goraclebackend.cc goraclebackend.hh \ - soracle.hh soracle.cc +libgoraclebackend_la_SOURCES = \ + goraclebackend.cc goraclebackend.hh \ + soracle.cc soracle.hh -libgoraclebackend_la_LDFLAGS=-module -avoid-version $(ORACLE_LIBS) +libgoraclebackend_la_LDFLAGS = -module -avoid-version +libgoraclebackend_la_LIBADD = $(ORACLE_LIBS) diff --git a/modules/gpgsqlbackend/Makefile.am b/modules/gpgsqlbackend/Makefile.am index 15710df385..7a29a06ea1 100644 --- a/modules/gpgsqlbackend/Makefile.am +++ b/modules/gpgsqlbackend/Makefile.am @@ -1,15 +1,21 @@ AM_CPPFLAGS += $(PGSQL_inc) pkglib_LTLIBRARIES = libgpgsqlbackend.la -EXTRA_DIST=OBJECTFILES OBJECTLIBS \ - schema.pgsql.sql nodnssec-3.x_to_3.4.0_schema.pgsql.sql \ +EXTRA_DIST = \ + OBJECTFILES \ + OBJECTLIBS \ dnssec-3.x_to_3.4.0_schema.pgsql.sql + nodnssec-3.x_to_3.4.0_schema.pgsql.sql \ + schema.pgsql.sql -dist_doc_DATA=schema.pgsql.sql nodnssec-3.x_to_3.4.0_schema.pgsql.sql \ +dist_doc_DATA = \ + schema.pgsql.sql \ + nodnssec-3.x_to_3.4.0_schema.pgsql.sql \ dnssec-3.x_to_3.4.0_schema.pgsql.sql -libgpgsqlbackend_la_SOURCES=gpgsqlbackend.cc gpgsqlbackend.hh \ - spgsql.hh spgsql.cc +libgpgsqlbackend_la_SOURCES = \ + gpgsqlbackend.cc gpgsqlbackend.hh \ + spgsql.cc spgsql.hh libgpgsqlbackend_la_LDFLAGS = -module -avoid-version libgpgsqlbackend_la_LIBADD = $(PGSQL_lib) -lssl $(LIBCRYPT) -lcrypto diff --git a/modules/gsqlite3backend/Makefile.am b/modules/gsqlite3backend/Makefile.am index 0abc7ad10c..c4566d5552 100644 --- a/modules/gsqlite3backend/Makefile.am +++ b/modules/gsqlite3backend/Makefile.am @@ -1,10 +1,17 @@ pkglib_LTLIBRARIES = libgsqlite3backend.la -EXTRA_DIST=OBJECTFILES OBJECTLIBS \ - schema.sqlite3.sql nodnssec-3.x_to_3.4.0_schema.sqlite3.sql dnssec-3.x_to_3.4.0_schema.sqlite3.sql +EXTRA_DIST = \ + OBJECTFILES \ + OBJECTLIBS \ + dnssec-3.x_to_3.4.0_schema.sqlite3.sql \ + nodnssec-3.x_to_3.4.0_schema.sqlite3.sql \ + schema.sqlite3.sql -dist_doc_DATA=schema.sqlite3.sql nodnssec-3.x_to_3.4.0_schema.sqlite3.sql dnssec-3.x_to_3.4.0_schema.sqlite3.sql +dist_doc_DATA = \ + dnssec-3.x_to_3.4.0_schema.sqlite3.sql \ + nodnssec-3.x_to_3.4.0_schema.sqlite3.sql \ + schema.sqlite3.sql -libgsqlite3backend_la_SOURCES=gsqlite3backend.cc gsqlite3backend.hh +libgsqlite3backend_la_SOURCES = gsqlite3backend.cc gsqlite3backend.hh -libgsqlite3backend_la_LDFLAGS=-module -avoid-version +libgsqlite3backend_la_LDFLAGS = -module -avoid-version diff --git a/modules/ldapbackend/Makefile.am b/modules/ldapbackend/Makefile.am index dae1cbb448..6b76a215e8 100644 --- a/modules/ldapbackend/Makefile.am +++ b/modules/ldapbackend/Makefile.am @@ -1,6 +1,11 @@ +pkglib_LTLIBRARIES = libldapbackend.la + EXTRA_DIST = OBJECTFILES OBJECTLIBS -pkglib_LTLIBRARIES = libldapbackend.la -libldapbackend_la_SOURCES = ldapbackend.cc ldapbackend.hh powerldap.hh powerldap.cc utils.hh +libldapbackend_la_SOURCES = \ + ldapbackend.cc ldapbackend.hh \ + powerldap.cc powerldap.hh \ + utils.hh + libldapbackend_la_LDFLAGS = -module -avoid-version libldapbackend_la_LIBADD = $(LDAP_LIBS) diff --git a/modules/lmdbbackend/Makefile.am b/modules/lmdbbackend/Makefile.am index 87e9eb4c29..d4a110842e 100644 --- a/modules/lmdbbackend/Makefile.am +++ b/modules/lmdbbackend/Makefile.am @@ -1,7 +1,10 @@ pkglib_LTLIBRARIES = liblmdbbackend.la -EXTRA_DIST=OBJECTFILES OBJECTLIBS +EXTRA_DIST = OBJECTFILES OBJECTLIBS + +liblmdbbackend_la_SOURCES = \ + lmdbbackend.cc lmdbbackend.hh + +liblmdbbackend_la_LDFLAGS = -module -avoid-version +liblmdbbackend_la_LIBADD = $(LMDB_LIBS) -liblmdbbackend_la_SOURCES=lmdbbackend.cc lmdbbackend.hh -liblmdbbackend_la_LDFLAGS=-module -avoid-version -liblmdbbackend_la_LIBADD=$(LMDB_LIBS) diff --git a/modules/luabackend/Makefile.am b/modules/luabackend/Makefile.am index aab3d65e7c..33ac5b6056 100644 --- a/modules/luabackend/Makefile.am +++ b/modules/luabackend/Makefile.am @@ -1,13 +1,19 @@ AM_CPPFLAGS += $(LUA_CFLAGS) -#AM_CPPFLAGS=-I/usr/local/include/luajit-2.0 -DUSE_LUAJIT $(THREADFLAGS) -EXTRA_DIST=OBJECTFILES OBJECTLIBS +EXTRA_DIST = OBJECTFILES OBJECTLIBS pkglib_LTLIBRARIES = libluabackend.la -libluabackend_la_SOURCES=luabackend.cc luabackend.hh minimal.cc reload.cc lua_functions.cc master.cc private.cc slave.cc supermaster.cc dnssec.cc \ - lua_functions.hh +libluabackend_la_SOURCES = \ + dnssec.cc \ + lua_functions.cc lua_functions.hh \ + luabackend.cc luabackend.hh \ + master.cc \ + minimal.cc \ + private.cc \ + reload.cc \ + slave.cc \ + supermaster.cc -libluabackend_la_LDFLAGS=-module -avoid-version -libluabackend_la_LIBADD=$(LUA_LIBS) -#-lluajit-5.1 +libluabackend_la_LDFLAGS = -module -avoid-version +libluabackend_la_LIBADD = $(LUA_LIBS) diff --git a/modules/mydnsbackend/Makefile.am b/modules/mydnsbackend/Makefile.am index 582b563034..c1c32ad248 100644 --- a/modules/mydnsbackend/Makefile.am +++ b/modules/mydnsbackend/Makefile.am @@ -1,12 +1,17 @@ AM_CPPFLAGS += $(MYSQL_inc) pkglib_LTLIBRARIES = libmydnsbackend.la -EXTRA_DIST=OBJECTFILES OBJECTLIBS \ +EXTRA_DIST = \ + OBJECTFILES \ + OBJECTLIBS \ schema.mydns.sql -dist_doc_DATA=schema.mydns.sql +dist_doc_DATA = schema.mydns.sql -libmydnsbackend_la_SOURCES=mydnsbackend.cc mydnsbackend.hh +libmydnsbackend_la_SOURCES = \ + mydnsbackend.cc mydnsbackend.hh -libmydnsbackend_la_LDFLAGS=-module -avoid-version -libmydnsbackend_la_LIBADD= $(MYSQL_lib) ../gmysqlbackend/smysql.lo +libmydnsbackend_la_LDFLAGS = -module -avoid-version +libmydnsbackend_la_LIBADD = \ + ../gmysqlbackend/smysql.lo \ + $(MYSQL_lib) diff --git a/modules/opendbxbackend/Makefile.am b/modules/opendbxbackend/Makefile.am index ef97ab46e6..cd3f41f069 100644 --- a/modules/opendbxbackend/Makefile.am +++ b/modules/opendbxbackend/Makefile.am @@ -1,6 +1,10 @@ +pkglib_LTLIBRARIES = libopendbxbackend.la + EXTRA_DIST = OBJECTFILES OBJECTLIBS -pkglib_LTLIBRARIES = libopendbxbackend.la -libopendbxbackend_la_SOURCES = odbxbackend.hh odbxbackend.cc odbxprivate.cc -libopendbxbackend_la_LDFLAGS =-module -avoid-version -libopendbxbackend_la_LIBADD =-l$(LIBOPENDBX) +libopendbxbackend_la_SOURCES = \ + odbxbackend.cc odbxbackend.hh \ + odbxprivate.cc + +libopendbxbackend_la_LDFLAGS = -module -avoid-version +libopendbxbackend_la_LIBADD = -l$(LIBOPENDBX) diff --git a/modules/oraclebackend/Makefile.am b/modules/oraclebackend/Makefile.am index 9690ba207c..84c476ddb9 100644 --- a/modules/oraclebackend/Makefile.am +++ b/modules/oraclebackend/Makefile.am @@ -2,10 +2,16 @@ AM_CPPFLAGS += $(ORACLE_CFLAGS) pkglib_LTLIBRARIES = liboraclebackend.la -EXTRA_DIST=OBJECTFILES OBJECTLIBS schema.oracle.sql drop-schema.oracle.sql +EXTRA_DIST = \ + OBJECTFILES \ + OBJECTLIBS \ + drop-schema.oracle.sql \ + schema.oracle.sql -dist_doc_DATA=schema.oracle.sql drop-schema.oracle.sql +dist_doc_DATA = \ + schema.oracle.sql \ + drop-schema.oracle.sql -liboraclebackend_la_SOURCES=oraclebackend.cc oraclebackend.hh +liboraclebackend_la_SOURCES = oraclebackend.cc oraclebackend.hh liboraclebackend_la_LDFLAGS = -module -avoid-version liboraclebackend_la_LIBADD = $(ORACLE_LIBS) -lclntsh diff --git a/modules/pipebackend/Makefile.am b/modules/pipebackend/Makefile.am index a01fca977d..b91553dbc5 100644 --- a/modules/pipebackend/Makefile.am +++ b/modules/pipebackend/Makefile.am @@ -1,11 +1,13 @@ -#if !ALLSTATIC -#install-exec-local: -# install .lib/libpipebackend.so.0.0.0 @libdir@ -#endif - -EXTRA_DIST=OBJECTFILES OBJECTLIBS backend.pl pkglib_LTLIBRARIES = libpipebackend.la -libpipebackend_la_SOURCES=pipebackend.cc pipebackend.hh coprocess.cc coprocess.hh -libpipebackend_la_LDFLAGS=-module -avoid-version +EXTRA_DIST = \ + OBJECTFILES \ + OBJECTLIBS \ + backend.pl + +libpipebackend_la_SOURCES = \ + coprocess.cc coprocess.hh \ + pipebackend.cc pipebackend.hh + +libpipebackend_la_LDFLAGS = -module -avoid-version diff --git a/modules/randombackend/Makefile.am b/modules/randombackend/Makefile.am index 16e3250845..2da4bbde4a 100644 --- a/modules/randombackend/Makefile.am +++ b/modules/randombackend/Makefile.am @@ -1,6 +1,6 @@ -EXTRA_DIST=OBJECTFILES OBJECTLIBS - pkglib_LTLIBRARIES = librandombackend.la -librandombackend_la_SOURCES=randombackend.cc -librandombackend_la_LDFLAGS=-module -avoid-version +EXTRA_DIST = OBJECTFILES OBJECTLIBS + +librandombackend_la_SOURCES = randombackend.cc +librandombackend_la_LDFLAGS = -module -avoid-version diff --git a/modules/tinydnsbackend/Makefile.am b/modules/tinydnsbackend/Makefile.am index f137751eae..1a94480350 100644 --- a/modules/tinydnsbackend/Makefile.am +++ b/modules/tinydnsbackend/Makefile.am @@ -1,8 +1,12 @@ AM_CPPFLAGS += $(CDB_CFLAGS) + pkglib_LTLIBRARIES = libtinydnsbackend.la -EXTRA_DIST=OBJECTFILES OBJECTLIBS +EXTRA_DIST = OBJECTFILES OBJECTLIBS + +libtinydnsbackend_la_SOURCES = \ + cdb.cc cdb.hh \ + tinydnsbackend.cc tinydnsbackend.hh -libtinydnsbackend_la_SOURCES=cdb.cc cdb.hh tinydnsbackend.cc tinydnsbackend.hh libtinydnsbackend_la_LDFLAGS = -module -avoid-version libtinydnsbackend_la_LIBADD = $(CDB_LIBS) diff --git a/pdns/ext/Makefile.am b/pdns/ext/Makefile.am index cc5d77306e..47432b7dbd 100644 --- a/pdns/ext/Makefile.am +++ b/pdns/ext/Makefile.am @@ -1,2 +1,9 @@ -SUBDIRS=$(POLARSSL_SUBDIR) yahttp rapidjson -DIST_SUBDIRS=polarssl yahttp rapidjson +SUBDIRS = \ + $(POLARSSL_SUBDIR) \ + yahttp \ + rapidjson + +DIST_SUBDIRS = \ + polarssl \ + yahttp \ + rapidjson diff --git a/pdns/ext/polarssl/Makefile.am b/pdns/ext/polarssl/Makefile.am index e483cedcdc..46e48a3155 100644 --- a/pdns/ext/polarssl/Makefile.am +++ b/pdns/ext/polarssl/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS=library +SUBDIRS = library EXTRA_DIST = LICENSE README.rst include/polarssl diff --git a/pdns/ext/polarssl/library/Makefile.am b/pdns/ext/polarssl/library/Makefile.am index 22335dc4f8..59bcebdc4c 100644 --- a/pdns/ext/polarssl/library/Makefile.am +++ b/pdns/ext/polarssl/library/Makefile.am @@ -1,73 +1,79 @@ -noinst_LTLIBRARIES=libpolarssl.la +noinst_LTLIBRARIES = libpolarssl.la -libpolarssl_la_SOURCES= \ - aes.c \ - aesni.c \ - arc4.c \ - asn1parse.c \ - asn1write.c \ - base64.c \ - bignum.c \ - blowfish.c \ - camellia.c \ - ccm.c \ - certs.c \ - cipher.c \ - cipher_wrap.c \ - ctr_drbg.c \ - debug.c \ - des.c \ - dhm.c \ - ecp.c \ - ecp_curves.c \ - ecdh.c \ - ecdsa.c \ - entropy.c \ - entropy_poll.c \ - error.c \ - gcm.c \ - havege.c \ - hmac_drbg.c \ - md.c \ - md_wrap.c \ - md2.c \ - md4.c \ - md5.c \ - memory_buffer_alloc.c \ - net.c \ - oid.c \ - padlock.c \ - pbkdf2.c \ - pem.c \ - pkcs5.c \ - pkcs11.c \ - pkcs12.c \ - pk.c \ - pk_wrap.c \ - pkparse.c \ - pkwrite.c \ - platform.c \ - ripemd160.c \ - rsa.c \ - sha1.c \ - sha256.c \ - sha512.c \ - ssl_cache.c \ - ssl_ciphersuites.c \ - ssl_cli.c \ - ssl_srv.c \ - ssl_tls.c \ - threading.c \ - timing.c \ - version.c \ - version_features.c \ - x509.c \ - x509_crt.c \ - x509_crl.c \ - x509_csr.c \ - x509_create.c \ - x509write_crt.c \ - x509write_csr.c \ - xtea.c +libpolarssl_la_CPPFLAGS = \ + -I$(srcdir)/../include \ + -D_FILE_OFFSET_BITS=64 \ + -Wall \ + -W \ + -Wdeclaration-after-statement + +libpolarssl_la_SOURCES = \ + aes.c \ + aesni.c \ + arc4.c \ + asn1parse.c \ + asn1write.c \ + base64.c \ + bignum.c \ + blowfish.c \ + camellia.c \ + ccm.c \ + certs.c \ + cipher.c \ + cipher_wrap.c \ + ctr_drbg.c \ + debug.c \ + des.c \ + dhm.c \ + ecdh.c \ + ecdsa.c \ + ecp.c \ + ecp_curves.c \ + entropy.c \ + entropy_poll.c \ + error.c \ + gcm.c \ + havege.c \ + hmac_drbg.c \ + md2.c \ + md4.c \ + md5.c \ + md.c \ + md_wrap.c \ + memory_buffer_alloc.c \ + net.c \ + oid.c \ + padlock.c \ + pbkdf2.c \ + pem.c \ + pk.c \ + pkcs11.c \ + pkcs12.c \ + pkcs5.c \ + pkparse.c \ + pk_wrap.c \ + pkwrite.c \ + platform.c \ + ripemd160.c \ + rsa.c \ + sha1.c \ + sha256.c \ + sha512.c \ + ssl_cache.c \ + ssl_ciphersuites.c \ + ssl_cli.c \ + ssl_srv.c \ + ssl_tls.c \ + threading.c \ + timing.c \ + version.c \ + version_features.c \ + x509.c \ + x509_create.c \ + x509_crl.c \ + x509_crt.c \ + x509_csr.c \ + x509write_crt.c \ + x509write_csr.c \ + xtea.c -libpolarssl_la_CPPFLAGS=-I$(srcdir)/../include -D_FILE_OFFSET_BITS=64 -Wall -W -Wdeclaration-after-statement diff --git a/pdns/ext/yahttp/Makefile.am b/pdns/ext/yahttp/Makefile.am index 8fa148bef3..aaaeee0875 100644 --- a/pdns/ext/yahttp/Makefile.am +++ b/pdns/ext/yahttp/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS=yahttp +SUBDIRS = yahttp -EXTRA_DIST=LICENSE README.md +EXTRA_DIST = LICENSE README.md diff --git a/pdns/ext/yahttp/yahttp/Makefile.am b/pdns/ext/yahttp/yahttp/Makefile.am index 2595854f4b..3ed41e5fd2 100644 --- a/pdns/ext/yahttp/yahttp/Makefile.am +++ b/pdns/ext/yahttp/yahttp/Makefile.am @@ -1,3 +1,13 @@ -noinst_LTLIBRARIES=libyahttp.la +noinst_LTLIBRARIES = libyahttp.la -libyahttp_la_SOURCES=cookie.hpp exception.hpp reqresp.cpp reqresp.hpp router.cpp router.hpp url.hpp utility.hpp yahttp-config.h yahttp.hpp +libyahttp_la_SOURCES = \ + cookie.hpp \ + exception.hpp \ + reqresp.cpp \ + reqresp.hpp \ + router.cpp \ + router.hpp \ + url.hpp \ + utility.hpp \ + yahttp-config.h \ + yahttp.hpp