Merge from trunk

[thirdparty/squid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index a3d0b38912c7cb9d68057a5efe29c0e3d9a22aac..1f6db6d1c83982bef8c9d2698e5948fd7b3e801f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -416,6 +416,7 @@ squid_SOURCES = \
        $(LEAKFINDERSOURCE) \
        SquidList.h \
        SquidList.cc \
+       LogTags.cc \
        LogTags.h \
        lookup_t.h \
        main.cc \
@@ -580,7 +581,6 @@ BUILT_SOURCES = \
        globals.cc \
        hier_code.cc \
        icp_opcode.cc \
-       LogTags.cc \
        lookup_t.cc \
        repl_modules.cc \
        swap_log_op.cc
@@ -902,9 +902,6 @@ err_type.cc: err_type.h mk-string-arrays.awk
 err_detail_type.cc: err_detail_type.h mk-string-arrays.awk
        $(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/err_detail_type.h | sed 's/ERR_DETAIL_//' > $@ || ($(RM) -f $@ && exit 1)
 
-LogTags.cc: LogTags.h mk-string-arrays.awk
-       $(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/LogTags.h | sed 's/LOG_//' > $@ || ($(RM) -f $@ && exit 1)
-
 lookup_t.cc: lookup_t.h mk-string-arrays.awk
        $(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/lookup_t.h > $@ || ($(RM) -f $@ && exit 1)
 
@@ -1447,6 +1444,7 @@ tests_testCacheManager_SOURCES = \
        int.cc \
        internal.h \
        internal.cc \
+       LogTags.cc \
        tests/stub_libsecurity.cc \
        SquidList.h \
        SquidList.cc \
@@ -1885,6 +1883,7 @@ tests_testEvent_SOURCES = \
        int.cc \
        internal.h \
        internal.cc \
+       LogTags.cc \
        tests/stub_libsecurity.cc \
        SquidList.h \
        SquidList.cc \
@@ -2130,6 +2129,7 @@ tests_testEventLoop_SOURCES = \
        int.cc \
        internal.h \
        internal.cc \
+       LogTags.cc \
        SquidList.h \
        SquidList.cc \
        MasterXaction.cc \
@@ -2370,6 +2370,7 @@ tests_test_http_range_SOURCES = \
        internal.cc \
        $(IPC_SOURCE) \
        ipcache.cc \
+       LogTags.cc \
        SquidList.h \
        SquidList.cc \
        MasterXaction.cc \
@@ -2666,6 +2667,7 @@ tests_testHttpRequest_SOURCES = \
        int.cc \
        internal.h \
        internal.cc \
+       LogTags.cc \
        tests/stub_libsecurity.cc \
        SquidList.h \
        SquidList.cc \
@@ -3485,6 +3487,7 @@ tests_testURL_SOURCES = \
        int.cc \
        internal.h \
        internal.cc \
+       LogTags.cc \
        SquidList.h \
        SquidList.cc \
        MasterXaction.cc \