# HG changeset patch
# User Binki <ohnobinki@ohnopublishing.net>
# Date 2010-02-10 22:48:40
# Node ID 37e8c7cd683a74e2bc8bfa0713fc0994909e6ec4
# Parent  d5f4334ff4e61440309bd22ee02cbd243a2d73ce

remove references to C-based client from buildsystem, fix make distcheck

diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,19 +8,17 @@ AM_CFLAGS = $(DISTLIBS_CFLAGS)
 LIBS = $(DISTLIBS_LDADD) $(DISTLIBS_LDFLAGS)
 LDADD = libdistrencommon.la
 
-include_HEADERS = src/client/distren.h
-
-bin_PROGRAMS = distren
+bin_PROGRAMS = 
 if ENABLE_SERVER
 bin_PROGRAMS += distrend distrenslave
 endif
 
-lib_LTLIBRARIES = libdistren.la
 pkglib_LTLIBRARIES = libdistrencommon.la
 
 # libdistrencommon.la:
 libdistrencommon_la_SOURCES = src/common/options.c \
 	src/common/options.h \
+	src/common/protocol.h \
 	src/common/execio.h \
 	src/common/execio.c \
 	src/common/remoteio.h \
@@ -32,20 +30,6 @@ libdistrencommon_la_SOURCES = src/common
 # either increase the revision number or the interface number each release!
 libdistrencommon_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0
 
-# libdistren.la:
-libdistren_la_SOURCES = $(include_HEADERS) \
-	src/client/libdistren.h \
-	src/client/libdistren.c \
-	src/client/libdistren_job.c \
-	src/client/libdistren_unbias.c \
-	src/client/libdistren_config.c
-libdistren_la_LIBADD = libdistrencommon.la
-libdistren_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0
-
-# distren:
-distren_SOURCES = src/client/distren.c
-distren_LDADD = libdistren.la
-
 # shared server sources:
 SERVER_SOURCES = src/server/slavefuncs.c \
 	src/server/slavefuncs.h \
@@ -72,8 +56,7 @@ distrenslave_LDADD = libdistrencommon.la
 
 
 # configuration files:
-dist_sysconf_DATA = etc/distrenclient.conf \
-	etc/distrencommon.conf
+dist_sysconf_DATA = etc/distrencommon.conf
 nodist_sysconf_DATA = etc/distrendaemon.conf \
 	etc/distrenslave.conf
 EXTRA_DIST = etc/distrendaemon.conf.in \
@@ -86,8 +69,8 @@ check_PROGRAMS=$(TESTS)
 
 #check_execio_LIBS = $(CHECK_LIBS)
 #check_asprintf_LIBS = $(CHECK_LIBS)
-test_check_execio_LDADD = $(CHECK_LIBS) src/libdistrencommon.la
-test_check_asprintf_LDADD = $(CHECK_LIBS) src/libdistrencommon.la
+test_check_execio_LDADD = $(CHECK_LIBS) libdistrencommon.la
+test_check_asprintf_LDADD = $(CHECK_LIBS) libdistrencommon.la
 test_check_execio_CFLAGS = $(AM_CFLAGS) $(CHECK_CFLAGS)
 test_check_asprintf_CFLAGS = $(AM_CFLAGS) $(CHECK_CFLAGS)
 
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,8 @@ AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 
 # selective compilation
+# For now, this is only left for when the C-based client is
+# reintroducded.
 AC_ARG_ENABLE([server],
 	[AS_HELP_STRING([--disable-server],[Don't build the distren server])],
 	[enable_server=$enableval],