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

Merge pull request #445 from proski/noextra

Browse Source 
Avoid using non-standard Automake variables starting with "EXTRA"
This commit is contained in:
Itamar Reis Peixoto 2016-10-21 16:55:55 -02:00 committed by GitHub
commit 8bf28e45c4
7 changed files with 82 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
libxrdp/Makefile.am
View File

@ -1,39 +1,35 @@
EXTRA_DEFINES =
EXTRA_INCLUDES =
EXTRA_LIBS =
EXTRA_FLAGS =
if XRDP_DEBUG
EXTRA_DEFINES += -DXRDP_DEBUG
else
EXTRA_DEFINES += -DXRDP_NODEBUG
endif
if XRDP_NEUTRINORDP
EXTRA_DEFINES += -DXRDP_NEUTRINORDP
EXTRA_LIBS += $(FREERDP_LIBS)
endif
if XRDP_TJPEG
EXTRA_DEFINES += -DXRDP_JPEG -DXRDP_TJPEG
EXTRA_INCLUDES += @TurboJpegIncDir@
EXTRA_FLAGS += @TurboJpegLibDir@
EXTRA_LIBS += -lturbojpeg
else
if XRDP_JPEG
EXTRA_DEFINES += -DXRDP_JPEG
EXTRA_LIBS += -ljpeg
endif
endif
AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
$(EXTRA_DEFINES) \
-I$(top_srcdir)/common \
$(EXTRA_INCLUDES)
-I$(top_srcdir)/common
AM_LDFLAGS =
LIBXRDP_EXTRA_LIBS =
if XRDP_DEBUG
AM_CPPFLAGS += -DXRDP_DEBUG
else
AM_CPPFLAGS += -DXRDP_NODEBUG
endif
if XRDP_NEUTRINORDP
AM_CPPFLAGS += -DXRDP_NEUTRINORDP
LIBXRDP_EXTRA_LIBS += $(FREERDP_LIBS)
endif
if XRDP_TJPEG
AM_CPPFLAGS += -DXRDP_JPEG -DXRDP_TJPEG @TurboJpegIncDir@
AM_LDFLAGS += @TurboJpegLibDir@
LIBXRDP_EXTRA_LIBS += -lturbojpeg
else
if XRDP_JPEG
AM_CPPFLAGS += -DXRDP_JPEG
LIBXRDP_EXTRA_LIBS += -ljpeg
endif
endif
module_LTLIBRARIES = \
libxrdp.la
@ -57,9 +53,6 @@ libxrdp_la_SOURCES = \
xrdp_rdp.c \
xrdp_sec.c
libxrdp_la_LDFLAGS = \
$(EXTRA_FLAGS)
libxrdp_la_LIBADD = \
$(top_builddir)/common/libcommon.la \
$(EXTRA_LIBS)
$(LIBXRDP_EXTRA_LIBS)

15
neutrinordp/Makefile.am
View File

@ -1,20 +1,17 @@
EXTRA_DEFINES =
if XRDP_DEBUG
EXTRA_DEFINES += -DXRDP_DEBUG
else
EXTRA_DEFINES += -DXRDP_NODEBUG
endif
AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
$(EXTRA_DEFINES) \
-I$(top_srcdir)/common \
$(FREERDP_CFLAGS)
if XRDP_DEBUG
AM_CPPFLAGS += -DXRDP_DEBUG
else
AM_CPPFLAGS += -DXRDP_NODEBUG
endif
module_LTLIBRARIES = \
libxrdpneutrinordp.la

15
rdp/Makefile.am
View File

@ -1,19 +1,16 @@
EXTRA_DEFINES =
if XRDP_DEBUG
EXTRA_DEFINES += -DXRDP_DEBUG
else
EXTRA_DEFINES += -DXRDP_NODEBUG
endif
AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
$(EXTRA_DEFINES) \
-I$(top_srcdir)/common
if XRDP_DEBUG
AM_CPPFLAGS += -DXRDP_DEBUG
else
AM_CPPFLAGS += -DXRDP_NODEBUG
endif
module_LTLIBRARIES = \
librdp.la

46
sesman/chansrv/Makefile.am
View File

@ -1,31 +1,26 @@
EXTRA_DEFINES =
EXTRA_INCLUDES =
EXTRA_LIBS =
EXTRA_FLAGS =
if XRDP_FUSE
EXTRA_DEFINES += -DXRDP_FUSE
EXTRA_LIBS += -lfuse
endif
if XRDP_OPUS
EXTRA_DEFINES += -DXRDP_OPUS
EXTRA_LIBS += -lopus
endif
if XRDP_MP3LAME
EXTRA_DEFINES += -DXRDP_MP3LAME
EXTRA_LIBS += -lmp3lame
endif
AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
$(EXTRA_DEFINES) \
-I$(top_srcdir)/common \
$(EXTRA_INCLUDES)
-I$(top_srcdir)/common
CHANSRV_EXTRA_LIBS =
if XRDP_FUSE
AM_CPPFLAGS += -DXRDP_FUSE
CHANSRV_EXTRA_LIBS += -lfuse
endif
if XRDP_OPUS
AM_CPPFLAGS += -DXRDP_OPUS
CHANSRV_EXTRA_LIBS += -lopus
endif
if XRDP_MP3LAME
AM_CPPFLAGS += -DXRDP_MP3LAME
CHANSRV_EXTRA_LIBS += -lmp3lame
endif
AM_CFLAGS = $(X_CFLAGS)
@ -65,10 +60,9 @@ xrdp_chansrv_SOURCES = \
xcommon.h
xrdp_chansrv_LDFLAGS = \
$(X_LIBS) \
$(EXTRA_FLAGS)
$(X_LIBS)
xrdp_chansrv_LDADD = \
$(top_builddir)/common/libcommon.la \
$(X_PRE_LIBS) -lXfixes -lXrandr -lX11 $(X_EXTRA_LIBS) \
$(EXTRA_LIBS)
$(CHANSRV_EXTRA_LIBS)

51
xrdp/Makefile.am
View File

@ -1,36 +1,32 @@
EXTRA_INCLUDES =
EXTRA_LIBS =
EXTRA_FLAGS =
if XRDP_DEBUG
EXTRA_DEFINES = -DXRDP_DEBUG
else
EXTRA_DEFINES = -DXRDP_NODEBUG
endif
if XRDP_RFXCODEC
EXTRA_DEFINES += -DXRDP_RFXCODEC
EXTRA_INCLUDES += -I$(top_srcdir)/librfxcodec/include
EXTRA_LIBS += $(top_srcdir)/librfxcodec/src/.libs/librfxencode.a
endif
if XRDP_PIXMAN
EXTRA_DEFINES += -DXRDP_PIXMAN
EXTRA_INCLUDES += $(XRDP_PIXMAN_CFLAGS)
EXTRA_LIBS += $(XRDP_PIXMAN_LIBS)
endif
AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
-DXRDP_MODULE_PATH=\"${moduledir}\" \
$(EXTRA_DEFINES) \
-I$(top_builddir) \
-I$(top_srcdir)/common \
-I$(top_srcdir)/libxrdp \
$(EXTRA_INCLUDES)
-I$(top_srcdir)/libxrdp
XRDP_EXTRA_LIBS =
if XRDP_DEBUG
AM_CPPFLAGS += -DXRDP_DEBUG
else
AM_CPPFLAGS += -DXRDP_NODEBUG
endif
if XRDP_RFXCODEC
AM_CPPFLAGS += -DXRDP_RFXCODEC
AM_CPPFLAGS += -I$(top_srcdir)/librfxcodec/include
XRDP_EXTRA_LIBS += $(top_srcdir)/librfxcodec/src/.libs/librfxencode.a
endif
if XRDP_PIXMAN
AM_CPPFLAGS += -DXRDP_PIXMAN
AM_CPPFLAGS += $(XRDP_PIXMAN_CFLAGS)
XRDP_EXTRA_LIBS += $(XRDP_PIXMAN_LIBS)
endif
sbin_PROGRAMS = \
xrdp
@ -57,10 +53,7 @@ xrdp_SOURCES = \
xrdp_LDADD = \
$(top_builddir)/common/libcommon.la \
$(top_builddir)/libxrdp/libxrdp.la \
$(EXTRA_LIBS)
xrdp_LDFLAGS = \
$(EXTRA_FLAGS)
$(XRDP_EXTRA_LIBS)
xrdpsysconfdir=$(sysconfdir)/xrdp

15
xrdpapi/Makefile.am
View File

@ -1,21 +1,6 @@
EXTRA_DEFINES =
EXTRA_INCLUDES =
EXTRA_LIBS =
EXTRA_FLAGS =
AM_CPPFLAGS = \
$(EXTRA_DEFINES) \
$(EXTRA_INCLUDES)
module_LTLIBRARIES = \
libxrdpapi.la
libxrdpapi_la_SOURCES = \
xrdpapi.c \
xrdpapi.h
libxrdpapi_la_LDFLAGS = \
$(EXTRA_FLAGS)
libxrdpapi_la_LIBADD = \
$(EXTRA_LIBS)

15
xrdpvr/Makefile.am
View File

@ -1,21 +1,6 @@
EXTRA_DEFINES =
EXTRA_INCLUDES =
EXTRA_LIBS =
EXTRA_FLAGS =
AM_CPPFLAGS = \
$(EXTRA_DEFINES) \
$(EXTRA_INCLUDES)
module_LTLIBRARIES = \
libxrdpvr.la
libxrdpvr_la_SOURCES = \
xrdpvr.c \
xrdpvr.h
libxrdpvr_la_LDFLAGS = \
$(EXTRA_FLAGS)
libxrdpvr_la_LIBADD = \
$(EXTRA_LIBS)