From 0422734fc77bdff2c65df14f27b0fd0400775b23 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Mon, 17 Oct 2016 10:33:28 -0700 Subject: [PATCH 1/3] Merge EXTRA_DEFINES and EXTRA_INCLUDES into AM_CPPFLAGS AM_CPPFLAGS is a documented Automake variable for C preprocessor flags that should not be overridden when compiling the package. There is no need to have two additional variables that are ultimately merged into AM_CPPFLAGS. Their names are also confusing. EXTDA_DIST is a documented Automake variable. Everything else that starts with "EXTRA" is not. --- libxrdp/Makefile.am | 29 ++++++++++++----------------- neutrinordp/Makefile.am | 15 ++++++--------- rdp/Makefile.am | 15 ++++++--------- sesman/chansrv/Makefile.am | 24 ++++++++++-------------- xrdp/Makefile.am | 35 ++++++++++++++++------------------- xrdpapi/Makefile.am | 6 ------ xrdpvr/Makefile.am | 6 ------ 7 files changed, 50 insertions(+), 80 deletions(-) diff --git a/libxrdp/Makefile.am b/libxrdp/Makefile.am index d1c37fb0..e9c63afb 100644 --- a/libxrdp/Makefile.am +++ b/libxrdp/Makefile.am @@ -1,40 +1,35 @@ -EXTRA_DEFINES = -EXTRA_INCLUDES = EXTRA_LIBS = EXTRA_FLAGS = +AM_CPPFLAGS = \ + -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ + -DXRDP_SBIN_PATH=\"${sbindir}\" \ + -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \ + -DXRDP_PID_PATH=\"${localstatedir}/run\" \ + -I$(top_srcdir)/common + if XRDP_DEBUG -EXTRA_DEFINES += -DXRDP_DEBUG +AM_CPPFLAGS += -DXRDP_DEBUG else -EXTRA_DEFINES += -DXRDP_NODEBUG +AM_CPPFLAGS += -DXRDP_NODEBUG endif if XRDP_NEUTRINORDP -EXTRA_DEFINES += -DXRDP_NEUTRINORDP +AM_CPPFLAGS += -DXRDP_NEUTRINORDP EXTRA_LIBS += $(FREERDP_LIBS) endif if XRDP_TJPEG -EXTRA_DEFINES += -DXRDP_JPEG -DXRDP_TJPEG -EXTRA_INCLUDES += @TurboJpegIncDir@ +AM_CPPFLAGS += -DXRDP_JPEG -DXRDP_TJPEG @TurboJpegIncDir@ EXTRA_FLAGS += @TurboJpegLibDir@ EXTRA_LIBS += -lturbojpeg else if XRDP_JPEG -EXTRA_DEFINES += -DXRDP_JPEG +AM_CPPFLAGS += -DXRDP_JPEG EXTRA_LIBS += -ljpeg endif endif -AM_CPPFLAGS = \ - -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ - -DXRDP_SBIN_PATH=\"${sbindir}\" \ - -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \ - -DXRDP_PID_PATH=\"${localstatedir}/run\" \ - $(EXTRA_DEFINES) \ - -I$(top_srcdir)/common \ - $(EXTRA_INCLUDES) - module_LTLIBRARIES = \ libxrdp.la diff --git a/neutrinordp/Makefile.am b/neutrinordp/Makefile.am index 83504b28..d3adc756 100644 --- a/neutrinordp/Makefile.am +++ b/neutrinordp/Makefile.am @@ -1,20 +1,17 @@ -EXTRA_DEFINES = - -if XRDP_DEBUG -EXTRA_DEFINES += -DXRDP_DEBUG -else -EXTRA_DEFINES += -DXRDP_NODEBUG -endif - AM_CPPFLAGS = \ -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_SBIN_PATH=\"${sbindir}\" \ -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \ - $(EXTRA_DEFINES) \ -I$(top_srcdir)/common \ $(FREERDP_CFLAGS) +if XRDP_DEBUG +AM_CPPFLAGS += -DXRDP_DEBUG +else +AM_CPPFLAGS += -DXRDP_NODEBUG +endif + module_LTLIBRARIES = \ libxrdpneutrinordp.la diff --git a/rdp/Makefile.am b/rdp/Makefile.am index 5ae15786..30368156 100644 --- a/rdp/Makefile.am +++ b/rdp/Makefile.am @@ -1,19 +1,16 @@ -EXTRA_DEFINES = - -if XRDP_DEBUG -EXTRA_DEFINES += -DXRDP_DEBUG -else -EXTRA_DEFINES += -DXRDP_NODEBUG -endif - AM_CPPFLAGS = \ -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_SBIN_PATH=\"${sbindir}\" \ -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \ - $(EXTRA_DEFINES) \ -I$(top_srcdir)/common +if XRDP_DEBUG +AM_CPPFLAGS += -DXRDP_DEBUG +else +AM_CPPFLAGS += -DXRDP_NODEBUG +endif + module_LTLIBRARIES = \ librdp.la diff --git a/sesman/chansrv/Makefile.am b/sesman/chansrv/Makefile.am index c4cd1a3f..161c07fa 100644 --- a/sesman/chansrv/Makefile.am +++ b/sesman/chansrv/Makefile.am @@ -1,32 +1,28 @@ -EXTRA_DEFINES = -EXTRA_INCLUDES = EXTRA_LIBS = EXTRA_FLAGS = +AM_CPPFLAGS = \ + -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ + -DXRDP_SBIN_PATH=\"${sbindir}\" \ + -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \ + -DXRDP_PID_PATH=\"${localstatedir}/run\" \ + -I$(top_srcdir)/common + if XRDP_FUSE -EXTRA_DEFINES += -DXRDP_FUSE +AM_CPPFLAGS += -DXRDP_FUSE EXTRA_LIBS += -lfuse endif if XRDP_OPUS -EXTRA_DEFINES += -DXRDP_OPUS +AM_CPPFLAGS += -DXRDP_OPUS EXTRA_LIBS += -lopus endif if XRDP_MP3LAME -EXTRA_DEFINES += -DXRDP_MP3LAME +AM_CPPFLAGS += -DXRDP_MP3LAME EXTRA_LIBS += -lmp3lame endif -AM_CPPFLAGS = \ - -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ - -DXRDP_SBIN_PATH=\"${sbindir}\" \ - -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \ - -DXRDP_PID_PATH=\"${localstatedir}/run\" \ - $(EXTRA_DEFINES) \ - -I$(top_srcdir)/common \ - $(EXTRA_INCLUDES) - AM_CFLAGS = $(X_CFLAGS) sbin_PROGRAMS = \ diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am index 9c6d0f76..14b5049d 100644 --- a/xrdp/Makefile.am +++ b/xrdp/Makefile.am @@ -1,37 +1,34 @@ -EXTRA_INCLUDES = EXTRA_LIBS = EXTRA_FLAGS = +AM_CPPFLAGS = \ + -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ + -DXRDP_SBIN_PATH=\"${sbindir}\" \ + -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \ + -DXRDP_PID_PATH=\"${localstatedir}/run\" \ + -DXRDP_MODULE_PATH=\"${moduledir}\" \ + -I$(top_builddir) \ + -I$(top_srcdir)/common \ + -I$(top_srcdir)/libxrdp + if XRDP_DEBUG -EXTRA_DEFINES = -DXRDP_DEBUG +AM_CPPFLAGS += -DXRDP_DEBUG else -EXTRA_DEFINES = -DXRDP_NODEBUG +AM_CPPFLAGS += -DXRDP_NODEBUG endif if XRDP_RFXCODEC -EXTRA_DEFINES += -DXRDP_RFXCODEC -EXTRA_INCLUDES += -I$(top_srcdir)/librfxcodec/include +AM_CPPFLAGS += -DXRDP_RFXCODEC +AM_CPPFLAGS += -I$(top_srcdir)/librfxcodec/include EXTRA_LIBS += $(top_srcdir)/librfxcodec/src/.libs/librfxencode.a endif if XRDP_PIXMAN -EXTRA_DEFINES += -DXRDP_PIXMAN -EXTRA_INCLUDES += $(XRDP_PIXMAN_CFLAGS) +AM_CPPFLAGS += -DXRDP_PIXMAN +AM_CPPFLAGS += $(XRDP_PIXMAN_CFLAGS) EXTRA_LIBS += $(XRDP_PIXMAN_LIBS) endif -AM_CPPFLAGS = \ - -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ - -DXRDP_SBIN_PATH=\"${sbindir}\" \ - -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \ - -DXRDP_PID_PATH=\"${localstatedir}/run\" \ - -DXRDP_MODULE_PATH=\"${moduledir}\" \ - $(EXTRA_DEFINES) \ - -I$(top_builddir) \ - -I$(top_srcdir)/common \ - -I$(top_srcdir)/libxrdp \ - $(EXTRA_INCLUDES) - sbin_PROGRAMS = \ xrdp diff --git a/xrdpapi/Makefile.am b/xrdpapi/Makefile.am index 59f58b52..6d025e92 100644 --- a/xrdpapi/Makefile.am +++ b/xrdpapi/Makefile.am @@ -1,12 +1,6 @@ -EXTRA_DEFINES = -EXTRA_INCLUDES = EXTRA_LIBS = EXTRA_FLAGS = -AM_CPPFLAGS = \ - $(EXTRA_DEFINES) \ - $(EXTRA_INCLUDES) - module_LTLIBRARIES = \ libxrdpapi.la diff --git a/xrdpvr/Makefile.am b/xrdpvr/Makefile.am index dd7b5601..cd0fde42 100644 --- a/xrdpvr/Makefile.am +++ b/xrdpvr/Makefile.am @@ -1,12 +1,6 @@ -EXTRA_DEFINES = -EXTRA_INCLUDES = EXTRA_LIBS = EXTRA_FLAGS = -AM_CPPFLAGS = \ - $(EXTRA_DEFINES) \ - $(EXTRA_INCLUDES) - module_LTLIBRARIES = \ libxrdpvr.la From 5c69f3cd57ac9052d4d69e13c751463775f58b6d Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Mon, 17 Oct 2016 10:43:05 -0700 Subject: [PATCH 2/3] Eliminate EXTRA_FLAGS, it's a poor name, use AM_LDFLAGS --- libxrdp/Makefile.am | 8 +++----- sesman/chansrv/Makefile.am | 4 +--- xrdp/Makefile.am | 4 ---- xrdpapi/Makefile.am | 4 ---- 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) From a370306f75e72a38f37a0cc7ee1fae595d3c80bc Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Mon, 17 Oct 2016 11:09:50 -0700 Subject: [PATCH 3/3] Get rid of EXTRA_LIBS, use variables with more specific names --- libxrdp/Makefile.am | 12 ++++++------ sesman/chansrv/Makefile.am | 12 ++++++------ xrdp/Makefile.am | 10 +++++----- xrdpapi/Makefile.am | 5 ----- xrdpvr/Makefile.am | 5 ----- 5 files changed, 17 insertions(+), 27 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) diff --git a/sesman/chansrv/Makefile.am b/sesman/chansrv/Makefile.am index febb539a..2ecd67b4 100644 --- a/sesman/chansrv/Makefile.am +++ b/sesman/chansrv/Makefile.am @@ -1,5 +1,3 @@ -EXTRA_LIBS = - AM_CPPFLAGS = \ -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_SBIN_PATH=\"${sbindir}\" \ @@ -7,19 +5,21 @@ AM_CPPFLAGS = \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \ -I$(top_srcdir)/common +CHANSRV_EXTRA_LIBS = + if XRDP_FUSE AM_CPPFLAGS += -DXRDP_FUSE -EXTRA_LIBS += -lfuse +CHANSRV_EXTRA_LIBS += -lfuse endif if XRDP_OPUS AM_CPPFLAGS += -DXRDP_OPUS -EXTRA_LIBS += -lopus +CHANSRV_EXTRA_LIBS += -lopus endif if XRDP_MP3LAME AM_CPPFLAGS += -DXRDP_MP3LAME -EXTRA_LIBS += -lmp3lame +CHANSRV_EXTRA_LIBS += -lmp3lame endif AM_CFLAGS = $(X_CFLAGS) @@ -65,4 +65,4 @@ xrdp_chansrv_LDFLAGS = \ xrdp_chansrv_LDADD = \ $(top_builddir)/common/libcommon.la \ $(X_PRE_LIBS) -lXfixes -lXrandr -lX11 $(X_EXTRA_LIBS) \ - $(EXTRA_LIBS) + $(CHANSRV_EXTRA_LIBS) diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am index e2266a22..e24f22e2 100644 --- a/xrdp/Makefile.am +++ b/xrdp/Makefile.am @@ -1,5 +1,3 @@ -EXTRA_LIBS = - AM_CPPFLAGS = \ -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_SBIN_PATH=\"${sbindir}\" \ @@ -10,6 +8,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/common \ -I$(top_srcdir)/libxrdp +XRDP_EXTRA_LIBS = + if XRDP_DEBUG AM_CPPFLAGS += -DXRDP_DEBUG else @@ -19,13 +19,13 @@ endif if XRDP_RFXCODEC AM_CPPFLAGS += -DXRDP_RFXCODEC AM_CPPFLAGS += -I$(top_srcdir)/librfxcodec/include -EXTRA_LIBS += $(top_srcdir)/librfxcodec/src/.libs/librfxencode.a +XRDP_EXTRA_LIBS += $(top_srcdir)/librfxcodec/src/.libs/librfxencode.a endif if XRDP_PIXMAN AM_CPPFLAGS += -DXRDP_PIXMAN AM_CPPFLAGS += $(XRDP_PIXMAN_CFLAGS) -EXTRA_LIBS += $(XRDP_PIXMAN_LIBS) +XRDP_EXTRA_LIBS += $(XRDP_PIXMAN_LIBS) endif sbin_PROGRAMS = \ @@ -53,7 +53,7 @@ xrdp_SOURCES = \ xrdp_LDADD = \ $(top_builddir)/common/libcommon.la \ $(top_builddir)/libxrdp/libxrdp.la \ - $(EXTRA_LIBS) + $(XRDP_EXTRA_LIBS) xrdpsysconfdir=$(sysconfdir)/xrdp diff --git a/xrdpapi/Makefile.am b/xrdpapi/Makefile.am index 0027dc9b..920f3d1a 100644 --- a/xrdpapi/Makefile.am +++ b/xrdpapi/Makefile.am @@ -1,11 +1,6 @@ -EXTRA_LIBS = - module_LTLIBRARIES = \ libxrdpapi.la libxrdpapi_la_SOURCES = \ xrdpapi.c \ xrdpapi.h - -libxrdpapi_la_LIBADD = \ - $(EXTRA_LIBS) diff --git a/xrdpvr/Makefile.am b/xrdpvr/Makefile.am index 95644445..f9b8d421 100644 --- a/xrdpvr/Makefile.am +++ b/xrdpvr/Makefile.am @@ -1,11 +1,6 @@ -EXTRA_LIBS = - module_LTLIBRARIES = \ libxrdpvr.la libxrdpvr_la_SOURCES = \ xrdpvr.c \ xrdpvr.h - -libxrdpvr_la_LIBADD = \ - $(EXTRA_LIBS)