Eliminate EXTRA_FLAGS, it's a poor name, use AM_LDFLAGS

This commit is contained in:
Pavel Roskin
2016-10-17 10:43:05 -07:00
parent 0422734fc7
commit 5c69f3cd57
5 changed files with 4 additions and 20 deletions
+3 -5
View File
@@ -1,5 +1,4 @@
EXTRA_LIBS =
EXTRA_FLAGS =
AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
@@ -8,6 +7,8 @@ AM_CPPFLAGS = \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
-I$(top_srcdir)/common
AM_LDFLAGS =
if XRDP_DEBUG
AM_CPPFLAGS += -DXRDP_DEBUG
else
@@ -21,7 +22,7 @@ endif
if XRDP_TJPEG
AM_CPPFLAGS += -DXRDP_JPEG -DXRDP_TJPEG @TurboJpegIncDir@
EXTRA_FLAGS += @TurboJpegLibDir@
AM_LDFLAGS += @TurboJpegLibDir@
EXTRA_LIBS += -lturbojpeg
else
if XRDP_JPEG
@@ -52,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)