diff options
| author | Pavel Roskin <plroskin@gmail.com> | 2016-10-17 11:09:50 -0700 |
|---|---|---|
| committer | Pavel Roskin <plroskin@gmail.com> | 2016-10-20 10:43:02 -0700 |
| commit | a370306f75e72a38f37a0cc7ee1fae595d3c80bc (patch) | |
| tree | ed0a9eb35e6a1ac50add0b0589111637538b20e8 /libxrdp | |
| parent | 5c69f3cd57ac9052d4d69e13c751463775f58b6d (diff) | |
| download | xrdp-proprietary-a370306f75e72a38f37a0cc7ee1fae595d3c80bc.tar.gz xrdp-proprietary-a370306f75e72a38f37a0cc7ee1fae595d3c80bc.zip | |
Get rid of EXTRA_LIBS, use variables with more specific names
Diffstat (limited to 'libxrdp')
| -rw-r--r-- | libxrdp/Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
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) |