Skip to content

Commit

Permalink
Turn libaucommon into a libtool convenience library (#147)
Browse files Browse the repository at this point in the history
This makes sure that the functions compiled into libaucommon
(audit_strsplit_r,...) end up in the libaudit/libauparse static library

Fixes: #146
  • Loading branch information
bigon committed Jan 5, 2021
1 parent 52ef6f1 commit dcbc6c7
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion audisp/plugins/remote/Makefile.am
Expand Up @@ -33,7 +33,7 @@ man_MANS = audisp-remote.8 audisp-remote.conf.5
check_PROGRAMS = test-queue
TESTS = $(check_PROGRAMS)

audisp_remote_DEPENDENCIES = ${top_builddir}/common/libaucommon.a
audisp_remote_DEPENDENCIES = ${top_builddir}/common/libaucommon.la
audisp_remote_SOURCES = audisp-remote.c remote-config.c queue.c
audisp_remote_CFLAGS = -fPIE -DPIE -g -D_REENTRANT -D_GNU_SOURCE -Wundef
audisp_remote_LDFLAGS = -pie -Wl,-z,relro -Wl,-z,now
Expand Down
2 changes: 1 addition & 1 deletion audisp/plugins/syslog/Makefile.am
Expand Up @@ -29,7 +29,7 @@ plugin_conf = syslog.conf
sbin_PROGRAMS = audisp-syslog
man_MANS = audisp-syslog.8

audisp_syslog_DEPENDENCIES = ${top_builddir}/common/libaucommon.a
audisp_syslog_DEPENDENCIES = ${top_builddir}/common/libaucommon.la
audisp_syslog_SOURCES = audisp-syslog.c
audisp_syslog_CFLAGS = -fPIE -DPIE -g -D_GNU_SOURCE -Wundef
audisp_syslog_LDFLAGS = -pie -Wl,-z,relro -Wl,-z,now
Expand Down
4 changes: 2 additions & 2 deletions auparse/Makefile.am
Expand Up @@ -45,8 +45,8 @@ libauparse_la_SOURCES = lru.c interpret.c nvlist.c ellist.c \
normalize_record_map.h normalize_syscall_map.h
nodist_libauparse_la_SOURCES = $(BUILT_SOURCES)

libauparse_la_LIBADD = ${top_builddir}/lib/libaudit.la ${top_builddir}/common/libaucommon.a
libauparse_la_DEPENDENCIES = $(libauparse_la_SOURCES) ${top_builddir}/config.h ${top_builddir}/common/libaucommon.a
libauparse_la_LIBADD = ${top_builddir}/lib/libaudit.la ${top_builddir}/common/libaucommon.la
libauparse_la_DEPENDENCIES = $(libauparse_la_SOURCES) ${top_builddir}/config.h ${top_builddir}/common/libaucommon.la
libauparse_la_LDFLAGS = -Wl,-z,relro

message.c:
Expand Down
6 changes: 3 additions & 3 deletions auparse/test/Makefile.am
Expand Up @@ -29,17 +29,17 @@ AM_CPPFLAGS = -I${top_srcdir}/auparse -I${top_srcdir}/lib

lookup_test_SOURCES = lookup_test.c
lookup_test_LDADD = ${top_builddir}/auparse/libauparse.la \
${top_builddir}/lib/libaudit.la ${top_builddir}/common/libaucommon.a
${top_builddir}/lib/libaudit.la ${top_builddir}/common/libaucommon.la

auparse_test_SOURCES = auparse_test.c
auparse_test_LDFLAGS = -static
auparse_test_LDADD = ${top_builddir}/auparse/libauparse.la \
${top_builddir}/lib/libaudit.la ${top_builddir}/common/libaucommon.a
${top_builddir}/lib/libaudit.la ${top_builddir}/common/libaucommon.la

auparselol_test_SOURCES = auparselol_test.c
auparselol_test_LDFLAGS = -static
auparselol_test_LDADD = ${top_builddir}/auparse/libauparse.la \
${top_builddir}/lib/libaudit.la ${top_builddir}/common/libaucommon.a
${top_builddir}/lib/libaudit.la ${top_builddir}/common/libaucommon.la

drop_srcdir = sed 's,$(srcdir)/test,test,'

Expand Down
6 changes: 3 additions & 3 deletions common/Makefile.am
Expand Up @@ -24,7 +24,7 @@ CONFIG_CLEAN_FILES = *.rej *.orig
AM_CPPFLAGS = -D_GNU_SOURCE -fPIC -DPIC -I${top_srcdir} -I${top_srcdir}/lib

noinst_HEADERS = common.h
libaucommon_a_DEPENDENCIES = ../config.h
libaucommon_a_SOURCES = audit-fgets.c strsplit.c
noinst_LIBRARIES = libaucommon.a
libaucommon_la_DEPENDENCIES = ../config.h
libaucommon_la_SOURCES = audit-fgets.c strsplit.c
noinst_LTLIBRARIES = libaucommon.la

4 changes: 2 additions & 2 deletions lib/Makefile.am
Expand Up @@ -38,8 +38,8 @@ include_HEADERS = libaudit.h
libaudit_la_SOURCES = libaudit.c message.c netlink.c \
lookup_table.c audit_logging.c deprecated.c \
dso.h private.h errormsg.h
libaudit_la_LIBADD = $(CAPNG_LDADD) ${top_builddir}/common/libaucommon.a
libaudit_la_DEPENDENCIES = $(libaudit_la_SOURCES) ../config.h ${top_builddir}/common/libaucommon.a
libaudit_la_LIBADD = $(CAPNG_LDADD) ${top_builddir}/common/libaucommon.la
libaudit_la_DEPENDENCIES = $(libaudit_la_SOURCES) ../config.h ${top_builddir}/common/libaucommon.la
libaudit_la_LDFLAGS = -Wl,-z,relro -version-info $(VERSION_INFO)
nodist_libaudit_la_SOURCES = $(BUILT_SOURCES)

Expand Down

0 comments on commit dcbc6c7

Please sign in to comment.