From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Mon, 6 Oct 2014 21:14:55 +0000 (+0200)
Subject: Move some stuff up
X-Git-Tag: rec-3.7.0-rc1~189^2~28^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4771024d7f94c44b0c7f55da6fe1413afc6c4bd6;p=thirdparty%2Fpdns.git

Move some stuff up

No functional changes
---

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index d5315156bc..ab107162e8 100644
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -279,6 +279,35 @@ pdnssec_LDADD = \
 	$(BOOST_SERIALIZATION_LIBS) \
 	$(YAHTTP_LIBS)
 
+if BOTAN110
+pdnssec_SOURCES += botan110signers.cc botansigners.cc
+pdnssec_LDADD += $(BOTAN110_LIBS) -lgmp -lrt
+endif
+
+if BOTAN18
+pdnssec_SOURCES += botan18signers.cc botansigners.cc
+pdnssec_LDADD += $(BOTAN18_LIBS) -lgmp
+endif
+
+if CRYPTOPP
+pdnssec_SOURCES += cryptoppsigners.cc
+pdnssec_LDADD += -lcryptopp
+endif
+
+if SQLITE3
+pdnssec_SOURCES += ssqlite3.cc ssqlite3.hh
+pdnssec_LDADD += $(SQLITE3_LIBS)
+endif
+
+if ORACLE
+pdnssec_LDADD += $(ORACLE_LIBS)
+endif
+
+if PKCS11
+pdnssec_SOURCES +=  pkcs11signers.cc pkcs11signers.hh
+pdnssec_LDADD += $(P11KIT1_LIBS)
+endif
+
 zone2sql_SOURCES = \
 	arguments.cc \
 	base32.cc \
@@ -395,35 +424,6 @@ zone2lmdb_LDADD = \
 	$(LMDB_LIBS)
 endif
 
-if BOTAN110
-pdnssec_SOURCES += botan110signers.cc botansigners.cc
-pdnssec_LDADD += $(BOTAN110_LIBS) -lgmp -lrt
-endif
-
-if BOTAN18
-pdnssec_SOURCES += botan18signers.cc botansigners.cc
-pdnssec_LDADD += $(BOTAN18_LIBS) -lgmp
-endif
-
-if CRYPTOPP
-pdnssec_SOURCES += cryptoppsigners.cc
-pdnssec_LDADD += -lcryptopp
-endif
-
-if SQLITE3
-pdnssec_SOURCES += ssqlite3.cc ssqlite3.hh
-pdnssec_LDADD += $(SQLITE3_LIBS)
-endif
-
-if ORACLE
-pdnssec_LDADD += $(ORACLE_LIBS)
-endif
-
-if PKCS11
-pdnssec_SOURCES +=  pkcs11signers.cc pkcs11signers.hh
-pdnssec_LDADD += $(P11KIT1_LIBS)
-endif
-
 sdig_SOURCES = \
 	base32.cc \
 	base64.cc base64.hh \