diff options
| author | Simon Josefsson <simon@josefsson.org> | 2004-11-03 14:50:50 +0000 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2004-11-03 14:50:50 +0000 |
| commit | b6102b3a012b6c8ad5786f49d2c7a3d143c68ad5 (patch) | |
| tree | 9aa4a2370f9a401d539737c0b7d978aa173ff133 | |
| parent | 6ce87923f521c4be892a22e586f2d8e71eeba7fd (diff) | |
| download | gnutls-b6102b3a012b6c8ad5786f49d2c7a3d143c68ad5.tar.gz | |
Simplify.
| -rw-r--r-- | libextra/Makefile.am | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/libextra/Makefile.am b/libextra/Makefile.am index a1f0f12012..7a85d67d3d 100644 --- a/libextra/Makefile.am +++ b/libextra/Makefile.am @@ -1,29 +1,30 @@ +DIST_SUBDIRS = openpgp opencdk + INCLUDES = -I$(top_srcdir)/crypto -I$(top_srcdir)/gl -I$(top_srcdir)/lib -I../includes -I$(top_srcdir)/includes -I$(top_srcdir)/lib/minitasn1 $(LIBOPENCDK_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBTASN1_CFLAGS) -I$(srcdir)/opencdk -I$(srcdir)/openpgp + bin_SCRIPTS = libgnutls-extra-config -DIST_SUBDIRS = openpgp opencdk m4datadir = $(datadir)/aclocal -m4data_DATA = libgnutls-extra.m4 +dist_m4data_DATA = libgnutls-extra.m4 # Pkg-config script. pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gnutls-extra.pc DISTCLEANFILES = $(pkgconfig_DATA) -LIBGNUTLS_EXTRA_EXPORTS = -export-symbols-regex '^gnutls.*' - -EXTRA_DIST = openssl_compat.h gnutls-extra-api.texi gnutls_extra.h \ - libgnutls-extra-config.in libgnutls-extra.m4 lzoconf.h \ - minilzo.h +EXTRA_DIST = gnutls-extra-api.texi lib_LTLIBRARIES = libgnutls-extra.la +# OpenSSL + if ENABLE_OPENSSL lib_LTLIBRARIES += libgnutls-openssl.la libgnutls_openssl_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -libgnutls_openssl_la_SOURCES = gnutls_openssl.c openssl_compat.c +libgnutls_openssl_la_SOURCES = gnutls_openssl.c openssl_compat.h \ + openssl_compat.c libgnutls_openssl_la_LIBADD = ../lib/libgnutls.la ../crypto/libgc.la @@ -34,6 +35,8 @@ libgnutls_openssl_la_LDFLAGS += $(LIBTASN1_LIBS) endif endif +# OpenPGP + if ENABLE_OPENPGP PGP_COBJECTS = gnutls_openpgp.c openpgp/xml.c \ openpgp/pgpverify.c openpgp/pgp.c \ @@ -57,24 +60,21 @@ endif endif -if ENABLE_INCLUDED_LZO -LZO_OBJECTS = minilzo.c -else +# LZO LZO_OBJECTS = +if ENABLE_INCLUDED_LZO +LZO_OBJECTS += lzoconf.h minilzo.h minilzo.c endif +COBJECTS_EXTRA = gnutls_extra.c -COBJECTS_EXTRA = \ - gnutls_extra.c - - -libgnutls_extra_la_LDFLAGS = $(LIBGNUTLS_EXTRA_EXPORTS) \ +libgnutls_extra_la_LDFLAGS = -export-symbols-regex '^gnutls.*' \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ $(LIBOPENCDK_LIBS) $(LZO_LIBS) libgnutls_extra_la_SOURCES = $(COBJECTS_EXTRA) $(LZO_OBJECTS) \ - $(PGP_COBJECTS) $(OPENCDK_COBJECTS) + $(PGP_COBJECTS) $(OPENCDK_COBJECTS) gnutls_extra.h libgnutls_extra_la_LIBADD = ../lib/libgnutls.la ../gl/libgnu.la |