Source Format Enforcement (#1234)

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

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 858fd60140cc185e7af60851fb3cc19e223a545a..8f32da62a9264db76390bc29e7e10edfadc767dd 100644 (file)
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -1,62 +1,83 @@
-include $(top_srcdir)/src/Common.am
+## Copyright (C) 1996-2023 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.
+##
 
-EXTRA_LIBRARIES = libaufs.a libdiskd.a libcoss.a libufs.a
-noinst_LIBRARIES = @STORE_LIBS_TO_BUILD@
+include $(top_srcdir)/src/Common.am
 
-## TODO: add libfs -- file system framework; this library is always built
-## TODO: use libtool and add @STORE_LIBS_TO_BUILD@ to libfs.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
-libaufs_a_SOURCES = \
+libaufs_la_SOURCES = \
        aufs/StoreFSaufs.cc
 
 # diskd is a "fake" legacy store
-libdiskd_a_SOURCES = \
+libdiskd_la_SOURCES = \
        diskd/StoreFSdiskd.cc
 
-libcoss_a_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_a_SOURCES = \
-       ufs/StoreFSufs.h \
+libufs_la_SOURCES = \
+       ufs/RebuildState.cc \
+       ufs/RebuildState.h \
        ufs/StoreFSufs.cc \
-       ufs/store_dir_ufs.cc \
-       ufs/store_io_ufs.cc \
-       ufs/ufscommon.cci \
-       ufs/ufscommon.cc \
-       ufs/ufscommon.h 
+       ufs/StoreFSufs.h \
+       ufs/StoreSearchUFS.cc \
+       ufs/StoreSearchUFS.h \
+       ufs/UFSStoreState.cc \
+       ufs/UFSStoreState.h \
+       ufs/UFSStrategy.cc \
+       ufs/UFSStrategy.h \
+       ufs/UFSSwapDir.cc \
+       ufs/UFSSwapDir.h \
+       ufs/UFSSwapLogParser.cc \
+       ufs/UFSSwapLogParser.h
 
+librock_la_SOURCES = \
+       rock/RockDbCell.cc \
+       rock/RockDbCell.h \
+       rock/RockHeaderUpdater.cc \
+       rock/RockHeaderUpdater.h \
+       rock/RockIoRequests.cc \
+       rock/RockIoRequests.h \
+       rock/RockIoState.cc \
+       rock/RockIoState.h \
+       rock/RockRebuild.cc \
+       rock/RockRebuild.h \
+       rock/RockStoreFileSystem.cc \
+       rock/RockStoreFileSystem.h \
+       rock/RockSwapDir.cc \
+       rock/RockSwapDir.h \
+       rock/forward.h
 
-EXTRA_DIST = \
-       coss/coss-notes.txt
+libfs_la_SOURCES = \
+       Module.cc \
+       Module.h
+libfs_la_LIBADD =  $(STORE_LIBS_TO_BUILD)
+libfs_la_DEPENDENCIES = $(STORE_LIBS_TO_BUILD)
 
-# TODO: fix #include statements so that this is not needed
-INCLUDES += -I.
+## we need our local files too (but avoid -I. at all costs)
+AM_CPPFLAGS += -I$(srcdir)
 
 
-check_PROGRAMS += testHeaders
+## targets below to emulate distributed makefiles
+ufs/all: libufs.la
+ufs/clean: clean
+rock/all: librock.la
+rock/clean: clean
+
+
+TESTS += testHeaders
 
 ## Special Universal .h dependency test script
 ## aborts if error encountered
-testHeaders: $(top_srcdir)/src/fs/ufs/*.h $(top_srcdir)/src/fs/coss/*.h
-       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/src/fs/ufs" || exit 1
-       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/src/fs/coss" || exit 1
+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
 ## ./ has no .h files
 
-## No such file...
-testHeaders.c:
-       touch testHeaders.c
-CLEANFILES += testHeaders.c
+CLEANFILES += testHeaders
 
-## targets below to emulate distributed makefiles
-coss/all: libcoss.a
-coss/clean: clean
-ufs/all: libufs.a
-ufs/clean: clean
+.PHONY: testHeaders