Changed directory structure.

diff --git a/Makefile.am b/Makefile.am
index 9c3e050ebd70d4fd91502815dcea67d5d1c61cb3..54817ad1f6bc7346718d1efe0d814afeb70d2e9b 100644 (file)
--- 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 (file)
index 0000000..187d349
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = HACKING

diff --git a/lib/Makefile.am b/lib/Makefile.am
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..96d22e33fe0efa25c5b6d649456e3f9b0f93e8bb 100644 (file)
--- 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
similarity index 100%
rename from src/debug.c
rename to lib/debug.c

diff --git a/src/debug.h b/lib/debug.h
similarity index 100%
rename from src/debug.h
rename to lib/debug.h

diff --git a/src/defines.h b/lib/defines.h
similarity index 100%
rename from src/defines.h
rename to lib/defines.h

diff --git a/src/gnutls.c b/lib/gnutls.c
similarity index 100%
rename from src/gnutls.c
rename to lib/gnutls.c

diff --git a/src/gnutls.h b/lib/gnutls.h
similarity index 100%
rename from src/gnutls.h
rename to lib/gnutls.h

diff --git a/src/gnutls_algorithms.c b/lib/gnutls_algorithms.c
similarity index 100%
rename from src/gnutls_algorithms.c
rename to lib/gnutls_algorithms.c

diff --git a/src/gnutls_algorithms.h b/lib/gnutls_algorithms.h
similarity index 100%
rename from src/gnutls_algorithms.h
rename to lib/gnutls_algorithms.h

diff --git a/src/gnutls_buffers.c b/lib/gnutls_buffers.c
similarity index 100%
rename from src/gnutls_buffers.c
rename to lib/gnutls_buffers.c

diff --git a/src/gnutls_buffers.h b/lib/gnutls_buffers.h
similarity index 100%
rename from src/gnutls_buffers.h
rename to lib/gnutls_buffers.h

diff --git a/src/gnutls_cipher.c b/lib/gnutls_cipher.c
similarity index 100%
rename from src/gnutls_cipher.c
rename to lib/gnutls_cipher.c

diff --git a/src/gnutls_cipher.h b/lib/gnutls_cipher.h
similarity index 100%
rename from src/gnutls_cipher.h
rename to lib/gnutls_cipher.h

diff --git a/src/gnutls_compress.c b/lib/gnutls_compress.c
similarity index 100%
rename from src/gnutls_compress.c
rename to lib/gnutls_compress.c

diff --git a/src/gnutls_compress.h b/lib/gnutls_compress.h
similarity index 100%
rename from src/gnutls_compress.h
rename to lib/gnutls_compress.h

diff --git a/src/gnutls_dh.c b/lib/gnutls_dh.c
similarity index 100%
rename from src/gnutls_dh.c
rename to lib/gnutls_dh.c

diff --git a/src/gnutls_errors.c b/lib/gnutls_errors.c
similarity index 100%
rename from src/gnutls_errors.c
rename to lib/gnutls_errors.c

diff --git a/src/gnutls_errors.h b/lib/gnutls_errors.h
similarity index 100%
rename from src/gnutls_errors.h
rename to lib/gnutls_errors.h

diff --git a/src/gnutls_handshake.c b/lib/gnutls_handshake.c
similarity index 100%
rename from src/gnutls_handshake.c
rename to lib/gnutls_handshake.c

diff --git a/src/gnutls_handshake.h b/lib/gnutls_handshake.h
similarity index 100%
rename from src/gnutls_handshake.h
rename to lib/gnutls_handshake.h

diff --git a/src/gnutls_int.h b/lib/gnutls_int.h
similarity index 100%
rename from src/gnutls_int.h
rename to lib/gnutls_int.h

diff --git a/src/gnutls_num.c b/lib/gnutls_num.c
similarity index 100%
rename from src/gnutls_num.c
rename to lib/gnutls_num.c

diff --git a/src/gnutls_num.h b/lib/gnutls_num.h
similarity index 100%
rename from src/gnutls_num.h
rename to lib/gnutls_num.h

diff --git a/src/gnutls_plaintext.c b/lib/gnutls_plaintext.c
similarity index 100%
rename from src/gnutls_plaintext.c
rename to lib/gnutls_plaintext.c

diff --git a/src/gnutls_plaintext.h b/lib/gnutls_plaintext.h
similarity index 100%
rename from src/gnutls_plaintext.h
rename to lib/gnutls_plaintext.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 938ffd14e1454e147904764c995389adeda099c7..3168d5f1bda5f9907e9707944f26950ead6b1d51 100644 (file)
--- 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