Makefile.am: moved common rules (AM_CFLAGS) to common.mk

13 files changed, 27 insertions, 17 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 09fa8bf582..5b125e8af8 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -20,7 +20,7 @@
 
 ACLOCAL_AMFLAGS = -I ../m4 -I ../gl/m4
 
-EXTRA_DIST = priority_options.gperf
+EXTRA_DIST = priority_options.gperf common.mk
 BUILT_SOURCES = pkix_asn1_tab.c gnutls_asn1_tab.c priority_options.h
 
 SUBDIRS = includes x509 auth ext algorithms extras accelerated
@@ -31,7 +31,8 @@ endif
 
 localedir = $(datadir)/locale
 
-AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) $(NETTLE_CFLAGS)
+include $(top_srcdir)/lib/common.mk
+
 AM_CPPFLAGS = \
 	-DLOCALEDIR=\"$(localedir)\"		\
 	-I$(srcdir)/../gl			\
@@ -116,8 +117,6 @@ if ENABLE_PKCS11
 HFILES += pkcs11_int.h pkcs11x.h
 endif
 
-# Separate so we can create the documentation
-
 libgnutls_la_SOURCES = $(HFILES) $(COBJECTS) $(SRP_COBJECTS)	\
 	$(PSK_COBJECTS) \
 	gnutls.asn pkix.asn libgnutls.map
diff --git a/lib/accelerated/Makefile.am b/lib/accelerated/Makefile.am
index 37958ba3e5..57d50a4aed 100644
--- a/lib/accelerated/Makefile.am
+++ b/lib/accelerated/Makefile.am
@@ -18,7 +18,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>
 
-AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) $(NETTLE_CFLAGS)
+include $(top_srcdir)/lib/common.mk
+
 SUBDIRS = 
 AM_CPPFLAGS = \
 	-I$(srcdir)/../../gl		\
diff --git a/lib/accelerated/x86/Makefile.am b/lib/accelerated/x86/Makefile.am
index 0854125b51..ae684bd107 100644
--- a/lib/accelerated/x86/Makefile.am
+++ b/lib/accelerated/x86/Makefile.am
@@ -19,7 +19,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>
 
 AM_LIBTOOLFLAGS=--tag=CC
-AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) $(NETTLE_CFLAGS)
+
+include $(top_srcdir)/lib/common.mk
+
 AM_CPPFLAGS = -I$(srcdir)/../../../gl		\
 	-I$(builddir)/../../../gl		\
 	-I$(srcdir)/../../includes	\
diff --git a/lib/algorithms/Makefile.am b/lib/algorithms/Makefile.am
index 328e46fb55..47e5739ccc 100644
--- a/lib/algorithms/Makefile.am
+++ b/lib/algorithms/Makefile.am
@@ -18,7 +18,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>
 
-AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) $(NETTLE_CFLAGS)
+include $(top_srcdir)/lib/common.mk
+
 AM_CPPFLAGS = \
 	-I$(srcdir)/../../gl		\
 	-I$(builddir)/../../gl		\
diff --git a/lib/auth/Makefile.am b/lib/auth/Makefile.am
index af8c266383..9df2fa13b8 100644
--- a/lib/auth/Makefile.am
+++ b/lib/auth/Makefile.am
@@ -18,7 +18,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>
 
-AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) $(NETTLE_CFLAGS)
+include $(top_srcdir)/lib/common.mk
+
 AM_CPPFLAGS = \
 	-I$(srcdir)/../../gl		\
 	-I$(builddir)/../../gl		\
diff --git a/lib/common.mk b/lib/common.mk
new file mode 100644
index 0000000000..f988e589f7
--- /dev/null
+++ b/lib/common.mk
@@ -0,0 +1 @@
+AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) $(NETTLE_CFLAGS) $(P11_KIT_CFLAGS)
diff --git a/lib/ext/Makefile.am b/lib/ext/Makefile.am
index 04edf81b91..fa3b90dbee 100644
--- a/lib/ext/Makefile.am
+++ b/lib/ext/Makefile.am
@@ -18,7 +18,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>
 
-AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) $(NETTLE_CFLAGS)
+include $(top_srcdir)/lib/common.mk
+
 AM_CPPFLAGS = \
 	-I$(srcdir)/../../gl		\
 	-I$(builddir)/../../gl		\
diff --git a/lib/extras/Makefile.am b/lib/extras/Makefile.am
index 8f9b63be50..d9039f3d40 100644
--- a/lib/extras/Makefile.am
+++ b/lib/extras/Makefile.am
@@ -18,7 +18,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>
 
-AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) $(NETTLE_CFLAGS)
+include $(top_srcdir)/lib/common.mk
+
 AM_CPPFLAGS = \
 	-I$(srcdir)/../../gl		\
 	-I$(builddir)/../../gl		\
diff --git a/lib/minitasn1/Makefile.am b/lib/minitasn1/Makefile.am
index 7de6a75b17..9b6769746d 100644
--- a/lib/minitasn1/Makefile.am
+++ b/lib/minitasn1/Makefile.am
@@ -20,6 +20,8 @@
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA 02110-1301, USA
 
+include $(top_srcdir)/lib/common.mk
+
 AM_CPPFLAGS = -DASN1_BUILDING		\
 	-I$(srcdir)/../../gl		\
 	-I$(builddir)/../../gl          \
diff --git a/lib/nettle/Makefile.am b/lib/nettle/Makefile.am
index 2e5e64714d..99fb85df48 100644
--- a/lib/nettle/Makefile.am
+++ b/lib/nettle/Makefile.am
@@ -18,10 +18,9 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>
 
-AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) \
-	$(NETTLE_CFLAGS)		\
-	$(HOGWEED_CFLAGS)		\
-	$(GMP_CFLAGS)
+include $(top_srcdir)/lib/common.mk
+
+AM_CFLAGS += $(HOGWEED_CFLAGS) $(GMP_CFLAGS)
 
 AM_CPPFLAGS = \
 	-I$(srcdir)/int		\
diff --git a/lib/opencdk/Makefile.am b/lib/opencdk/Makefile.am
index a860ecf22b..1503234952 100644
--- a/lib/opencdk/Makefile.am
+++ b/lib/opencdk/Makefile.am
@@ -18,7 +18,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>
 
-AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) $(NETTLE_CFLAGS)
+include $(top_srcdir)/lib/common.mk
 
 AM_CPPFLAGS = \
 	-I$(srcdir)/../../gl		\
diff --git a/lib/openpgp/Makefile.am b/lib/openpgp/Makefile.am
index e357780076..532bd80a99 100644
--- a/lib/openpgp/Makefile.am
+++ b/lib/openpgp/Makefile.am
@@ -18,7 +18,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>
 
-AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) $(NETTLE_CFLAGS)
+include $(top_srcdir)/lib/common.mk
+
 AM_CPPFLAGS = \
 	-I$(srcdir)/../../gl		\
 	-I$(builddir)/../../gl		\
diff --git a/lib/x509/Makefile.am b/lib/x509/Makefile.am
index 5e5bc757c4..4989896b1c 100644
--- a/lib/x509/Makefile.am
+++ b/lib/x509/Makefile.am
@@ -16,7 +16,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>
 
-AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) $(NETTLE_CFLAGS) $(P11_KIT_CFLAGS)
+include $(top_srcdir)/lib/common.mk
+
 AM_CPPFLAGS = \
 	-I$(srcdir)/../../gl		\
 	-I$(builddir)/../../gl		\