Changed directory structure.

27 files changed, 10 insertions, 8 deletions

diff --git a/Makefile.am b/Makefile.am
index 9c3e050ebd..54817ad1f6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = src
+SUBDIRS = lib src doc
  
\ No newline at end of file
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000000..187d349988
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = HACKING
diff --git a/lib/Makefile.am b/lib/Makefile.am
index e69de29bb2..96d22e33fe 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -0,0 +1,5 @@
+include_HEADERS = gnutls.h 
+EXTRA_DIST = debug.h gnutls_compress.h defines.h gnutls_plaintext.h gnutls_cipher.h gnutls_buffers.h gnutls_errors.h gnutls_int.h gnutls_handshake.h gnutls_num.h gnutls_algorithms.h
+lib_LTLIBRARIES = libgnutls.la
+libgnutls_la_SOURCES = gnutls.c gnutls_compress.c debug.c gnutls_plaintext.c gnutls_cipher.c gnutls_buffers.c gnutls_handshake.c gnutls_num.c gnutls_errors.c gnutls_algorithms.c
+libgnutls_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
diff --git a/src/debug.c b/lib/debug.c
index 9343de237d..9343de237d 100644
--- a/src/debug.c
+++ b/lib/debug.c
diff --git a/src/debug.h b/lib/debug.h
index 3c19e39e8d..3c19e39e8d 100644
--- a/src/debug.h
+++ b/lib/debug.h
diff --git a/src/defines.h b/lib/defines.h
index 546aaed186..546aaed186 100644
--- a/src/defines.h
+++ b/lib/defines.h
diff --git a/src/gnutls.c b/lib/gnutls.c
index d9a2b8c8aa..d9a2b8c8aa 100644
--- a/src/gnutls.c
+++ b/lib/gnutls.c
diff --git a/src/gnutls.h b/lib/gnutls.h
index fd8f4247af..fd8f4247af 100644
--- a/src/gnutls.h
+++ b/lib/gnutls.h
diff --git a/src/gnutls_algorithms.c b/lib/gnutls_algorithms.c
index d3de151836..d3de151836 100644
--- a/src/gnutls_algorithms.c
+++ b/lib/gnutls_algorithms.c
diff --git a/src/gnutls_algorithms.h b/lib/gnutls_algorithms.h
index 7bc613ad16..7bc613ad16 100644
--- a/src/gnutls_algorithms.h
+++ b/lib/gnutls_algorithms.h
diff --git a/src/gnutls_buffers.c b/lib/gnutls_buffers.c
index 9b8b3fd6f1..9b8b3fd6f1 100644
--- a/src/gnutls_buffers.c
+++ b/lib/gnutls_buffers.c
diff --git a/src/gnutls_buffers.h b/lib/gnutls_buffers.h
index 24ad57b878..24ad57b878 100644
--- a/src/gnutls_buffers.h
+++ b/lib/gnutls_buffers.h
diff --git a/src/gnutls_cipher.c b/lib/gnutls_cipher.c
index 855ab27647..855ab27647 100644
--- a/src/gnutls_cipher.c
+++ b/lib/gnutls_cipher.c
diff --git a/src/gnutls_cipher.h b/lib/gnutls_cipher.h
index 1ba32edab2..1ba32edab2 100644
--- a/src/gnutls_cipher.h
+++ b/lib/gnutls_cipher.h
diff --git a/src/gnutls_compress.c b/lib/gnutls_compress.c
index fa0d2bb11b..fa0d2bb11b 100644
--- a/src/gnutls_compress.c
+++ b/lib/gnutls_compress.c
diff --git a/src/gnutls_compress.h b/lib/gnutls_compress.h
index ef15cac254..ef15cac254 100644
--- a/src/gnutls_compress.h
+++ b/lib/gnutls_compress.h
diff --git a/src/gnutls_dh.c b/lib/gnutls_dh.c
index 754f363dc7..754f363dc7 100644
--- a/src/gnutls_dh.c
+++ b/lib/gnutls_dh.c
diff --git a/src/gnutls_errors.c b/lib/gnutls_errors.c
index b571eb7adf..b571eb7adf 100644
--- a/src/gnutls_errors.c
+++ b/lib/gnutls_errors.c
diff --git a/src/gnutls_errors.h b/lib/gnutls_errors.h
index 7a251a27b9..7a251a27b9 100644
--- a/src/gnutls_errors.h
+++ b/lib/gnutls_errors.h
diff --git a/src/gnutls_handshake.c b/lib/gnutls_handshake.c
index 5c44c4b027..5c44c4b027 100644
--- a/src/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
diff --git a/src/gnutls_handshake.h b/lib/gnutls_handshake.h
index b1fbd1c48b..b1fbd1c48b 100644
--- a/src/gnutls_handshake.h
+++ b/lib/gnutls_handshake.h
diff --git a/src/gnutls_int.h b/lib/gnutls_int.h
index 1700ad1b56..1700ad1b56 100644
--- a/src/gnutls_int.h
+++ b/lib/gnutls_int.h
diff --git a/src/gnutls_num.c b/lib/gnutls_num.c
index 4374d32ecb..4374d32ecb 100644
--- a/src/gnutls_num.c
+++ b/lib/gnutls_num.c
diff --git a/src/gnutls_num.h b/lib/gnutls_num.h
index a1d755d3f4..a1d755d3f4 100644
--- a/src/gnutls_num.h
+++ b/lib/gnutls_num.h
diff --git a/src/gnutls_plaintext.c b/lib/gnutls_plaintext.c
index b57ad97911..b57ad97911 100644
--- a/src/gnutls_plaintext.c
+++ b/lib/gnutls_plaintext.c
diff --git a/src/gnutls_plaintext.h b/lib/gnutls_plaintext.h
index 9e3e931de3..9e3e931de3 100644
--- a/src/gnutls_plaintext.h
+++ b/lib/gnutls_plaintext.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 938ffd14e1..3168d5f1bd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,6 @@
-include_HEADERS = gnutls.h 
-EXTRA_DIST = debug.h gnutls_compress.h defines.h gnutls_plaintext.h gnutls_cipher.h gnutls_buffers.h gnutls_errors.h gnutls_int.h gnutls_handshake.h gnutls_num.h port.h gnutls_algorithms.h
-lib_LTLIBRARIES = libgnutls.la
-libgnutls_la_SOURCES = gnutls.c gnutls_compress.c debug.c gnutls_plaintext.c gnutls_cipher.c gnutls_buffers.c gnutls_handshake.c gnutls_num.c gnutls_errors.c gnutls_algorithms.c
-libgnutls_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+EXTRA_DIST = port.h
 noinst_PROGRAMS = serv cli
 serv_SOURCES = serv.c
-serv_LDADD = libgnutls.la -lgcrypt -lmhash
+serv_LDADD = ../lib/libgnutls.la -lgcrypt -lmhash
 cli_SOURCES = cli.c
-cli_LDADD = libgnutls.la -lgcrypt -lmhash
+cli_LDADD = ../lib/libgnutls.la -lgcrypt -lmhash