diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2004-05-27 18:55:20 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2004-05-27 18:55:20 +0000 |
| commit | 74ce01c7dc293a1cf3a81d59bcd2b42faae7b751 (patch) | |
| tree | f36d75b6414db42f466301e3dd912474f44ef3b6 /lib | |
| parent | d1af3c82394caddbb7f36b46eeaff6f4eb0cb1bf (diff) | |
| download | gnutls-74ce01c7dc293a1cf3a81d59bcd2b42faae7b751.tar.gz | |
some libtasn1 related compilation fixes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 6 | ||||
| -rw-r--r-- | lib/x509/Makefile.am | 8 |
2 files changed, 3 insertions, 11 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index b56ba7edaf..5817151fd5 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I../libextra -Iminitasn1/ -I../includes $(LIBOPENCDK_CFLAGS) $(LIBGCRYPT_CFLAGS) +INCLUDES = -I../libextra -Iminitasn1/ -I../includes $(LIBOPENCDK_CFLAGS) $(LIBTASN1_CFLAGS) $(LIBGCRYPT_CFLAGS) bin_SCRIPTS = libgnutls-config m4datadir = $(datadir)/aclocal @@ -14,11 +14,9 @@ DIST_SUBDIRS = minitasn1 x509 if ENABLE_MINITASN1 SUBDIRS = minitasn1 x509 MINITASN1_OBJECTS = minitasn1/libminitasn1.la -LIBASN1_LINK = else SUBDIRS = x509 MINITASN1_OBJECTS = -LIBASN1_LINK = -ltasn1 endif EXTRA_DIST = debug.h gnutls_compress.h defines.h gnutls.asn pkix.asn \ @@ -62,7 +60,7 @@ libgnutls_la_SOURCES = $(COBJECTS) libgnutls_la_LIBADD = $(MINITASN1_OBJECTS) x509/libx509.la -libgnutls_la_LDFLAGS = $(LIBASN1_LINK) $(LIBGCRYPT_LIBS) \ +libgnutls_la_LDFLAGS = $(LIBTASN1_LIBS) $(LIBGCRYPT_LIBS) \ $(libgnutls_version_script_cmd) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) diff --git a/lib/x509/Makefile.am b/lib/x509/Makefile.am index bcc42674df..71d5193da5 100644 --- a/lib/x509/Makefile.am +++ b/lib/x509/Makefile.am @@ -1,10 +1,9 @@ -INCLUDES = -I../ -I../../includes/ -I../../lib/minitasn1 $(LIBOPENCDK_CFLAGS) $(LIBGCRYPT_CFLAGS) +INCLUDES = -I../ -I../../includes/ -I../../lib/minitasn1 $(LIBOPENCDK_CFLAGS) $(LIBTASN1_CFLAGS) $(LIBGCRYPT_CFLAGS) EXTRA_DIST = dn.h common.h x509.h extensions.h pkcs7.h \ x509-api.tex compat.h verify.h mpi.h crq.h sign.h pkcs5.h \ privkey.h pkcs12.h rfc2818.h dsa.h noinst_LTLIBRARIES = libx509.la -#lib_LTLIBRARIES = libgnutls-x509.la COBJECTS = crl.c dn.c common.c x509.c extensions.c dsa.c \ rfc2818_hostname.c verify.c mpi.c privkey.c pkcs7.c \ @@ -16,11 +15,6 @@ COMPAT_OBJECTS = compat.c libx509_la_SOURCES = $(COBJECTS) $(COMPAT_OBJECTS) -#libgnutls_x509_la_SOURCES = $(COBJECTS2) - -#libgnutls_x509_la_LIBADD = ../libgnutls.la -#libgnutls_x509_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) - x509-api.tex: $(COBJECTS) @echo "" > x509-api.tex @for i in $(COBJECTS); \ |