summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorItamar Reis Peixoto <itamar@ispbrasil.com.br>2016-12-18 11:56:07 -0200
committerGitHub <noreply@github.com>2016-12-18 11:56:07 -0200
commit2d8d786a9d518e2d8d1dc0d84ca06bc27461c86f (patch)
treedf30a6bc388c03fc003d7129262adba5bdf25019
parent0f6d1aabc21432feb147cf7fdfe6369460608a9f (diff)
parentc21b9a78f4725abcea637fc585c671496180ea3c (diff)
downloadxrdp-proprietary-2d8d786a9d518e2d8d1dc0d84ca06bc27461c86f.tar.gz
xrdp-proprietary-2d8d786a9d518e2d8d1dc0d84ca06bc27461c86f.zip
Merge pull request #562 from proski/makedist
Distribute all files except git and github specific data
-rw-r--r--Makefile.am21
-rw-r--r--genkeymap/Makefile.am4
-rw-r--r--instfiles/Makefile.am1
-rw-r--r--libxrdp/Makefile.am3
-rw-r--r--neutrinordp/Makefile.am1
-rw-r--r--sesman/Makefile.am3
-rw-r--r--sesman/chansrv/Makefile.am6
-rw-r--r--xrdp/Makefile.am5
-rw-r--r--xrdpapi/Makefile.am5
-rw-r--r--xrdpvr/Makefile.am3
10 files changed, 49 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 4b12bd57..52ea2e61 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,25 @@
ACLOCAL_AMFLAGS = -I m4
AM_DISTCHECK_CONFIGURE_FLAGS = --without-systemdsystemunitdir
-EXTRA_DIST = bootstrap COPYING coding_style.md design.txt faq-compile.txt \
- faq-general.txt file-loc.txt install.txt m4 readme.txt
+EXTRA_DIST = \
+ COPYING \
+ astyle_config.as \
+ bootstrap \
+ coding_style.md \
+ description-pak \
+ design.txt \
+ faq-compile.txt \
+ faq-general.txt \
+ file-loc.txt \
+ fontdump \
+ install.txt \
+ m4 \
+ postinstall-pak \
+ readme.txt \
+ tcutils \
+ tests \
+ vrplayer \
+ xorg
if XRDP_NEUTRINORDP
NEUTRINORDPDIR = neutrinordp
diff --git a/genkeymap/Makefile.am b/genkeymap/Makefile.am
index 25767395..8c295170 100644
--- a/genkeymap/Makefile.am
+++ b/genkeymap/Makefile.am
@@ -1,3 +1,7 @@
+EXTRA_DIST = \
+ dump-keymaps.sh \
+ readme.txt
+
AM_CFLAGS = $(X_CFLAGS)
bin_PROGRAMS = \
diff --git a/instfiles/Makefile.am b/instfiles/Makefile.am
index c44dde90..92cc9cf2 100644
--- a/instfiles/Makefile.am
+++ b/instfiles/Makefile.am
@@ -1,4 +1,5 @@
EXTRA_DIST = \
+ keymap-names.txt \
xrdp.sh \
xrdp-sesman.service \
xrdp.service
diff --git a/libxrdp/Makefile.am b/libxrdp/Makefile.am
index b7d1dc26..bd044d77 100644
--- a/libxrdp/Makefile.am
+++ b/libxrdp/Makefile.am
@@ -1,3 +1,6 @@
+EXTRA_DIST = \
+ xrdp_surface.c
+
AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \
diff --git a/neutrinordp/Makefile.am b/neutrinordp/Makefile.am
index d3adc756..fb5bf030 100644
--- a/neutrinordp/Makefile.am
+++ b/neutrinordp/Makefile.am
@@ -17,6 +17,7 @@ module_LTLIBRARIES = \
libxrdpneutrinordp_la_SOURCES = \
xrdp-color.c \
+ xrdp-color.h \
xrdp-neutrinordp.c \
xrdp-neutrinordp.h
diff --git a/sesman/Makefile.am b/sesman/Makefile.am
index 68dba28e..6b71e4bf 100644
--- a/sesman/Makefile.am
+++ b/sesman/Makefile.am
@@ -1,3 +1,6 @@
+EXTRA_DIST = \
+ Doxyfile
+
AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \
diff --git a/sesman/chansrv/Makefile.am b/sesman/chansrv/Makefile.am
index 221437e9..7a2672a8 100644
--- a/sesman/chansrv/Makefile.am
+++ b/sesman/chansrv/Makefile.am
@@ -1,3 +1,9 @@
+EXTRA_DIST = \
+ clipboard-notes.txt \
+ pcsc \
+ pulse \
+ wave-format-server.txt
+
AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \
diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am
index 0f2e6f65..df0b1558 100644
--- a/xrdp/Makefile.am
+++ b/xrdp/Makefile.am
@@ -1,3 +1,8 @@
+EXTRA_DIST = \
+ czech.txt \
+ rdp-scan-codes.txt \
+ xrdpwin.c
+
AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \
diff --git a/xrdpapi/Makefile.am b/xrdpapi/Makefile.am
index 920f3d1a..fefa03fc 100644
--- a/xrdpapi/Makefile.am
+++ b/xrdpapi/Makefile.am
@@ -1,3 +1,8 @@
+EXTRA_DIST = \
+ simple.c \
+ vrplayer.c \
+ vrplayer.mk
+
module_LTLIBRARIES = \
libxrdpapi.la
diff --git a/xrdpvr/Makefile.am b/xrdpvr/Makefile.am
index f9b8d421..8c907402 100644
--- a/xrdpvr/Makefile.am
+++ b/xrdpvr/Makefile.am
@@ -3,4 +3,5 @@ module_LTLIBRARIES = \
libxrdpvr_la_SOURCES = \
xrdpvr.c \
- xrdpvr.h
+ xrdpvr.h \
+ xrdpvr_internal.h