From 4725aa27e70ca6d8b09827aa747f9c61ee668363 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 22 May 2015 10:07:38 +0200
Subject: [PATCH] build system: move some files to subdir

This seems to be necessary to make "make distcheck" work.
---
 Makefile.am                        | 38 ------------------------------
 runtime/Makefile.am                | 36 ++++++++++++++++++++++++++++
 gss-misc.c => runtime/gss-misc.c   |  0
 gss-misc.h => runtime/gss-misc.h   |  0
 tcpclt.c => runtime/tcpclt.c       |  0
 tcpclt.h => runtime/tcpclt.h       |  0
 tcps_sess.c => runtime/tcps_sess.c |  0
 tcps_sess.h => runtime/tcps_sess.h |  0
 tcpsrv.c => runtime/tcpsrv.c       |  0
 tcpsrv.h => runtime/tcpsrv.h       |  0
 10 files changed, 36 insertions(+), 38 deletions(-)
 rename gss-misc.c => runtime/gss-misc.c (100%)
 rename gss-misc.h => runtime/gss-misc.h (100%)
 rename tcpclt.c => runtime/tcpclt.c (100%)
 rename tcpclt.h => runtime/tcpclt.h (100%)
 rename tcps_sess.c => runtime/tcps_sess.c (100%)
 rename tcps_sess.h => runtime/tcps_sess.h (100%)
 rename tcpsrv.c => runtime/tcpsrv.c (100%)
 rename tcpsrv.h => runtime/tcpsrv.h (100%)

diff --git a/Makefile.am b/Makefile.am
index 931a614b1..5f007875f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,44 +3,6 @@ pkglib_LTLIBRARIES =
 
 pkgconfigdir = $(libdir)/pkgconfig
 
-if ENABLE_INET
-pkglib_LTLIBRARIES += lmtcpsrv.la lmtcpclt.la
-#
-#
-# TCP (stream) server support
-#
-lmtcpsrv_la_SOURCES = \
-	tcps_sess.c \
-	tcps_sess.h \
-	tcpsrv.c \
-	tcpsrv.h
-lmtcpsrv_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
-lmtcpsrv_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
-lmtcpsrv_la_LIBADD = 
-
-#
-# TCP (stream) client support
-#
-lmtcpclt_la_SOURCES = \
-	tcpclt.c \
-	tcpclt.h
-lmtcpclt_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
-lmtcpclt_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
-lmtcpclt_la_LIBADD = 
-
-endif # if ENABLE_INET
-
-#
-# gssapi support
-# 
-if ENABLE_GSSAPI
-pkglib_LTLIBRARIES += lmgssutil.la
-lmgssutil_la_SOURCES = gss-misc.c gss-misc.h
-lmgssutil_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-lmgssutil_la_LDFLAGS = -module -avoid-version
-lmgssutil_la_LIBADD = $(GSS_LIBS)
-endif
-
 #
 # systemd support
 #
diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index bcb19d997..3052f07fd 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -206,6 +206,42 @@ if ENABLE_GUARDTIME
    lmsig_gt_la_LIBADD = librsgt.la $(GUARDTIME_LIBS)
 endif
 
+#
+# gssapi support
+# 
+if ENABLE_GSSAPI
+pkglib_LTLIBRARIES += lmgssutil.la
+lmgssutil_la_SOURCES = gss-misc.c gss-misc.h
+lmgssutil_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
+lmgssutil_la_LDFLAGS = -module -avoid-version
+lmgssutil_la_LIBADD = $(GSS_LIBS)
+endif
+
+pkglib_LTLIBRARIES += lmtcpsrv.la lmtcpclt.la
+#
+#
+# TCP (stream) server support
+#
+lmtcpsrv_la_SOURCES = \
+	tcps_sess.c \
+	tcps_sess.h \
+	tcpsrv.c \
+	tcpsrv.h
+lmtcpsrv_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
+lmtcpsrv_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
+lmtcpsrv_la_LIBADD = 
+
+#
+# TCP (stream) client support
+#
+lmtcpclt_la_SOURCES = \
+	tcpclt.c \
+	tcpclt.h
+lmtcpclt_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
+lmtcpclt_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
+lmtcpclt_la_LIBADD = 
+
+
 
 update-systemd:
 	curl http://cgit.freedesktop.org/systemd/systemd/plain/src/libsystemd-daemon/sd-daemon.c > sd-daemon.c
diff --git a/gss-misc.c b/runtime/gss-misc.c
similarity index 100%
rename from gss-misc.c
rename to runtime/gss-misc.c
diff --git a/gss-misc.h b/runtime/gss-misc.h
similarity index 100%
rename from gss-misc.h
rename to runtime/gss-misc.h
diff --git a/tcpclt.c b/runtime/tcpclt.c
similarity index 100%
rename from tcpclt.c
rename to runtime/tcpclt.c
diff --git a/tcpclt.h b/runtime/tcpclt.h
similarity index 100%
rename from tcpclt.h
rename to runtime/tcpclt.h
diff --git a/tcps_sess.c b/runtime/tcps_sess.c
similarity index 100%
rename from tcps_sess.c
rename to runtime/tcps_sess.c
diff --git a/tcps_sess.h b/runtime/tcps_sess.h
similarity index 100%
rename from tcps_sess.h
rename to runtime/tcps_sess.h
diff --git a/tcpsrv.c b/runtime/tcpsrv.c
similarity index 100%
rename from tcpsrv.c
rename to runtime/tcpsrv.c
diff --git a/tcpsrv.h b/runtime/tcpsrv.h
similarity index 100%
rename from tcpsrv.h
rename to runtime/tcpsrv.h