xrdp/neutrinordp/Makefile.am

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 \
  $(FREERDP_CFLAGS)

if XRDP_DEBUG
AM_CPPFLAGS += -DXRDP_DEBUG
else
AM_CPPFLAGS += -DXRDP_NODEBUG
endif

module_LTLIBRARIES = \
  libxrdpneutrinordp.la

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

libxrdpneutrinordp_la_LIBADD = \
  $(top_builddir)/common/libcommon.la \
  $(FREERDP_LIBS)
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\" \`
			`-I$(top_srcdir)/common \`
			`$(FREERDP_CFLAGS)`

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. 2016-10-17 20:33:28 +03:00			`if XRDP_DEBUG`
			`AM_CPPFLAGS += -DXRDP_DEBUG`
			`else`
			`AM_CPPFLAGS += -DXRDP_NODEBUG`
			`endif`

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 \`
Distribute all files except git and github specific data It is better to distribute a few useless file than not to distribute needed files. 2016-12-18 09:43:30 +03:00			`xrdp-color.h \`
Move headers from EXTRA_DIST to sources, sort alphabetically There should be no functional difference. 2016-02-22 08:49:04 +03:00			`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)`