diff options
| author | Simon Josefsson <simon@josefsson.org> | 2004-10-30 00:11:01 +0000 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2004-10-30 00:11:01 +0000 |
| commit | b93f1cba32b29917acf1fbf2b628ebdc2ca3c905 (patch) | |
| tree | 786a5ede6390bd72df4ab8251322a0d8bfe3e30b /lib/Makefile.am | |
| parent | 4e7c52d87e4d8bed1447a1c15d1de98d78bfeca9 (diff) | |
| download | gnutls-b93f1cba32b29917acf1fbf2b628ebdc2ca3c905.tar.gz | |
Use AM_CPPFLAGS instead of obsoleted INCLUDES.
Use only one of -Iminitasn1 or $(LIBTASN1_CFLAGS), depending on ENABLE_MINITASN1.
Link with minitasn1/libminitasn1.la, instead of building files here.
Don't use $(LIBTASN1_LIBS) unless ENABLE_MINITASN1.
Diffstat (limited to 'lib/Makefile.am')
| -rw-r--r-- | lib/Makefile.am | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index b822b568a5..796500c430 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,6 +1,17 @@ SUBDIRS = x509 -INCLUDES = -I$(top_srcdir)/crypto -I$(top_srcdir)/gl -I$(top_srcdir)/libextra -I$(srcdir)/minitasn1 -I$(top_srcdir)/libextra/openpgp/ -I$(top_srcdir)/libextra/opencdk -I$(srcdir)/x509 -I$(top_srcdir)/includes $(LIBOPENCDK_CFLAGS) $(LIBTASN1_CFLAGS) $(LIBGCRYPT_CFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/crypto -I$(top_srcdir)/gl \ + -I$(top_srcdir)/includes -I$(srcdir)/x509 \ + -I$(top_srcdir)/libextra -I$(top_srcdir)/libextra/openpgp/ \ + -I$(top_srcdir)/libextra/opencdk \ + $(LIBOPENCDK_CFLAGS) $(LIBGCRYPT_CFLAGS) + +if ENABLE_MINITASN1 +AM_CPPFLAGS += -I$(srcdir)/minitasn1 +else +AM_CPPFLAGS += $(LIBTASN1_CFLAGS) +endif + bin_SCRIPTS = libgnutls-config m4datadir = $(datadir)/aclocal @@ -11,15 +22,6 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gnutls.pc DISTCLEANFILES = $(pkgconfig_DATA) -if ENABLE_MINITASN1 -SUBDIRS += minitasn1 -MINITASN1_COBJECTS = minitasn1/decoding.c minitasn1/gstr.c minitasn1/errors.c \ - minitasn1/parser_aux.c minitasn1/structure.c minitasn1/element.c \ - minitasn1/coding.c -else -MINITASN1_COBJECTS = -endif - EXTRA_DIST = libgnutls.vers gnutls-api.texi lib_LTLIBRARIES = libgnutls.la @@ -61,14 +63,20 @@ HFILES = debug.h gnutls_compress.h defines.h gnutls_cipher.h \ # Separate so we can create the documentation -libgnutls_la_SOURCES = $(HFILES) $(COBJECTS) $(MINITASN1_COBJECTS) \ - $(SRP_COBJECTS) gnutls.asn pkix.asn +libgnutls_la_SOURCES = $(HFILES) $(COBJECTS) $(SRP_COBJECTS) \ + gnutls.asn pkix.asn libgnutls_la_LDFLAGS = -export-symbols-regex '^(_gnutls|gnutls|_E_).*' \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -libgnutls_la_LIBADD = $(LIBTASN1_LIBS) $(LIBGCRYPT_LIBS) \ - ../crypto/libgc.la x509/libgnutls_x509.la +libgnutls_la_LIBADD = ../crypto/libgc.la x509/libgnutls_x509.la \ + $(LIBGCRYPT_LIBS) + +if ENABLE_MINITASN1 +libgnutls_la_LIBADD += minitasn1/libminitasn1.la +else +libgnutls_la_LIBADD += $(LIBTASN1_LIBS) +endif pkix_asn1_tab.c: pkix.asn -asn1Parser pkix.asn pkix_asn1_tab.c |