[tor-commits] [torsocks/master] Add new source directory structure and makefiles

[dgoulet at torproject.org]

commit 45883524c5e034bbbe08206f141fdb53eb9082f0
Author: David Goulet <dgoulet at ev0ke.net>
Date:   Sun Jun 2 12:58:43 2013 -0400

    Add new source directory structure and makefiles
    
    Signed-off-by: David Goulet <dgoulet at ev0ke.net>
---
 configure.ac           |    2 ++
 src/Makefile.am        |   19 +------------------
 src/common/Makefile.am |    8 ++++++++
 src/lib/Makefile.am    |   16 ++++++++++++++++
 4 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/configure.ac b/configure.ac
index aded828..517155b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -651,6 +651,8 @@ AC_SUBST(DEFAULT_INCLUDES)
 AC_CONFIG_FILES([
 	Makefile
 	src/Makefile
+	src/common/Makefile
+	src/lib/Makefile
 	doc/Makefile
 	test/Makefile
 ])
diff --git a/src/Makefile.am b/src/Makefile.am
index e3a01c9..67c8cf5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,18 +1 @@
-# Makefile used by configure to create real Makefile
-
-libdir = @libdir@/torsocks
-
-# Install invocation scripts
-bin_SCRIPTS = torsocks usewithtor
-INSTALL_SCRIPT = $(install_sh) -c -m 755
-
-libtorsocks_la_LDFLAGS= $(TORSOCKSLDFLAGS)
-# Install main library to $(prefix)/lib/tor (must match torsocks.in)
-lib_LTLIBRARIES = libtorsocks.la
-libtorsocks_la_SOURCES = torsocks.c common.c parser.c dead_pool.c darwin_warts.c socks.c\
-				common.h  dead_pool.h  expansion_table.h  parser.h  socks.h
-
-DISTCLEANFILES=parser.lo dead_pool.lo common.lo libtorsocks.lo torsocks.lo darwin_warts.lo socks.lo\
-			   config.cache config.log config.h Makefile \
-			   aclocal.m4 config.status usewithtor torsocks \
-			   autom4te.cache .libs .deps 
+SUBDIRS = common lib
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
new file mode 100644
index 0000000..c663a99
--- /dev/null
+++ b/src/common/Makefile.am
@@ -0,0 +1,8 @@
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
+
+AM_CFLAGS = -fno-strict-aliasing
+
+noinst_LTLIBRARIES = libcommon.la
+libcommon_la_SOURCES =
+
+
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
new file mode 100644
index 0000000..4a4fbea
--- /dev/null
+++ b/src/lib/Makefile.am
@@ -0,0 +1,16 @@
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(builddir)
+
+libdir = @libdir@/torsocks
+
+# Install invocation scripts
+bin_SCRIPTS = torsocks usewithtor
+INSTALL_SCRIPT = $(install_sh) -c -m 755
+
+lib_LTLIBRARIES = libtorsocks.la
+
+libtorsocks_la_SOURCES =
+
+libtorsocks_la_LDFLAGS = $(TORSOCKSLDFLAGS)
+
+libtorsocks_la_LIBADD = \
+		$(top_builddir)/src/common/libcommon.la