jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use "dist_" prefix to minimize use of EXTRA_DIST

Browse Source 
"dist" is ignored in presense of "noinst", so keep noinst_man_MANS.
This commit is contained in:
Pavel Roskin 2016-02-22 22:11:57 -08:00
parent f100036cd9
commit 7642675ddf
8 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/man/Makefile.am
View File

@ -1,4 +1,4 @@
man_MANS = \ dist_man_MANS = \
xrdp-dis.1 \ xrdp-dis.1 \
sesman.ini.5 \ sesman.ini.5 \
xrdp.ini.5 \ xrdp.ini.5 \
@ -14,4 +14,4 @@ man_MANS = \
noinst_man_MANS = \ noinst_man_MANS = \
xrdp-xcon.8 xrdp-xcon.8
EXTRA_DIST = $(man_MANS) $(noinst_man_MANS) EXTRA_DIST = $(noinst_man_MANS)

9
instfiles/Makefile.am
View File

@ -1,15 +1,14 @@
EXTRA_DIST = \ EXTRA_DIST = \
xrdp.sh \ xrdp.sh \
xrdp-sesman.service \ xrdp-sesman.service \
xrdp.service \ xrdp.service
$(startscript_DATA)
# #
# files for all platforms # files for all platforms
# #
startscriptdir=$(sysconfdir)/xrdp startscriptdir=$(sysconfdir)/xrdp
startscript_DATA = \ dist_startscript_DATA = \
km-0407.ini \ km-0407.ini \
km-0409.ini \ km-0409.ini \
km-040c.ini \ km-040c.ini \
@ -37,9 +36,9 @@ if LINUX
SUBDIRS += \ SUBDIRS += \
pam.d \ pam.d \
pulse pulse
startscript_DATA += xrdp.sh dist_startscript_DATA += xrdp.sh
if HAVE_SYSTEMD if HAVE_SYSTEMD
systemdsystemunit_DATA = \ dist_systemdsystemunit_DATA = \
xrdp-sesman.service \ xrdp-sesman.service \
xrdp.service xrdp.service
else else

5
instfiles/default/Makefile.am
View File

@ -1,3 +1,2 @@
EXTRA_DIST = xrdp startscriptdir = $(sysconfdir)/default
startscriptdir=$(sysconfdir)/default dist_startscript_DATA = xrdp
startscript_DATA = xrdp

6
instfiles/init.d/Makefile.am
View File

@ -1,4 +1,2 @@
EXTRA_DIST = xrdp startscriptdir = $(sysconfdir)/init.d
startscriptdir=$(sysconfdir)/init.d dist_startscript_DATA = xrdp
startscript_DATA = xrdp

5
instfiles/pulse/Makefile.am
View File

@ -1,3 +1,2 @@
EXTRA_DIST = default.pa pulsedir = $(sysconfdir)/xrdp/pulse
pulsedir=$(sysconfdir)/xrdp/pulse dist_pulse_DATA = default.pa
pulse_DATA = default.pa

6
instfiles/rc.d/Makefile.am
View File

@ -1,4 +1,2 @@
EXTRA_DIST = xrdp startscriptdir = $(sysconfdir)/rc.d
startscriptdir=$(sysconfdir)/rc.d dist_startscript_DATA = xrdp
startscript_DATA = xrdp

5
sesman/Makefile.am
View File

@ -1,6 +1,3 @@
EXTRA_DIST = sesman.ini startwm.sh
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \ -DXRDP_SBIN_PATH=\"${sbindir}\" \
@ -67,7 +64,7 @@ xrdp_sesman_LDADD = \
sesmansysconfdir=$(sysconfdir)/xrdp sesmansysconfdir=$(sysconfdir)/xrdp
sesmansysconf_DATA = \ dist_sesmansysconf_DATA = \
sesman.ini \ sesman.ini \
startwm.sh startwm.sh

6
xrdp/Makefile.am
View File

@ -1,5 +1,3 @@
EXTRA_DIST = $(xrdpsysconf_DATA) $(xrdppkgdata_DATA)
EXTRA_INCLUDES = EXTRA_INCLUDES =
EXTRA_LIBS = EXTRA_LIBS =
EXTRA_FLAGS = EXTRA_FLAGS =
@ -60,13 +58,13 @@ xrdp_LDFLAGS = \
xrdpsysconfdir=$(sysconfdir)/xrdp xrdpsysconfdir=$(sysconfdir)/xrdp
xrdpsysconf_DATA = \ dist_xrdpsysconf_DATA = \
xrdp.ini \ xrdp.ini \
xrdp_keyboard.ini xrdp_keyboard.ini
xrdppkgdatadir=$(datadir)/xrdp xrdppkgdatadir=$(datadir)/xrdp
xrdppkgdata_DATA = \ dist_xrdppkgdata_DATA = \
ad24b.bmp \ ad24b.bmp \
ad256.bmp \ ad256.bmp \
xrdp24b.bmp \ xrdp24b.bmp \