From a370306f75e72a38f37a0cc7ee1fae595d3c80bc Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Mon, 17 Oct 2016 11:09:50 -0700 Subject: Get rid of EXTRA_LIBS, use variables with more specific names --- libxrdp/Makefile.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libxrdp') diff --git a/libxrdp/Makefile.am b/libxrdp/Makefile.am index 2a37af4d..b7d1dc26 100644 --- a/libxrdp/Makefile.am +++ b/libxrdp/Makefile.am @@ -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) -- cgit v1.2.1