diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,70 @@
-SUBDIRS = src
+ACLOCAL_AMFLAGS = -I m4
+
+
+AM_CPPFLAGS = -DSYSCONFDIR='"$(sysconfdir)"' \
+	-DLOCALSTATEDIR='"$(localstatedir)"' \
+	-I$(top_srcdir)/src
+AM_CFLAGS = $(DISTLIBS_CFLAGS)
+LIBS = $(DISTLIBS_LDADD) $(DISTLIBS_LDFLAGS)
+LDADD = libdistrencommon.la
+
+include_HEADERS = src/client/distren.h
+
+bin_PROGRAMS = distren
+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/execio.h \
+	src/common/execio.c \
+	src/common/remoteio.h \
+	src/common/libremoteio.h \
+	src/common/remoteio.c \
+	src/common/asprintf.h \
+	src/common/asprintf.c
+#see http://sources.redhat.com/autobook/autobook/autobook_91.html
+# either increase the revision number or the interface number each release!
+libdistrencommon_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0
 
-ACLOCAL_AMFLAGS = -I m4
+# 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 \
+	src/server/distrenjob.c \
+	src/server/distrenjob.h
+# distrend:
+distrend_SOURCES = $(SERVER_SOURCES) \
+	src/server/distrend.c \
+	src/server/distrend.h \
+	src/server/user_mgr.c \
+	src/server/user_mgr.h \
+	src/server/listen.h \
+	src/server/listen.c
+distrend_LDADD = libdistrencommon.la
+# distrenslave:
+distrenslave_SOURCES = $(SERVER_SOURCES) \
+	src/server/slave.c
+distrenslave_LDADD = libdistrencommon.la
+
 
 
 # configuration files:
@@ -10,3 +74,16 @@ nodist_sysconf_DATA = etc/distrendaemon.
 	etc/distrenslave.conf
 EXTRA_DIST = etc/distrendaemon.conf.in \
 	etc/distrenslave.conf.in
+
+
+# tests
+TESTS=test/check_execio test/check_asprintf
+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_CFLAGS = $(AM_CFLAGS) $(CHECK_CFLAGS)
+test_check_asprintf_CFLAGS = $(AM_CFLAGS) $(CHECK_CFLAGS)
+