[tor-commits] [torsocks/master] Issue 27: Fix build system so 'make dist' works

[hoganrobert at torproject.org]

commit c9448f11280deade8fb2ae66ce10678dfa756144
Author: Robert Hogan <robert at roberthogan.net>
Date:   Mon Oct 24 20:27:23 2011 +0100

    Issue 27: Fix build system so 'make dist' works
    
    "The current build system fails when trying to create a tarball using 'make dist'.
    There are two problems here:
    
    When creating a tarball for distribution with 'make dist', the header files at
    src/*.h are not included and so the build fails.  These should be listed in
    libtorsocks_la_SOURCES.
    
    Similarly, not having the prefix dist_ for the installation directories in doc/
    means that these will not be included in the distribution tarball.  Also, there
    is no need to define custom *manpagedirs as the build system is man page aware."
    
    Patch by Anthony Basile <blueness at gentoo.org>
---
 doc/Makefile.am |   16 +++-------------
 src/Makefile.am |    3 ++-
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index ed6cbf4..222ba92 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,18 +1,8 @@
 # Makefile used by configure to create real Makefile
 
 # Install configuration file
-usewithtorconfdir = $(CONFDIR)/
-usewithtorconf_DATA = torsocks.conf
+confdir = $(CONFDIR)/
+dist_conf_DATA = torsocks.conf
 
 # Install man pages
-torsocksmanpagedir = $(mandir)/man1
-torsocksmanpage_DATA = torsocks.1
-
-torsocks8manpagedir = $(mandir)/man8
-torsocks8manpage_DATA = torsocks.8
-
-usewithtormanpagedir = $(mandir)/man1
-usewithtormanpage_DATA = usewithtor.1
-
-torsocksconfmanpagedir = $(mandir)/man5
-torsocksconfmanpage_DATA = torsocks.conf.5
+dist_man_MANS = torsocks.1 torsocks.8 usewithtor.1 torsocks.conf.5
diff --git a/src/Makefile.am b/src/Makefile.am
index 5f13f47..e3a01c9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,7 +9,8 @@ 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
+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 \