4 files changed, 58 insertions, 38 deletions
diff --git a/sesman/Makefile.am b/sesman/Makefile.am
index 979f72d9..c40112aa 100644
--- a/sesman/Makefile.am
+++ b/sesman/Makefile.am
@@ -1,6 +1,5 @@
 
-EXTRA_DIST = sesman.ini startwm.sh sesman.h access.h auth.h config.h env.h \
-scp.h scp_v0.h scp_v1.h scp_v1_mng.h session.h sig.h
+EXTRA_DIST = sesman.ini startwm.sh
 
 AM_CPPFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
@@ -37,16 +36,27 @@ sbin_PROGRAMS = \
   xrdp-sesman
 
 xrdp_sesman_SOURCES = \
+  access.c \
+  access.h \
+  auth.h \
+  config.c \
+  config.h \
+  env.c \
+  env.h \
   scp.c \
+  scp.h \
   scp_v0.c \
+  scp_v0.h \
   scp_v1.c \
+  scp_v1.h \
   scp_v1_mng.c \
+  scp_v1_mng.h \
   sesman.c \
+  sesman.h \
   session.c \
+  session.h \
   sig.c \
-  access.c \
-  config.c \
-  env.c \
+  sig.h \
   $(AUTH_C)
 
 xrdp_sesman_LDADD = \
diff --git a/sesman/chansrv/Makefile.am b/sesman/chansrv/Makefile.am
index 45397b73..45597e12 100644
--- a/sesman/chansrv/Makefile.am
+++ b/sesman/chansrv/Makefile.am
@@ -1,21 +1,3 @@
-EXTRA_DIST = \
-  chansrv.h \
-  chansrv_fuse.h \
-  clipboard.h \
-  clipboard_common.h \
-  clipboard_file.h \
-  devredir.h \
-  drdynvc.h \
-  rail.h \
-  sound.h \
-  xcommon.h \
-  mlog.h \
-  chansrv_common.h \
-  irp.h \
-  smartcard.h \
-  smartcard_pcsc.h \
-  fifo.h
-
 EXTRA_DEFINES =
 EXTRA_INCLUDES =
 EXTRA_LIBS =
@@ -47,19 +29,35 @@ sbin_PROGRAMS = \
 
 xrdp_chansrv_SOURCES = \
   chansrv.c \
-  sound.c \
+  chansrv.h \
+  chansrv_common.c \
+  chansrv_common.h \
+  chansrv_fuse.c \
+  chansrv_fuse.h \
   clipboard.c \
+  clipboard.h \
+  clipboard_common.h \
   clipboard_file.c \
+  clipboard_file.h \
   devredir.c \
+  devredir.h \
+  drdynvc.c \
+  drdynvc.h \
+  fifo.c \
+  fifo.h \
+  irp.c \
+  irp.h \
+  mlog.h \
+  rail.c \
+  rail.h \
   smartcard.c \
+  smartcard.h \
   smartcard_pcsc.c \
-  rail.c \
+  smartcard_pcsc.h \
+  sound.c \
+  sound.h \
   xcommon.c \
-  drdynvc.c \
-  chansrv_fuse.c \
-  irp.c \
-  fifo.c \
-  chansrv_common.c
+  xcommon.h
 
 xrdp_chansrv_LDFLAGS = \
   $(X_LIBS) \
diff --git a/sesman/libscp/Makefile.am b/sesman/libscp/Makefile.am
index 627a3370..1bb89910 100644
--- a/sesman/libscp/Makefile.am
+++ b/sesman/libscp/Makefile.am
@@ -1,6 +1,3 @@
-EXTRA_DIST = libscp_connection.h libscp_commands.h libscp.h libscp_session.h libscp_types_mng.h libscp_v1c_mng.h libscp_vX.h libscp_commands_mng.h libscp_init.h libscp_tcp.h libscp_v0.h libscp_v1s.h libscp_lock.h \
-libscp_types.h libscp_v1c.h libscp_v1s_mng.h
-
 AM_CPPFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
   -DXRDP_SBIN_PATH=\"${sbindir}\" \
@@ -12,17 +9,33 @@ module_LTLIBRARIES = \
   libscp.la
 
 libscp_la_SOURCES = \
+  libscp.h \
+  libscp_commands.h \
+  libscp_commands_mng.h \
   libscp_connection.c \
+  libscp_connection.h \
   libscp_init.c \
+  libscp_init.h \
   libscp_lock.c \
+  libscp_lock.h \
   libscp_session.c \
+  libscp_session.h \
   libscp_tcp.c \
+  libscp_tcp.h \
+  libscp_types.h \
+  libscp_types_mng.h \
   libscp_v0.c \
+  libscp_v0.h \
   libscp_v1c.c \
-  libscp_v1s.c \
+  libscp_v1c.h \
   libscp_v1c_mng.c \
+  libscp_v1c_mng.h \
+  libscp_v1s.c \
+  libscp_v1s.h \
   libscp_v1s_mng.c \
-  libscp_vX.c
+  libscp_v1s_mng.h \
+  libscp_vX.c \
+  libscp_vX.h
 
 libscp_la_LIBADD = \
   $(top_builddir)/common/libcommon.la \
diff --git a/sesman/tools/Makefile.am b/sesman/tools/Makefile.am
index 066039b0..44bf068b 100644
--- a/sesman/tools/Makefile.am
+++ b/sesman/tools/Makefile.am
@@ -1,5 +1,3 @@
-EXTRA_DIST = tcp.h
-
 AM_CPPFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
   -DXRDP_SBIN_PATH=\"${sbindir}\" \
@@ -21,9 +19,10 @@ noinst_PROGRAMS = \
   xrdp-xcon
 
 xrdp_sesrun_SOURCES = \
+  config.c \
   sesrun.c \
   tcp.c \
-  config.c
+  tcp.h
 
 xrdp_sestest_SOURCES = \
   sestest.c