Attachment #696513 for bug #779529




SUBDIRS = plugins 
CONFIG_CLEAN_FILES = *.rej *.orig
AM_CPPFLAGS = -D_GNU_SOURCE -fPIC -DPIC -I${top_srcdir} -I${top_srcdir}/lib -I${top_srcdir}/src -I${top_srcdir}/src/libev
LIBS = ${top_builddir}/lib/libaudit.la
LDADD = -lpthread

noinst_HEADERS = audispd-pconfig.h audispd-llist.h audispd-config.h \
	queue.h audispd-builtins.h libdisp.h
libdisp_la_SOURCES = audispd.c audispd-pconfig.c queue.c \
	audispd-llist.c audispd-builtins.c
libdisp_la_CFLAGS = -fno-strict-aliasing
libdisp_la_LDFLAGS = -no-undefined -static
noinst_LTLIBRARIES = libdisp.la

Lines 37-43 audisp_ids_SOURCES = account.c avl.c ids.c ids_config.c model_bad_event.c \ Link Here

(-)a/audisp/plugins/ids/Makefile.am (-1 / +1 lines)
37	model_behavior.c nvpair.c origin.c reactions.c session.c \	37	model_behavior.c nvpair.c origin.c reactions.c session.c \
38	timer-services.c	38	timer-services.c
39	audisp_ids_CFLAGS = -D_GNU_SOURCE	39	audisp_ids_CFLAGS = -D_GNU_SOURCE
40	audisp_ids_LDADD = -L${top_builddir}/lib -laudit -L${top_builddir}/auparse -lauparse -L${top_builddir}/common -laucommon -lpthread	40	audisp_ids_LDADD = ${top_builddir}/lib/libaudit.la ${top_builddir}/auparse/libauparse.la ${top_builddir}/common/libaucommon.la -lpthread
41		41
42	install-data-hook:	42	install-data-hook:
43	mkdir -p -m 0750 ${DESTDIR}${plugin_confdir}	43	mkdir -p -m 0750 ${DESTDIR}${plugin_confdir}

Lines 37-43 audisp_remote_DEPENDENCIES = ${top_builddir}/common/libaucommon.la Link Here

(-)a/audisp/plugins/remote/Makefile.am (-1 / +1 lines)
37	audisp_remote_SOURCES = audisp-remote.c remote-config.c queue.c	37	audisp_remote_SOURCES = audisp-remote.c remote-config.c queue.c
38	audisp_remote_CFLAGS = -fPIE -DPIE -g -D_REENTRANT -D_GNU_SOURCE -Wundef	38	audisp_remote_CFLAGS = -fPIE -DPIE -g -D_REENTRANT -D_GNU_SOURCE -Wundef
39	audisp_remote_LDFLAGS = -pie -Wl,-z,relro -Wl,-z,now	39	audisp_remote_LDFLAGS = -pie -Wl,-z,relro -Wl,-z,now
40	audisp_remote_LDADD = $(CAPNG_LDADD) $(gss_libs) -L${top_builddir}/common -laucommon	40	audisp_remote_LDADD = $(CAPNG_LDADD) $(gss_libs) ${top_builddir}/common/libaucommon.la
41		41
42	test_queue_SOURCES = queue.c test-queue.c	42	test_queue_SOURCES = queue.c test-queue.c
43		43

Lines 30-36 sbin_PROGRAMS = audisp-statsd Link Here

(-)a/audisp/plugins/statsd/Makefile.am (-1 / +1 lines)
30	man_MANS = audisp-statsd.8	30	man_MANS = audisp-statsd.8
31	audisp_statsd_SOURCES = audisp-statsd.c	31	audisp_statsd_SOURCES = audisp-statsd.c
32	audisp_statsd_CFLAGS = -g -D_GNU_SOURCE	32	audisp_statsd_CFLAGS = -g -D_GNU_SOURCE
33	audisp_statsd_LDADD = -L${top_builddir}/auparse -lauparse -L${top_builddir}/lib -laudit	33	audisp_statsd_LDADD = ${top_builddir}/auparse/libauparse.la ${top_builddir}/lib/libaudit.la
34		34
35	install-data-hook:	35	install-data-hook:
36	mkdir -p -m 0750 ${DESTDIR}${plugin_confdir}	36	mkdir -p -m 0750 ${DESTDIR}${plugin_confdir}

Lines 33-39 audisp_syslog_DEPENDENCIES = ${top_builddir}/common/libaucommon.la Link Here

(-)a/audisp/plugins/syslog/Makefile.am (-1 / +1 lines)
33	audisp_syslog_SOURCES = audisp-syslog.c	33	audisp_syslog_SOURCES = audisp-syslog.c
34	audisp_syslog_CFLAGS = -fPIE -DPIE -g -D_GNU_SOURCE -Wundef	34	audisp_syslog_CFLAGS = -fPIE -DPIE -g -D_GNU_SOURCE -Wundef
35	audisp_syslog_LDFLAGS = -pie -Wl,-z,relro -Wl,-z,now	35	audisp_syslog_LDFLAGS = -pie -Wl,-z,relro -Wl,-z,now
36	audisp_syslog_LDADD = $(CAPNG_LDADD) -L${top_builddir}/common -laucommon -L${top_builddir}/auparse -lauparse	36	audisp_syslog_LDADD = $(CAPNG_LDADD) ${top_builddir}/common/libaucommon.la ${top_builddir}/auparse/libauparse.la
37		37
38	install-data-hook:	38	install-data-hook:
39	mkdir -p -m 0750 ${DESTDIR}${plugin_confdir}	39	mkdir -p -m 0750 ${DESTDIR}${plugin_confdir}

Lines 24-30 Link Here

(-)a/audisp/plugins/zos-remote/Makefile.am (-1 / +1 lines)
24	AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/lib -I${top_srcdir}/auparse	24	AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/lib -I${top_srcdir}/auparse
25	CONFIG_CLEAN_FILES = .rej .orig	25	CONFIG_CLEAN_FILES = .rej .orig
26	EXTRA_DIST = zos-remote.conf audispd-zos-remote.conf	26	EXTRA_DIST = zos-remote.conf audispd-zos-remote.conf
27	LIBS = -L${top_builddir}/auparse -lauparse	27	LIBS = ${top_builddir}/auparse/libauparse.la
28	LDADD = -lpthread -lldap -llber $(CAPNG_LDADD)	28	LDADD = -lpthread -lldap -llber $(CAPNG_LDADD)
29	plugin_confdir=$(sysconfdir)/audit	29	plugin_confdir=$(sysconfdir)/audit
30	plugin_conf = zos-remote.conf	30	plugin_conf = zos-remote.conf




endif
auditd_CFLAGS = -fPIE -DPIE -g -D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pthread -Wno-pointer-sign
auditd_LDFLAGS = -pie -Wl,-z,relro -Wl,-z,now
auditd_LDADD = @LIBWRAP_LIBS@ ${top_builddir}/src/libev/libev.la ${top_builddir}/audisp/libdisp.la ${top_builddir}/lib/libaudit.la ${top_builddir}/auparse/libauparse.la -lpthread -lrt -lm $(gss_libs) ${top_builddir}/common/libaucommon.la
auditd_LDADD = @LIBWRAP_LIBS@ -Llibev -lev -L${top_builddir}/audisp -ldisp -L${top_builddir}/lib -laudit -L${top_builddir}/auparse -lauparse -lpthread -lrt -lm $(gss_libs) -L${top_builddir}/common -laucommon

auditctl_SOURCES = auditctl.c auditctl-llist.c delete_all.c auditctl-listing.c
auditctl_CFLAGS = -fPIE -DPIE -g -D_GNU_SOURCE
auditctl_LDFLAGS = -pie -Wl,-z,relro -Wl,-z,now
auditctl_LDADD = ${top_builddir}/lib/libaudit.la ${top_builddir}/auparse/libauparse.la ${top_builddir}/common/libaucommon.la

aureport_SOURCES = aureport.c auditd-config.c ausearch-llist.c aureport-options.c ausearch-string.c ausearch-parse.c aureport-scan.c aureport-output.c ausearch-lookup.c ausearch-int.c ausearch-time.c ausearch-nvpair.c ausearch-avc.c ausearch-lol.c
aureport_LDADD = ${top_builddir}/lib/libaudit.la ${top_builddir}/auparse/libauparse.la ${top_builddir}/common/libaucommon.la

ausearch_SOURCES = ausearch.c auditd-config.c ausearch-llist.c ausearch-options.c ausearch-report.c ausearch-match.c ausearch-string.c ausearch-parse.c ausearch-int.c ausearch-time.c ausearch-nvpair.c ausearch-lookup.c ausearch-avc.c ausearch-lol.c ausearch-checkpt.c
ausearch_LDADD = ${top_builddir}/lib/libaudit.la ${top_builddir}/auparse/libauparse.la ${top_builddir}/common/libaucommon.la

autrace_SOURCES = autrace.c delete_all.c auditctl-llist.c
autrace_LDADD = ${top_builddir}/lib/libaudit.la

libev/libev.a:
	make -C libev

Lines 24-29 EXTRA_DIST = README ev_epoll.c ev_poll.c ev_select.c ev_iouring.c ev_linuxaio.c Link Here

(-)a/src/libev/Makefile.am (-2 / +3 lines)
24	AM_CFLAGS = -fPIC -DPIC -g -fno-strict-aliasing ${DEBUG}	24	AM_CFLAGS = -fPIC -DPIC -g -fno-strict-aliasing ${DEBUG}
25		25
26	noinst_HEADERS = ev.h ev_vars.h ev_wrap.h event.h	26	noinst_HEADERS = ev.h ev_vars.h ev_wrap.h event.h
27	noinst_LIBRARIES = libev.a	27	noinst_LTLIBRARIES = libev.la
28		28
29	libev_a_SOURCES = ev.c event.c	29	libev_la_SOURCES = ev.c event.c
		30	libev_la_LDFLAGS = -no-undefined -static

Lines 23-29 Link Here

(-)a/tools/aulast/Makefile.am (-1 / +1 lines)
23	CONFIG_CLEAN_FILES = .loT .rej *.orig	23	CONFIG_CLEAN_FILES = .loT .rej *.orig
24	EXTRA_DIST = $(man_MANS)	24	EXTRA_DIST = $(man_MANS)
25	AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/lib -I${top_srcdir}/auparse	25	AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/lib -I${top_srcdir}/auparse
26	LIBS = -L${top_builddir}/auparse -lauparse	26	LIBS = ${top_builddir}/auparse/libauparse.la
27	AM_CFLAGS = -D_GNU_SOURCE	27	AM_CFLAGS = -D_GNU_SOURCE
28	bin_PROGRAMS = aulast	28	bin_PROGRAMS = aulast
29	noinst_HEADERS = aulast-llist.h	29	noinst_HEADERS = aulast-llist.h

Lines 23-29 Link Here

(-)a/tools/aulastlog/Makefile.am (-1 / +1 lines)
23	CONFIG_CLEAN_FILES = .loT .rej *.orig	23	CONFIG_CLEAN_FILES = .loT .rej *.orig
24	EXTRA_DIST = $(man_MANS)	24	EXTRA_DIST = $(man_MANS)
25	AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/auparse	25	AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/auparse
26	LIBS = -L${top_builddir}/auparse -lauparse	26	LIBS = ${top_builddir}/auparse/libauparse.la
27	AM_CFLAGS = -D_GNU_SOURCE	27	AM_CFLAGS = -D_GNU_SOURCE
28	bin_PROGRAMS = aulastlog	28	bin_PROGRAMS = aulastlog
29	noinst_HEADERS = aulastlog-llist.h	29	noinst_HEADERS = aulastlog-llist.h

Lines 23-29 Link Here

(-)a/tools/ausyscall/Makefile.am (-1 / +1 lines)
23	CONFIG_CLEAN_FILES = .loT .rej *.orig	23	CONFIG_CLEAN_FILES = .loT .rej *.orig
24	EXTRA_DIST = $(man_MANS)	24	EXTRA_DIST = $(man_MANS)
25	AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/lib	25	AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/lib
26	LIBS = -L${top_builddir}/lib -laudit	26	LIBS = ${top_builddir}/lib/libaudit.la
27	AM_CFLAGS = -D_GNU_SOURCE	27	AM_CFLAGS = -D_GNU_SOURCE
28	bin_PROGRAMS = ausyscall	28	bin_PROGRAMS = ausyscall
29	man_MANS = ausyscall.8	29	man_MANS = ausyscall.8

Lines 29-35 AM_CPPFLAGS = -I${top_srcdir} \ Link Here

(-)a/tools/auvirt/Makefile.am (-1 / +1 lines)
29	-I${top_srcdir}/lib \	29	-I${top_srcdir}/lib \
30	-I${top_srcdir}/auparse \	30	-I${top_srcdir}/auparse \
31	-I${top_srcdir}/src	31	-I${top_srcdir}/src
32	LIBS = -L${top_builddir}/auparse -lauparse	32	LIBS = ${top_builddir}/auparse/libauparse.la
33	AM_CFLAGS = -D_GNU_SOURCE	33	AM_CFLAGS = -D_GNU_SOURCE
34	bin_PROGRAMS = auvirt	34	bin_PROGRAMS = auvirt
35	noinst_HEADERS = auvirt-list.h	35	noinst_HEADERS = auvirt-list.h

Return to bug 779529

Lines 23-35 Link Here

(-)a/audisp/Makefile.am (-5 / +5 lines)
23	SUBDIRS = plugins	23	SUBDIRS = plugins
24	CONFIG_CLEAN_FILES = .rej .orig	24	CONFIG_CLEAN_FILES = .rej .orig
25	AM_CPPFLAGS = -D_GNU_SOURCE -fPIC -DPIC -I${top_srcdir} -I${top_srcdir}/lib -I${top_srcdir}/src -I${top_srcdir}/src/libev	25	AM_CPPFLAGS = -D_GNU_SOURCE -fPIC -DPIC -I${top_srcdir} -I${top_srcdir}/lib -I${top_srcdir}/src -I${top_srcdir}/src/libev
26	LIBS = -L${top_builddir}/lib -laudit	26	LIBS = ${top_builddir}/lib/libaudit.la
27	LDADD = -lpthread	27	LDADD = -lpthread
28		28
29	noinst_HEADERS = audispd-pconfig.h audispd-llist.h audispd-config.h \	29	noinst_HEADERS = audispd-pconfig.h audispd-llist.h audispd-config.h \
30	queue.h audispd-builtins.h libdisp.h	30	queue.h audispd-builtins.h libdisp.h
31	libdisp_a_SOURCES = audispd.c audispd-pconfig.c queue.c \	31	libdisp_la_SOURCES = audispd.c audispd-pconfig.c queue.c \
32	audispd-llist.c audispd-builtins.c	32	audispd-llist.c audispd-builtins.c
33	libdisp_a_CFLAGS = -fno-strict-aliasing	33	libdisp_la_CFLAGS = -fno-strict-aliasing
34	noinst_LIBRARIES = libdisp.a	34	libdisp_la_LDFLAGS = -no-undefined -static
35		35	noinst_LTLIBRARIES = libdisp.la

Lines 33-54 auditd_SOURCES += auditd-listen.c Link Here

(-)a/src/Makefile.am (-6 / +5 lines)
33	endif	33	endif
34	auditd_CFLAGS = -fPIE -DPIE -g -D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pthread -Wno-pointer-sign	34	auditd_CFLAGS = -fPIE -DPIE -g -D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pthread -Wno-pointer-sign
35	auditd_LDFLAGS = -pie -Wl,-z,relro -Wl,-z,now	35	auditd_LDFLAGS = -pie -Wl,-z,relro -Wl,-z,now
36	auditd_DEPENDENCIES = libev/libev.a ${top_builddir}/audisp/libdisp.a	36	auditd_LDADD = @LIBWRAP_LIBS@ ${top_builddir}/src/libev/libev.la ${top_builddir}/audisp/libdisp.la ${top_builddir}/lib/libaudit.la ${top_builddir}/auparse/libauparse.la -lpthread -lrt -lm $(gss_libs) ${top_builddir}/common/libaucommon.la
37	auditd_LDADD = @LIBWRAP_LIBS@ -Llibev -lev -L${top_builddir}/audisp -ldisp -L${top_builddir}/lib -laudit -L${top_builddir}/auparse -lauparse -lpthread -lrt -lm $(gss_libs) -L${top_builddir}/common -laucommon
38		37
39	auditctl_SOURCES = auditctl.c auditctl-llist.c delete_all.c auditctl-listing.c	38	auditctl_SOURCES = auditctl.c auditctl-llist.c delete_all.c auditctl-listing.c
40	auditctl_CFLAGS = -fPIE -DPIE -g -D_GNU_SOURCE	39	auditctl_CFLAGS = -fPIE -DPIE -g -D_GNU_SOURCE
41	auditctl_LDFLAGS = -pie -Wl,-z,relro -Wl,-z,now	40	auditctl_LDFLAGS = -pie -Wl,-z,relro -Wl,-z,now
42	auditctl_LDADD = -L${top_builddir}/lib -laudit -L${top_builddir}/auparse -lauparse -L${top_builddir}/common -laucommon	41	auditctl_LDADD = ${top_builddir}/lib/libaudit.la ${top_builddir}/auparse/libauparse.la ${top_builddir}/common/libaucommon.la
43		42
44	aureport_SOURCES = aureport.c auditd-config.c ausearch-llist.c aureport-options.c ausearch-string.c ausearch-parse.c aureport-scan.c aureport-output.c ausearch-lookup.c ausearch-int.c ausearch-time.c ausearch-nvpair.c ausearch-avc.c ausearch-lol.c	43	aureport_SOURCES = aureport.c auditd-config.c ausearch-llist.c aureport-options.c ausearch-string.c ausearch-parse.c aureport-scan.c aureport-output.c ausearch-lookup.c ausearch-int.c ausearch-time.c ausearch-nvpair.c ausearch-avc.c ausearch-lol.c
45	aureport_LDADD = -L${top_builddir}/lib -laudit -L${top_builddir}/auparse -lauparse -L${top_builddir}/common -laucommon	44	aureport_LDADD = ${top_builddir}/lib/libaudit.la ${top_builddir}/auparse/libauparse.la ${top_builddir}/common/libaucommon.la
46		45
47	ausearch_SOURCES = ausearch.c auditd-config.c ausearch-llist.c ausearch-options.c ausearch-report.c ausearch-match.c ausearch-string.c ausearch-parse.c ausearch-int.c ausearch-time.c ausearch-nvpair.c ausearch-lookup.c ausearch-avc.c ausearch-lol.c ausearch-checkpt.c	46	ausearch_SOURCES = ausearch.c auditd-config.c ausearch-llist.c ausearch-options.c ausearch-report.c ausearch-match.c ausearch-string.c ausearch-parse.c ausearch-int.c ausearch-time.c ausearch-nvpair.c ausearch-lookup.c ausearch-avc.c ausearch-lol.c ausearch-checkpt.c
48	ausearch_LDADD = -L${top_builddir}/lib -laudit -L${top_builddir}/auparse -lauparse -L${top_builddir}/common -laucommon	47	ausearch_LDADD = ${top_builddir}/lib/libaudit.la ${top_builddir}/auparse/libauparse.la ${top_builddir}/common/libaucommon.la
49		48
50	autrace_SOURCES = autrace.c delete_all.c auditctl-llist.c	49	autrace_SOURCES = autrace.c delete_all.c auditctl-llist.c
51	autrace_LDADD = -L${top_builddir}/lib -laudit	50	autrace_LDADD = ${top_builddir}/lib/libaudit.la
52		51
53	libev/libev.a:	52	libev/libev.a:
54	make -C libev	53	make -C libev