Get rid of EXTRA_LIBS, use variables with more specific names

This commit is contained in:
Pavel Roskin 2016-10-17 11:09:50 -07:00
parent 5c69f3cd57
commit a370306f75
5 changed files with 17 additions and 27 deletions

View File

@ -1,5 +1,3 @@
EXTRA_LIBS =
AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \
@ -9,6 +7,8 @@ AM_CPPFLAGS = \
AM_LDFLAGS =
LIBXRDP_EXTRA_LIBS =
if XRDP_DEBUG
AM_CPPFLAGS += -DXRDP_DEBUG
else
@ -17,17 +17,17 @@ endif
if XRDP_NEUTRINORDP
AM_CPPFLAGS += -DXRDP_NEUTRINORDP
EXTRA_LIBS += $(FREERDP_LIBS)
LIBXRDP_EXTRA_LIBS += $(FREERDP_LIBS)
endif
if XRDP_TJPEG
AM_CPPFLAGS += -DXRDP_JPEG -DXRDP_TJPEG @TurboJpegIncDir@
AM_LDFLAGS += @TurboJpegLibDir@
EXTRA_LIBS += -lturbojpeg
LIBXRDP_EXTRA_LIBS += -lturbojpeg
else
if XRDP_JPEG
AM_CPPFLAGS += -DXRDP_JPEG
EXTRA_LIBS += -ljpeg
LIBXRDP_EXTRA_LIBS += -ljpeg
endif
endif
@ -55,4 +55,4 @@ libxrdp_la_SOURCES = \
libxrdp_la_LIBADD = \
$(top_builddir)/common/libcommon.la \
$(EXTRA_LIBS)
$(LIBXRDP_EXTRA_LIBS)

View File

@ -1,5 +1,3 @@
EXTRA_LIBS =
AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \
@ -7,19 +5,21 @@ AM_CPPFLAGS = \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
-I$(top_srcdir)/common
CHANSRV_EXTRA_LIBS =
if XRDP_FUSE
AM_CPPFLAGS += -DXRDP_FUSE
EXTRA_LIBS += -lfuse
CHANSRV_EXTRA_LIBS += -lfuse
endif
if XRDP_OPUS
AM_CPPFLAGS += -DXRDP_OPUS
EXTRA_LIBS += -lopus
CHANSRV_EXTRA_LIBS += -lopus
endif
if XRDP_MP3LAME
AM_CPPFLAGS += -DXRDP_MP3LAME
EXTRA_LIBS += -lmp3lame
CHANSRV_EXTRA_LIBS += -lmp3lame
endif
AM_CFLAGS = $(X_CFLAGS)
@ -65,4 +65,4 @@ xrdp_chansrv_LDFLAGS = \
xrdp_chansrv_LDADD = \
$(top_builddir)/common/libcommon.la \
$(X_PRE_LIBS) -lXfixes -lXrandr -lX11 $(X_EXTRA_LIBS) \
$(EXTRA_LIBS)
$(CHANSRV_EXTRA_LIBS)

View File

@ -1,5 +1,3 @@
EXTRA_LIBS =
AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \
@ -10,6 +8,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/common \
-I$(top_srcdir)/libxrdp
XRDP_EXTRA_LIBS =
if XRDP_DEBUG
AM_CPPFLAGS += -DXRDP_DEBUG
else
@ -19,13 +19,13 @@ endif
if XRDP_RFXCODEC
AM_CPPFLAGS += -DXRDP_RFXCODEC
AM_CPPFLAGS += -I$(top_srcdir)/librfxcodec/include
EXTRA_LIBS += $(top_srcdir)/librfxcodec/src/.libs/librfxencode.a
XRDP_EXTRA_LIBS += $(top_srcdir)/librfxcodec/src/.libs/librfxencode.a
endif
if XRDP_PIXMAN
AM_CPPFLAGS += -DXRDP_PIXMAN
AM_CPPFLAGS += $(XRDP_PIXMAN_CFLAGS)
EXTRA_LIBS += $(XRDP_PIXMAN_LIBS)
XRDP_EXTRA_LIBS += $(XRDP_PIXMAN_LIBS)
endif
sbin_PROGRAMS = \
@ -53,7 +53,7 @@ xrdp_SOURCES = \
xrdp_LDADD = \
$(top_builddir)/common/libcommon.la \
$(top_builddir)/libxrdp/libxrdp.la \
$(EXTRA_LIBS)
$(XRDP_EXTRA_LIBS)
xrdpsysconfdir=$(sysconfdir)/xrdp

View File

@ -1,11 +1,6 @@
EXTRA_LIBS =
module_LTLIBRARIES = \
libxrdpapi.la
libxrdpapi_la_SOURCES = \
xrdpapi.c \
xrdpapi.h
libxrdpapi_la_LIBADD = \
$(EXTRA_LIBS)

View File

@ -1,11 +1,6 @@
EXTRA_LIBS =
module_LTLIBRARIES = \
libxrdpvr.la
libxrdpvr_la_SOURCES = \
xrdpvr.c \
xrdpvr.h
libxrdpvr_la_LIBADD = \
$(EXTRA_LIBS)