diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-04-12 14:17:26 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-04-12 14:19:19 +0200 |
| commit | a4fd1120e9c9b237047086f798fab8ffc60b759e (patch) | |
| tree | 536a32e6bc9cfc9968f42852be2559c101a808cd /lib/Makefile.am | |
| parent | 1bfb93706eed0475013e43fa74fbf86f80c795e9 (diff) | |
| download | gnutls-a4fd1120e9c9b237047086f798fab8ffc60b759e.tar.gz | |
Makefile.am: moved common rules (AM_CFLAGS) to common.mk
Diffstat (limited to 'lib/Makefile.am')
| -rw-r--r-- | lib/Makefile.am | 7 |
1 files changed, 3 insertions, 4 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 |