From af1d24f4c1012cb7b83873771b6cc9b5610b761b Mon Sep 17 00:00:00 2001
From: Georg Hopp <georg@steffers.org>
Date: Mon, 9 Sep 2013 12:01:56 +0100
Subject: [PATCH] don't use non automake makefiles under tests anymore

---
 tests/Makefile.am     | 27 +++++++++------------------
 tests/stream/Makefile | 15 ---------------
 2 files changed, 9 insertions(+), 33 deletions(-)
 delete mode 100644 tests/stream/Makefile

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 18d5cca..f3033e7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = subdir-objects
 
 TESTS_ENVIRONMENT = valgrind --error-exitcode=123 --leak-check=full --quiet
 TESTS = classTest loggerTest socketTest serverTest
@@ -22,15 +23,16 @@ SOCKET = $(LOGGER) \
 	 ../src/socket/socket.c \
 	 ../src/socket/listen.c \
 	 ../src/socket/accept.c \
-	 ../src/socket/connect.c
+	 ../src/socket/connect.c \
+	 ../src/socket/nonblock.c
 
-STREAM_OBJ = ./stream/stream.o \
-	     ./stream/read.o \
-	     ./stream/write.o \
-	     ./stream/reader.o \
-	     ./stream/writer.o
+STREAM = ../src/stream/stream.c \
+	 ../src/stream/read.c \
+	 ../src/stream/write.c \
+	 ../src/stream/interface/reader.c \
+	 ../src/stream/interface/writer.c
 
-SERVER = $(SOCKET) \
+SERVER = $(SOCKET) $(STREAM) \
 	 ../src/server/server.c \
 	 ../src/server/run.c \
 	 ../src/server/close_conn.c \
@@ -58,14 +60,3 @@ serverTest_CFLAGS  = -Wall -ggdb -O0 -fprofile-arcs -ftest-coverage -pg -I ../in
 serverTest_LDFLAGS = $(STREAM_OBJ) -lgcov -lcrypto -pg
 
 EXTRA_DIST = runtest.h mock/mock_class.h mock/mock_logger.h
-
-.PHONY: stream
-stream:
-	$(MAKE) -C stream $(AM_MAKEFLAGS)
-
-$(check_PROGRAMS): stream
-check-build: $(check_PROGRAMS)
-
-all-local: stream
-
-SUBDIRS = stream
diff --git a/tests/stream/Makefile b/tests/stream/Makefile
deleted file mode 100644
index bdadc2c..0000000
--- a/tests/stream/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-vpath %.c ../../src/stream
-vpath %.c ../../src/stream/interface
-
-OBJECTS  = stream.o read.o write.o reader.o writer.o
-
-%.o: %.c
-	gcc -Wall -ggdb -O0 -fprofile-arcs -ftest-coverage -I ../../include -c $< -o $@
-
-.PHONY: all clean check distclean check-build
-all: check-build
-check: check-build
-check-build: $(OBJECTS)
-distclean: clean
-clean:
-	rm -rf $(OBJECTS)