diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2002-05-20 12:01:37 +0000 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2002-05-20 12:01:37 +0000 |
commit | 20413c8a84e47c719a3874aa1c6eca52adba46a5 (patch) | |
tree | dfbaa550de92483c6446e8725252677faf3a87cc | |
parent | 3b8e2bbaaa80185ab64f08438bf83fe3fb74016b (diff) | |
download | gnutls-20413c8a84e47c719a3874aa1c6eca52adba46a5.tar.gz |
Moved the gnutls-extra files to libextra directory.
-rw-r--r-- | lib/Makefile.am | 28 | ||||
-rw-r--r-- | libextra/Makefile.am | 26 | ||||
-rw-r--r-- | libextra/auth_srp.c (renamed from lib/auth_srp.c) | 0 | ||||
-rw-r--r-- | libextra/auth_srp.h (renamed from lib/auth_srp.h) | 0 | ||||
-rw-r--r-- | libextra/auth_srp_passwd.c (renamed from lib/auth_srp_passwd.c) | 0 | ||||
-rw-r--r-- | libextra/auth_srp_passwd.h (renamed from lib/auth_srp_passwd.h) | 0 | ||||
-rw-r--r-- | libextra/auth_srp_sb64.c (renamed from lib/auth_srp_sb64.c) | 0 | ||||
-rw-r--r-- | libextra/crypt.c (renamed from lib/crypt.c) | 0 | ||||
-rw-r--r-- | libextra/crypt.h (renamed from lib/crypt.h) | 0 | ||||
-rw-r--r-- | libextra/crypt_bcrypt.c (renamed from lib/crypt_bcrypt.c) | 0 | ||||
-rw-r--r-- | libextra/crypt_bcrypt.h (renamed from lib/crypt_bcrypt.h) | 0 | ||||
-rw-r--r-- | libextra/crypt_srpsha1.c (renamed from lib/crypt_srpsha1.c) | 0 | ||||
-rw-r--r-- | libextra/crypt_srpsha1.h (renamed from lib/crypt_srpsha1.h) | 0 | ||||
-rw-r--r-- | libextra/ext_srp.c (renamed from lib/ext_srp.c) | 0 | ||||
-rw-r--r-- | libextra/ext_srp.h (renamed from lib/ext_srp.h) | 0 | ||||
-rw-r--r-- | libextra/gnutls-extra.h (renamed from lib/gnutls-extra.h) | 4 | ||||
-rw-r--r-- | libextra/gnutls_extra.c (renamed from lib/gnutls_extra.c) | 0 | ||||
-rw-r--r-- | libextra/gnutls_extra.h (renamed from lib/gnutls_extra.h) | 0 | ||||
-rw-r--r-- | libextra/gnutls_openpgp.c (renamed from lib/gnutls_openpgp.c) | 0 | ||||
-rw-r--r-- | libextra/gnutls_openpgp.h (renamed from lib/gnutls_openpgp.h) | 0 | ||||
-rw-r--r-- | libextra/gnutls_srp.c (renamed from lib/gnutls_srp.c) | 0 | ||||
-rw-r--r-- | libextra/gnutls_srp.h (renamed from lib/gnutls_srp.h) | 0 |
22 files changed, 38 insertions, 20 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 0f6d5bfbcf..94a717b070 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,4 +1,5 @@ -include_HEADERS = gnutls.h gnutls-extra.h +INCLUDES = -I../libextra +include_HEADERS = gnutls.h bin_SCRIPTS = libgnutls-config m4datadir = $(datadir)/aclocal @@ -9,9 +10,9 @@ EXTRA_DIST = debug.h gnutls_compress.h defines.h gnutls.asn pkix.asn \ gnutls_handshake.h gnutls_num.h gnutls_algorithms.h gnutls_dh.h \ gnutls_kx.h gnutls_hash_int.h gnutls_cipher_int.h gnutls_db.h \ gnutls_compress_int.h gnutls_session.h gnutls_priority.h gnutls_auth.h \ - auth_anon.h gnutls_extensions.h ext_srp.h \ - gnutls_auth_int.h crypt_bcrypt.h gnutls_random.h crypt_srpsha1.h \ - x509_b64.h gnutls_srp.h auth_srp.h auth_srp_passwd.h gnutls_v2_compat.h \ + auth_anon.h gnutls_extensions.h \ + gnutls_auth_int.h crypt_bcrypt.h gnutls_random.h \ + x509_b64.h auth_srp.h gnutls_v2_compat.h \ crypt.h libgnutls-config.in libgnutls.m4 gnutls.h.in.in gnutls_errors_int.h \ x509_asn1.h x509_der.h gnutls_datum.h auth_cert.h gnutls_mpi.h \ gnutls_pk.h gnutls_record.h gnutls_cert.h \ @@ -19,9 +20,9 @@ EXTRA_DIST = debug.h gnutls_compress.h defines.h gnutls.asn pkix.asn \ gnutls_sig.h gnutls_mem.h x509_extensions.h gnutls_ui.h \ gnutls-api.tex io_debug.h ext_max_record.h gnutls_session_pack.h \ gnutls_alert.h asn1-api.tex gnutls_str.h gnutls_state.h gnutls_x509.h \ - gnutls_openpgp.h ext_cert_type.h gnutls-extra-api.tex gnutls_extra.h + ext_cert_type.h -lib_LTLIBRARIES = libgnutls.la libgnutls-extra.la +lib_LTLIBRARIES = libgnutls.la COBJECTS = gnutls_record.c gnutls_compress.c debug.c \ @@ -39,18 +40,12 @@ COBJECTS = gnutls_record.c gnutls_compress.c debug.c \ gnutls_str.c gnutls_state.c gnutls_x509.c \ ext_cert_type.c -COBJECTS_EXTRA = crypt_bcrypt.c crypt.c crypt_srpsha1.c ext_srp.c \ - gnutls_srp.c auth_srp.c auth_srp_passwd.c auth_srp_sb64.c \ - gnutls_openpgp.c ext_cert_type.c gnutls_extra.c - # Separate so we can create the documentation COBJECTS2 = x509_ASN.y x509_asn1.c x509_der.c libgnutls_la_SOURCES = $(COBJECTS) $(COBJECTS2) -libgnutls_extra_la_SOURCES = $(COBJECTS_EXTRA) libgnutls_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -libgnutls_extra_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) pkix_asn1_tab.c: pkix.asn -../src/asn1c pkix.asn pkix_asn1_tab.c @@ -65,13 +60,6 @@ gnutls-api.tex: $(COBJECTS) && echo "ok"; \ done -gnutls-extra-api.tex: $(COBJECTS_EXTRA) - @echo "" > gnutls-extra-api.tex - @for i in $(COBJECTS_EXTRA); \ - do echo -n "Creating documentation for file $$i... " && ../doc/scripts/gdoc -tex $$i >> gnutls-extra-api.tex \ - && echo "ok"; \ - done - asn1-api.tex: $(COBJECTS2) @echo "" > asn1-api.tex @for i in $(COBJECTS2); \ @@ -79,4 +67,4 @@ asn1-api.tex: $(COBJECTS2) && echo "ok"; \ done -all-local: gnutls-api.tex gnutls-extra-api.tex asn1-api.tex +all-local: gnutls-api.tex asn1-api.tex diff --git a/libextra/Makefile.am b/libextra/Makefile.am new file mode 100644 index 0000000000..d5615a3e39 --- /dev/null +++ b/libextra/Makefile.am @@ -0,0 +1,26 @@ +INCLUDES = -I../lib +include_HEADERS = gnutls-extra.h + +EXTRA_DIST = ext_srp.h crypt_bcrypt.h crypt_srpsha1.h gnutls_srp.h \ + auth_srp.h auth_srp_passwd.h crypt.h gnutls_openpgp.h + gnutls-extra-api.tex gnutls_extra.h + +lib_LTLIBRARIES = libgnutls-extra.la + + +COBJECTS_EXTRA = crypt_bcrypt.c crypt.c crypt_srpsha1.c ext_srp.c \ + gnutls_srp.c auth_srp.c auth_srp_passwd.c auth_srp_sb64.c \ + gnutls_openpgp.c gnutls_extra.c + +libgnutls_extra_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + +libgnutls_extra_la_SOURCES = $(COBJECTS_EXTRA) + +gnutls-extra-api.tex: $(COBJECTS_EXTRA) + @echo "" > gnutls-extra-api.tex + @for i in $(COBJECTS_EXTRA); \ + do echo -n "Creating documentation for file $$i... " && ../doc/scripts/gdoc -tex $$i >> gnutls-extra-api.tex \ + && echo "ok"; \ + done + +all-local: gnutls-extra-api.tex diff --git a/lib/auth_srp.c b/libextra/auth_srp.c index 45f0295335..45f0295335 100644 --- a/lib/auth_srp.c +++ b/libextra/auth_srp.c diff --git a/lib/auth_srp.h b/libextra/auth_srp.h index a01475b9a6..a01475b9a6 100644 --- a/lib/auth_srp.h +++ b/libextra/auth_srp.h diff --git a/lib/auth_srp_passwd.c b/libextra/auth_srp_passwd.c index d47df6ec7a..d47df6ec7a 100644 --- a/lib/auth_srp_passwd.c +++ b/libextra/auth_srp_passwd.c diff --git a/lib/auth_srp_passwd.h b/libextra/auth_srp_passwd.h index 6207265542..6207265542 100644 --- a/lib/auth_srp_passwd.h +++ b/libextra/auth_srp_passwd.h diff --git a/lib/auth_srp_sb64.c b/libextra/auth_srp_sb64.c index 3876ed5a6a..3876ed5a6a 100644 --- a/lib/auth_srp_sb64.c +++ b/libextra/auth_srp_sb64.c diff --git a/lib/crypt.c b/libextra/crypt.c index 6da9c339b5..6da9c339b5 100644 --- a/lib/crypt.c +++ b/libextra/crypt.c diff --git a/lib/crypt.h b/libextra/crypt.h index 205ec72136..205ec72136 100644 --- a/lib/crypt.h +++ b/libextra/crypt.h diff --git a/lib/crypt_bcrypt.c b/libextra/crypt_bcrypt.c index 55ece44c4b..55ece44c4b 100644 --- a/lib/crypt_bcrypt.c +++ b/libextra/crypt_bcrypt.c diff --git a/lib/crypt_bcrypt.h b/libextra/crypt_bcrypt.h index 00458a2e2b..00458a2e2b 100644 --- a/lib/crypt_bcrypt.h +++ b/libextra/crypt_bcrypt.h diff --git a/lib/crypt_srpsha1.c b/libextra/crypt_srpsha1.c index 0dbc5ff8e8..0dbc5ff8e8 100644 --- a/lib/crypt_srpsha1.c +++ b/libextra/crypt_srpsha1.c diff --git a/lib/crypt_srpsha1.h b/libextra/crypt_srpsha1.h index bf0d55ebbe..bf0d55ebbe 100644 --- a/lib/crypt_srpsha1.h +++ b/libextra/crypt_srpsha1.h diff --git a/lib/ext_srp.c b/libextra/ext_srp.c index c04d5ced44..c04d5ced44 100644 --- a/lib/ext_srp.c +++ b/libextra/ext_srp.c diff --git a/lib/ext_srp.h b/libextra/ext_srp.h index ae3158a693..ae3158a693 100644 --- a/lib/ext_srp.h +++ b/libextra/ext_srp.h diff --git a/lib/gnutls-extra.h b/libextra/gnutls-extra.h index 6e06ce3db2..e77c7bd6ff 100644 --- a/lib/gnutls-extra.h +++ b/libextra/gnutls-extra.h @@ -18,6 +18,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ +/* Note the libgnutls-extra is not a standalone library. It requires + * to link also against libgnutls. + */ + #ifndef GNUTLS_EXTRA_H # define GNUTLS_EXTRA_H diff --git a/lib/gnutls_extra.c b/libextra/gnutls_extra.c index a168d15552..a168d15552 100644 --- a/lib/gnutls_extra.c +++ b/libextra/gnutls_extra.c diff --git a/lib/gnutls_extra.h b/libextra/gnutls_extra.h index fba5882413..fba5882413 100644 --- a/lib/gnutls_extra.h +++ b/libextra/gnutls_extra.h diff --git a/lib/gnutls_openpgp.c b/libextra/gnutls_openpgp.c index 3f0eea3347..3f0eea3347 100644 --- a/lib/gnutls_openpgp.c +++ b/libextra/gnutls_openpgp.c diff --git a/lib/gnutls_openpgp.h b/libextra/gnutls_openpgp.h index a0ec4dd2e1..a0ec4dd2e1 100644 --- a/lib/gnutls_openpgp.h +++ b/libextra/gnutls_openpgp.h diff --git a/lib/gnutls_srp.c b/libextra/gnutls_srp.c index e4eb030ba3..e4eb030ba3 100644 --- a/lib/gnutls_srp.c +++ b/libextra/gnutls_srp.c diff --git a/lib/gnutls_srp.h b/libextra/gnutls_srp.h index 5f13abd7c1..5f13abd7c1 100644 --- a/lib/gnutls_srp.h +++ b/libextra/gnutls_srp.h |