xrdp/rdp/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

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

module_LTLIBRARIES = \
  librdp.la

librdp_la_SOURCES = \
  rdp.c \
  rdp.h \
  rdp_bitmap.c \
  rdp_iso.c \
  rdp_lic.c \
  rdp_mcs.c \
  rdp_orders.c \
  rdp_rdp.c \
  rdp_sec.c \
  rdp_tcp.c

librdp_la_LIBADD = \
  $(top_builddir)/common/libcommon.la
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 14:45:00 +08:00			`AM_CPPFLAGS = \`
autotools fix and file_loc.h simplified 2009-05-19 12:23:49 +08:00			`-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \`
			`-DXRDP_SBIN_PATH=\"${sbindir}\" \`
			`-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \`
update/fix some debug log calls and add the test of XRDP_DEBUG to make files so controlled by the autoconf option --enable-xrdpdebug 2012-12-20 17:08:14 +08:00			`-DXRDP_PID_PATH=\"${localstatedir}/run\" \`
autotools 2008-08-03 15:48:32 +08:00			`-I$(top_srcdir)/common`

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-18 01:33:28 +08: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-11 02:24:09 +08:00			`module_LTLIBRARIES = \`
autotools 2008-08-03 15:48:32 +08:00			`librdp.la`

			`librdp_la_SOURCES = \`
			`rdp.c \`
Move headers from EXTRA_DIST to sources, sort alphabetically There should be no functional difference. 2016-02-22 13:49:04 +08:00			`rdp.h \`
autotools 2008-08-03 15:48:32 +08:00			`rdp_bitmap.c \`
			`rdp_iso.c \`
			`rdp_lic.c \`
			`rdp_mcs.c \`
			`rdp_orders.c \`
			`rdp_rdp.c \`
			`rdp_sec.c \`
			`rdp_tcp.c`

			`librdp_la_LIBADD = \`
autotools: change top_srcdir to top_builddir for LIBADD 2012-07-14 07:18:02 +08:00			`$(top_builddir)/common/libcommon.la`