From fd9fa6bcaa7d4465139988ff0dc1b9ef130aff5e Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Sat, 2 Nov 2019 10:51:46 -0600 Subject: [PATCH] Regenerate Makefile and sort MANIFEST --- MANIFEST | 4 ++-- logsrvd/Makefile.in | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/MANIFEST b/MANIFEST index eee807803..300d76bf3 100644 --- a/MANIFEST +++ b/MANIFEST @@ -252,11 +252,11 @@ lib/zlib/zutil.c lib/zlib/zutil.h log2cl.pl logsrvd/Makefile.in +logsrvd/eventlog.c +logsrvd/iolog_writer.c logsrvd/log_server.pb-c.c logsrvd/log_server.pb-c.h logsrvd/log_server.proto -logsrvd/eventlog.c -logsrvd/iolog_writer.c logsrvd/logsrv_util.c logsrvd/logsrv_util.h logsrvd/logsrvd.c diff --git a/logsrvd/Makefile.in b/logsrvd/Makefile.in index d0d4b5e4b..97e511ca6 100644 --- a/logsrvd/Makefile.in +++ b/logsrvd/Makefile.in @@ -231,17 +231,19 @@ eventlog.plog: eventlog.i rm -f $@; pvs-studio --cfg $(PVS_CFG) --sourcetree-root $(top_srcdir) --skip-cl-exe yes --source-file $(srcdir)/eventlog.c --i-file $< --output-file $@ iolog_writer.o: $(srcdir)/iolog_writer.c $(devdir)/log_server.pb-c.h \ $(incdir)/compat/stdbool.h $(incdir)/sudo_compat.h \ - $(incdir)/sudo_debug.h $(incdir)/sudo_iolog.h \ - $(incdir)/sudo_queue.h $(incdir)/sudo_util.h \ - $(srcdir)/logsrv_util.h $(srcdir)/logsrvd.h \ - $(srcdir)/protobuf-c/protobuf-c.h $(top_builddir)/config.h + $(incdir)/sudo_debug.h $(incdir)/sudo_gettext.h \ + $(incdir)/sudo_iolog.h $(incdir)/sudo_queue.h \ + $(incdir)/sudo_util.h $(srcdir)/logsrv_util.h \ + $(srcdir)/logsrvd.h $(srcdir)/protobuf-c/protobuf-c.h \ + $(top_builddir)/config.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(ASAN_CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(srcdir)/iolog_writer.c iolog_writer.i: $(srcdir)/iolog_writer.c $(devdir)/log_server.pb-c.h \ $(incdir)/compat/stdbool.h $(incdir)/sudo_compat.h \ - $(incdir)/sudo_debug.h $(incdir)/sudo_iolog.h \ - $(incdir)/sudo_queue.h $(incdir)/sudo_util.h \ - $(srcdir)/logsrv_util.h $(srcdir)/logsrvd.h \ - $(srcdir)/protobuf-c/protobuf-c.h $(top_builddir)/config.h + $(incdir)/sudo_debug.h $(incdir)/sudo_gettext.h \ + $(incdir)/sudo_iolog.h $(incdir)/sudo_queue.h \ + $(incdir)/sudo_util.h $(srcdir)/logsrv_util.h \ + $(srcdir)/logsrvd.h $(srcdir)/protobuf-c/protobuf-c.h \ + $(top_builddir)/config.h $(CC) -E -o $@ $(CPPFLAGS) $< iolog_writer.plog: iolog_writer.i rm -f $@; pvs-studio --cfg $(PVS_CFG) --sourcetree-root $(top_srcdir) --skip-cl-exe yes --source-file $(srcdir)/iolog_writer.c --i-file $< --output-file $@