Source Format Enforcement (#532)

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

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 853408c7c777a60b0dd8f5c996d2fbe1cdbc7c93..b74f82cbf7b4b89e46d83bda7cc5b0e2b74bc20e 100644 (file)
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -1,6 +1,13 @@
+## Copyright (C) 1996-2020 The Squid Software Foundation and contributors
+##
+## Squid software is distributed under GPLv2+ license and includes
+## contributions from numerous individuals and organizations.
+## Please see the COPYING and CONTRIBUTORS files for details.
+##
+
 include $(top_srcdir)/src/Common.am
 
-EXTRA_LTLIBRARIES = libaufs.la libdiskd.la libcoss.la libufs.la librock.la
+EXTRA_LTLIBRARIES = libaufs.la libdiskd.la libufs.la librock.la
 noinst_LTLIBRARIES =  $(STORE_LIBS_TO_BUILD) libfs.la
 
 # aufs is a "fake" legacy store
@@ -11,28 +18,28 @@ libaufs_la_SOURCES = \
 libdiskd_la_SOURCES = \
        diskd/StoreFSdiskd.cc
 
-libcoss_la_SOURCES = \
-       coss/StoreFScoss.h \
-       coss/StoreFScoss.cc \
-       coss/store_coss.h \
-       coss/store_io_coss.cc \
-       coss/store_dir_coss.cc \
-       coss/CossSwapDir.h
-
 libufs_la_SOURCES = \
        ufs/StoreFSufs.h \
        ufs/StoreFSufs.cc \
-       ufs/store_dir_ufs.cc \
-       ufs/store_io_ufs.cc \
-       ufs/ufscommon.cci \
-       ufs/ufscommon.cc \
-       ufs/ufscommon.h 
+       ufs/UFSStoreState.cc \
+       ufs/UFSSwapDir.cc \
+       ufs/UFSSwapDir.h \
+       ufs/UFSStrategy.cc \
+       ufs/UFSStrategy.h \
+       ufs/UFSStoreState.h \
+       ufs/StoreSearchUFS.h \
+       ufs/StoreSearchUFS.cc \
+       ufs/UFSSwapLogParser.h \
+       ufs/UFSSwapLogParser.cc \
+       ufs/RebuildState.h \
+       ufs/RebuildState.cc
 
 librock_la_SOURCES = \
-       rock/RockCommon.cc \
-       rock/RockCommon.h \
-       rock/RockFile.cc \
-       rock/RockFile.h \
+       rock/forward.h \
+       rock/RockDbCell.cc \
+       rock/RockDbCell.h \
+       rock/RockHeaderUpdater.cc \
+       rock/RockHeaderUpdater.h \
        rock/RockIoState.cc \
        rock/RockIoState.h \
        rock/RockIoRequests.cc \
@@ -48,16 +55,11 @@ libfs_la_SOURCES = Module.cc Module.h
 libfs_la_LIBADD =  $(STORE_LIBS_TO_BUILD)
 libfs_la_DEPENDENCIES = $(STORE_LIBS_TO_BUILD)
 
-EXTRA_DIST = \
-       coss/coss-notes.txt
-
 ## we need our local files too (but avoid -I. at all costs)
-INCLUDES += -I$(srcdir)
+AM_CPPFLAGS += -I$(srcdir)
 
 
 ## targets below to emulate distributed makefiles
-coss/all: libcoss.la
-coss/clean: clean
 ufs/all: libufs.la
 ufs/clean: clean
 rock/all: librock.la
@@ -68,7 +70,7 @@ TESTS += testHeaders
 
 ## Special Universal .h dependency test script
 ## aborts if error encountered
-testHeaders: $(srcdir)/ufs/*.h $(srcdir)/coss/*.h $(srcdir)/rock/*.h
+testHeaders: $(srcdir)/ufs/*.h $(srcdir)/rock/*.h
        $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" $^ || exit 1
 ## diskd/ has no .h files
 ## aufs/ has no .h files