Clean up Makefile.am

Change-Id: I573639255626da315293ca557b05f7ee6361b5d0

diff --git a/Makefile.am b/Makefile.am
index 9fbf278..f38ba57 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,5 @@
 AUTOMAKE_OPTIONS = subdir-objects foreign
 
-BUILT_SOURCES = include/dlog.h
-
 AM_CFLAGS = -I$(srcdir)/include \
        -DSD_DAEMON_DISABLE_MQ \
        -DDLOG_CONFIG_PATH=\"$(sysconfdir)/dlog.conf\" \
@@ -23,7 +21,7 @@ dlog_include_HEADERS = \
 
 lib_LTLIBRARIES = libdlog.la
 
-libdlog_la_SOURCES =  \
+libdlog_la_SOURCES = \
        src/libdlog/log.c \
        src/shared/backend_androidlogger.c \
        src/shared/logcommon.c \
@@ -69,14 +67,13 @@ libdlogutil_la_SOURCES = \
        src/shared/queued_entry.c \
        src/shared/queued_entry_timestamp.c \
        src/shared/translate_syslog.c \
-       src/shared/log_file.c \
        src/shared/ptrs_list.c \
        src/shared/logconfig.c \
        src/libdlogutil/logretrieve.c
 
 bin_PROGRAMS = dlogutil
 
-dlogutil_CFLAGS =  \
+dlogutil_CFLAGS = \
        $(AM_CFLAGS) \
        -fPIE
 
@@ -111,7 +108,7 @@ dlog_log_critical_SOURCES = src/log-critical/log-critical.cpp
 
 bin_PROGRAMS += dlog_logger
 
-dlog_logger_CFLAGS =  \
+dlog_logger_CFLAGS = \
        $(AM_CFLAGS) \
        -fPIE
 
@@ -161,10 +158,6 @@ dlogsend_LDADD = \
        libdlog.la
 
 dlogsend_SOURCES = \
-       src/shared/ptrs_list.c \
-       src/shared/queued_entry_timestamp.c \
-       src/shared/logcommon.c \
-       src/shared/hash.c \
        src/logsend/logsend.c
 
 
@@ -238,7 +231,6 @@ test_libdlog_LDADD = \
        libdlog.la
 
 test_libdlog_SOURCES = \
-       src/shared/hash.c \
        tests/test_libdlog.c
 
 usrlibexeclibdlog_PROGRAMS += test_filters
@@ -258,7 +250,6 @@ test_filters_LDADD = \
        libdlog.la
 
 test_filters_SOURCES = \
-       src/shared/hash.c \
        tests/test_filters.c
 
 usrlibexeclibdlog_PROGRAMS += perf_libdlog
@@ -277,7 +268,6 @@ perf_libdlog_LDADD = \
        libdlog.la
 
 perf_libdlog_SOURCES = \
-       src/shared/hash.c \
        tests/performance_test.c
 
 usrlibexeclibdlog_PROGRAMS += test_libdlogutil
@@ -370,11 +360,11 @@ src_tests_test_common_SOURCES = src/tests/test_common.c src/shared/logcommon.c s
 src_tests_test_common_CFLAGS = $(check_CFLAGS)
 src_tests_test_common_LDFLAGS = $(AM_LDFLAGS) -Wl,--wrap=sendmsg,--wrap=recvmsg,--wrap=writev,--wrap=read,--wrap=poll,--wrap=fcntl,--wrap=fcntl64,--wrap=malloc,--wrap=calloc,--wrap=connect,--wrap=socket,--wrap=open,--wrap=open64,--wrap=ioctl
 
-src_tests_test_common_neg_SOURCES = src/tests/test_common_neg.c src/shared/logcommon.c src/shared/logconfig.c src/shared/parsers.c src/shared/backend_androidlogger.c
+src_tests_test_common_neg_SOURCES = src/tests/test_common_neg.c src/shared/logcommon.c
 src_tests_test_common_neg_CFLAGS = $(check_CFLAGS)
 src_tests_test_common_neg_LDFLAGS = $(AM_LDFLAGS) -Wl,--wrap=sendmsg,--wrap=recvmsg,--wrap=writev,--wrap=read,--wrap=poll,--wrap=fcntl,--wrap=fcntl64,--wrap=malloc,--wrap=calloc,--wrap=connect,--wrap=socket,--wrap=open,--wrap=open64,--wrap=ioctl
 
-src_tests_test_common_pos_SOURCES = src/tests/test_common_pos.c src/shared/logcommon.c src/shared/logconfig.c src/shared/parsers.c src/shared/backend_androidlogger.c
+src_tests_test_common_pos_SOURCES = src/tests/test_common_pos.c src/shared/logcommon.c
 src_tests_test_common_pos_CFLAGS = $(check_CFLAGS)
 src_tests_test_common_pos_LDFLAGS = $(AM_LDFLAGS) -Wl,--wrap=sendmsg,--wrap=recvmsg,--wrap=writev,--wrap=read,--wrap=poll,--wrap=fcntl,--wrap=fcntl64,--wrap=malloc,--wrap=calloc,--wrap=connect,--wrap=socket,--wrap=open,--wrap=open64,--wrap=ioctl
 
@@ -434,23 +424,23 @@ src_tests_fdi_pipe_neg_SOURCES = src/tests/fdi_pipe_neg.c src/libdlogutil/fdi_pi
 src_tests_fdi_pipe_neg_CFLAGS = $(check_CFLAGS)
 src_tests_fdi_pipe_neg_LDFLAGS = $(AM_LDFLAGS) -Wl,--wrap=connect_sock,--wrap=close,--wrap=malloc,--wrap=free,--wrap=send_dlog_request,--wrap=recv_dlog_reply,--wrap=read,--wrap=recv_pipe
 
-src_tests_libdlog_pipe_SOURCES = src/tests/libdlog_pipe.c src/libdlog/log_pipe.c src/shared/logcommon.c src/shared/logconfig.c src/shared/queued_entry.c src/shared/translate_syslog.c src/shared/parsers.c src/shared/queued_entry_timestamp.c
+src_tests_libdlog_pipe_SOURCES = src/tests/libdlog_pipe.c src/libdlog/log_pipe.c src/shared/logcommon.c src/shared/logconfig.c src/shared/queued_entry.c src/shared/translate_syslog.c src/shared/parsers.c
 src_tests_libdlog_pipe_CFLAGS = $(check_CFLAGS) -pthread
 src_tests_libdlog_pipe_LDFLAGS = $(AM_LDFLAGS) -lpthread -Wl,--wrap=syslog_critical_failure,--wrap=connect,--wrap=write,--wrap=recv_pipe,--wrap=dup2,--wrap=socket,--wrap=close -lm
 
-src_tests_libdlog_android_pos_SOURCES = src/tests/libdlog_android_pos.c src/libdlog/log_android.c src/shared/logcommon.c src/shared/parsers.c
+src_tests_libdlog_android_pos_SOURCES = src/tests/libdlog_android_pos.c src/libdlog/log_android.c
 src_tests_libdlog_android_pos_CFLAGS = $(check_CFLAGS)
 src_tests_libdlog_android_pos_LDFLAGS = $(AM_LDFLAGS) -Wl,--wrap=logger_open_buffer_from_config,--wrap=close,--wrap=writev
 
-src_tests_libdlog_android_neg_SOURCES = src/tests/libdlog_android_neg.c src/libdlog/log_android.c src/shared/logcommon.c src/shared/parsers.c
+src_tests_libdlog_android_neg_SOURCES = src/tests/libdlog_android_neg.c src/libdlog/log_android.c
 src_tests_libdlog_android_neg_CFLAGS = $(check_CFLAGS)
 src_tests_libdlog_android_neg_LDFLAGS = $(AM_LDFLAGS) -Wl,--wrap=logger_open_buffer_from_config,--wrap=close,--wrap=writev
 
-src_tests_libdlog_android_monotonic_pos_SOURCES = src/tests/libdlog_android_pos.c src/libdlog/log_android.c src/shared/logcommon.c src/shared/parsers.c
+src_tests_libdlog_android_monotonic_pos_SOURCES = src/tests/libdlog_android_pos.c src/libdlog/log_android.c
 src_tests_libdlog_android_monotonic_pos_CFLAGS = $(check_CFLAGS) -DUSE_ANDROID_MONOTONIC
 src_tests_libdlog_android_monotonic_pos_LDFLAGS = $(AM_LDFLAGS) -Wl,--wrap=logger_open_buffer_from_config,--wrap=close,--wrap=writev,--wrap=clock_gettime
 
-src_tests_libdlog_android_monotonic_neg_SOURCES = src/tests/libdlog_android_neg.c src/libdlog/log_android.c src/shared/logcommon.c src/shared/parsers.c
+src_tests_libdlog_android_monotonic_neg_SOURCES = src/tests/libdlog_android_neg.c src/libdlog/log_android.c
 src_tests_libdlog_android_monotonic_neg_CFLAGS = $(check_CFLAGS) -DUSE_ANDROID_MONOTONIC
 src_tests_libdlog_android_monotonic_neg_LDFLAGS = $(AM_LDFLAGS) -Wl,--wrap=logger_open_buffer_from_config,--wrap=close,--wrap=writev,--wrap=clock_gettime
 
@@ -474,7 +464,7 @@ src_tests_queued_entry_pos_SOURCES = src/tests/queued_entry_pos.c src/shared/que
 src_tests_queued_entry_pos_CFLAGS = $(check_CFLAGS)
 src_tests_queued_entry_pos_LDFLAGS = $(AM_LDFLAGS)
 
-src_tests_queued_entry_neg_SOURCES = src/tests/queued_entry_neg.c src/shared/queued_entry.c src/shared/queued_entry_timestamp.c src/shared/parsers.c src/shared/translate_syslog.c src/shared/logconfig.c src/shared/logcommon.c
+src_tests_queued_entry_neg_SOURCES = src/tests/queued_entry_neg.c src/shared/queued_entry_timestamp.c src/shared/parsers.c src/shared/logconfig.c src/shared/logcommon.c
 # The libdlogutil build flag is needed, because otherwise some internal functions assert
 # instead of returning TIZEN_ERROR_INVALID_PARAMETER
 src_tests_queued_entry_neg_CFLAGS = $(check_CFLAGS) -DLIBDLOGUTIL_BUILD
@@ -484,7 +474,7 @@ src_tests_queued_entry_monotonic_pos_SOURCES = src/tests/queued_entry_pos.c src/
 src_tests_queued_entry_monotonic_pos_CFLAGS = $(check_CFLAGS) -DUSE_ANDROID_MONOTONIC
 src_tests_queued_entry_monotonic_pos_LDFLAGS = $(AM_LDFLAGS)
 
-src_tests_logctl_SOURCES = src/tests/logctl.c src/logctl/logctl.c src/shared/parsers.c src/shared/logconfig.c src/shared/hash.c src/shared/loglimiter.c src/shared/logcommon.c src/shared/ptrs_list.c
+src_tests_logctl_SOURCES = src/tests/logctl.c src/logctl/logctl.c src/shared/logcommon.c
 src_tests_logctl_CFLAGS = $(check_CFLAGS)
 src_tests_logctl_LDFLAGS = $(AM_LDFLAGS) -Wl,--wrap=calloc,--wrap=asprintf,--wrap=open,--wrap=open64,--wrap=fdopen,--wrap=fdopen64,--wrap=mkstemp,--wrap=mkstemp64,--wrap=fchmod,--wrap=rename
 
@@ -510,7 +500,6 @@ src_tests_logutil_pos_SOURCES = src/tests/logutil_pos.c \
        src/libdlogutil/fd_info.c \
        src/libdlogutil/fdi_pipe.c \
        src/libdlogutil/fdi_logger.c \
-       src/libdlogutil/lib.c \
        src/shared/backend_androidlogger.c \
        src/shared/logcommon.c \
        src/shared/logprint.c \
@@ -518,7 +507,6 @@ src_tests_logutil_pos_SOURCES = src/tests/logutil_pos.c \
        src/shared/queued_entry.c \
        src/shared/queued_entry_timestamp.c \
        src/shared/translate_syslog.c \
-       src/shared/log_file.c \
        src/shared/ptrs_list.c \
        src/shared/logconfig.c \
        src/libdlogutil/logretrieve.c
@@ -530,7 +518,6 @@ src_tests_logutil_neg_SOURCES = src/tests/logutil_neg.c \
        src/libdlogutil/fd_info.c \
        src/libdlogutil/fdi_pipe.c \
        src/libdlogutil/fdi_logger.c \
-       src/libdlogutil/lib.c \
        src/shared/backend_androidlogger.c \
        src/shared/logcommon.c \
        src/shared/logprint.c \
@@ -538,7 +525,6 @@ src_tests_logutil_neg_SOURCES = src/tests/logutil_neg.c \
        src/shared/queued_entry.c \
        src/shared/queued_entry_timestamp.c \
        src/shared/translate_syslog.c \
-       src/shared/log_file.c \
        src/shared/ptrs_list.c \
        src/shared/logconfig.c \
        src/libdlogutil/logretrieve.c
@@ -546,40 +532,31 @@ src_tests_logutil_neg_CFLAGS = $(check_CFLAGS)
 src_tests_logutil_neg_LDFLAGS = $(AM_LDFLAGS) -lcap -Wl,--wrap=clock_gettime,--wrap=log_should_print_line,--wrap=fdi_push_log
 
 src_tests_kmsg_parser_pos_SOURCES = src/tests/kmsg_parser_pos.c \
-       src/shared/logcommon.c \
        src/shared/queued_entry.c \
        src/shared/queued_entry_timestamp.c \
-       src/shared/ptrs_list.c \
        src/shared/parsers.c \
        src/shared/translate_syslog.c
 src_tests_kmsg_parser_pos_CFLAGS = $(check_CFLAGS)
 src_tests_kmsg_parser_pos_LDFLAGS = $(AM_LDFLAGS)
 
 src_tests_kmsg_parser_neg_SOURCES = src/tests/kmsg_parser_neg.c \
-       src/shared/logcommon.c \
        src/shared/queued_entry.c \
        src/shared/queued_entry_timestamp.c \
-       src/shared/ptrs_list.c \
        src/shared/parsers.c \
        src/shared/translate_syslog.c
 src_tests_kmsg_parser_neg_CFLAGS = $(check_CFLAGS)
 src_tests_kmsg_parser_neg_LDFLAGS = $(AM_LDFLAGS)
 
 src_tests_syslog_parser_pos_SOURCES = src/tests/syslog_parser_pos.c \
-       src/shared/logcommon.c \
        src/shared/queued_entry.c \
        src/shared/queued_entry_timestamp.c \
-       src/shared/ptrs_list.c \
        src/shared/parsers.c \
        src/shared/translate_syslog.c
 src_tests_syslog_parser_pos_CFLAGS = $(check_CFLAGS)
 src_tests_syslog_parser_pos_LDFLAGS = $(AM_LDFLAGS)
 
 src_tests_syslog_parser_neg_SOURCES = src/tests/syslog_parser_neg.c \
-       src/shared/logcommon.c \
        src/shared/queued_entry.c \
-       src/shared/queued_entry_timestamp.c \
-       src/shared/ptrs_list.c \
        src/shared/parsers.c \
        src/shared/translate_syslog.c
 src_tests_syslog_parser_neg_CFLAGS = $(check_CFLAGS)