xrdp/neutrinordp/Makefile.am

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)

module_LTLIBRARIES = \
  libxrdpneutrinordp.la

libxrdpneutrinordp_la_SOURCES = \
  xrdp-color.c \
  xrdp-neutrinordp.c \
  xrdp-neutrinordp.h

libxrdpneutrinordp_la_LIBADD = \
  $(top_builddir)/common/libcommon.la \
  $(FREERDP_LIBS)
started adding neutrinordp module 2013-05-03 11:37:11 +04:00			`EXTRA_DEFINES =`

			`if XRDP_DEBUG`
			`EXTRA_DEFINES += -DXRDP_DEBUG`
			`else`
			`EXTRA_DEFINES += -DXRDP_NODEBUG`
			`endif`

Merge AM_CFLAGS and INCLUDES info AM_CPPFLAGS AM_CPPFLAGS is for flags passed to the preprocessor, such as defines and includes. AM_CFLAGS is for flags affecting the compiler, such as debug and optimization settings. INCLUDES is an obsolete name. Users can pass INCLUDES and break compilation. AM_CPPFLAGS is more explicit that the flags come from Automake and should not be overridden. 2016-01-30 09:45:00 +03:00			`AM_CPPFLAGS = \`
started adding neutrinordp module 2013-05-03 11:37:11 +04:00			`-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \`
			`-DXRDP_SBIN_PATH=\"${sbindir}\" \`
			`-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \`
			`-DXRDP_PID_PATH=\"${localstatedir}/run\" \`
Merge AM_CFLAGS and INCLUDES info AM_CPPFLAGS AM_CPPFLAGS is for flags passed to the preprocessor, such as defines and includes. AM_CFLAGS is for flags affecting the compiler, such as debug and optimization settings. INCLUDES is an obsolete name. Users can pass INCLUDES and break compilation. AM_CPPFLAGS is more explicit that the flags come from Automake and should not be overridden. 2016-01-30 09:45:00 +03:00			`$(EXTRA_DEFINES) \`
started adding neutrinordp module 2013-05-03 11:37:11 +04:00			`-I$(top_srcdir)/common \`
			`$(FREERDP_CFLAGS)`

Stop redefining libdir, use moduledir for ${libdir}/xrdp libdir is for shared and static libraries. Some xrdp libraries are loaded dynamically from a non-standard directory, so they are used like modules. Having separate libdir and moduledir would eventually allow to separate dynamically loaded modules from shared libraries. 2016-02-10 21:24:09 +03:00			`module_LTLIBRARIES = \`
started adding neutrinordp module 2013-05-03 11:37:11 +04:00			`libxrdpneutrinordp.la`

Move headers from EXTRA_DIST to sources, sort alphabetically There should be no functional difference. 2016-02-22 08:49:04 +03:00			`libxrdpneutrinordp_la_SOURCES = \`
			`xrdp-color.c \`
			`xrdp-neutrinordp.c \`
			`xrdp-neutrinordp.h`
started adding neutrinordp module 2013-05-03 11:37:11 +04:00
got neutrinordp module building 2013-05-03 13:07:02 +04:00			`libxrdpneutrinordp_la_LIBADD = \`
started adding neutrinordp module 2013-05-03 11:37:11 +04:00			`$(top_builddir)/common/libcommon.la \`
			`$(FREERDP_LIBS)`