diff options
| author | Pavel Roskin <plroskin@gmail.com> | 2016-10-17 10:43:05 -0700 |
|---|---|---|
| committer | Pavel Roskin <plroskin@gmail.com> | 2016-10-20 10:43:02 -0700 |
| commit | 5c69f3cd57ac9052d4d69e13c751463775f58b6d (patch) | |
| tree | 8f743ff6b5934ca9472e9c0df8a212c094507c96 | |
| parent | 0422734fc77bdff2c65df14f27b0fd0400775b23 (diff) | |
| download | xrdp-proprietary-5c69f3cd57ac9052d4d69e13c751463775f58b6d.tar.gz xrdp-proprietary-5c69f3cd57ac9052d4d69e13c751463775f58b6d.zip | |
Eliminate EXTRA_FLAGS, it's a poor name, use AM_LDFLAGS
| -rw-r--r-- | libxrdp/Makefile.am | 8 | ||||
| -rw-r--r-- | sesman/chansrv/Makefile.am | 4 | ||||
| -rw-r--r-- | xrdp/Makefile.am | 4 | ||||
| -rw-r--r-- | xrdpapi/Makefile.am | 4 | ||||
| -rw-r--r-- | xrdpvr/Makefile.am | 4 |
5 files changed, 4 insertions, 20 deletions
diff --git a/libxrdp/Makefile.am b/libxrdp/Makefile.am index e9c63afb..2a37af4d 100644 --- a/libxrdp/Makefile.am +++ b/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) diff --git a/sesman/chansrv/Makefile.am b/sesman/chansrv/Makefile.am index 161c07fa..febb539a 100644 --- a/sesman/chansrv/Makefile.am +++ b/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) \ - $(EXTRA_FLAGS) + $(X_LIBS) xrdp_chansrv_LDADD = \ $(top_builddir)/common/libcommon.la \ diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am index 14b5049d..e2266a22 100644 --- a/xrdp/Makefile.am +++ b/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 = \ diff --git a/xrdpapi/Makefile.am b/xrdpapi/Makefile.am index 6d025e92..0027dc9b 100644 --- a/xrdpapi/Makefile.am +++ b/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) diff --git a/xrdpvr/Makefile.am b/xrdpvr/Makefile.am index cd0fde42..95644445 100644 --- a/xrdpvr/Makefile.am +++ b/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) |