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

libxrdp/Makefile.am

@@ -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)

sesman/chansrv/Makefile.am

@@ -1,5 +1,4 @@
 EXTRA_LIBS =
-EXTRA_FLAGS =
 
 AM_CPPFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
@@ -61,8 +60,7 @@ xrdp_chansrv_SOURCES = \
   xcommon.h
 
 xrdp_chansrv_LDFLAGS = \
-  $(X_LIBS) \
+  $(X_LIBS)
-  $(EXTRA_FLAGS)
 
 xrdp_chansrv_LDADD = \
   $(top_builddir)/common/libcommon.la \

xrdp/Makefile.am

@@ -1,5 +1,4 @@
 EXTRA_LIBS =
-EXTRA_FLAGS =
 
 AM_CPPFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
@@ -56,9 +55,6 @@ xrdp_LDADD = \
   $(top_builddir)/libxrdp/libxrdp.la \
   $(EXTRA_LIBS)
 
-xrdp_LDFLAGS = \
-  $(EXTRA_FLAGS)
-
 xrdpsysconfdir=$(sysconfdir)/xrdp
 
 dist_xrdpsysconf_DATA = \

xrdpapi/Makefile.am

@@ -1,5 +1,4 @@
 EXTRA_LIBS =
-EXTRA_FLAGS =
 
 module_LTLIBRARIES = \
   libxrdpapi.la
@@ -8,8 +7,5 @@ libxrdpapi_la_SOURCES = \
   xrdpapi.c \
   xrdpapi.h
 
-libxrdpapi_la_LDFLAGS = \
-  $(EXTRA_FLAGS)
-
 libxrdpapi_la_LIBADD = \
   $(EXTRA_LIBS)

xrdpvr/Makefile.am

@@ -1,5 +1,4 @@
 EXTRA_LIBS =
-EXTRA_FLAGS =
 
 module_LTLIBRARIES = \
   libxrdpvr.la
@@ -8,8 +7,5 @@ libxrdpvr_la_SOURCES = \
   xrdpvr.c \
   xrdpvr.h
 
-libxrdpvr_la_LDFLAGS = \
-  $(EXTRA_FLAGS)
-
 libxrdpvr_la_LIBADD = \
   $(EXTRA_LIBS)