--------------------- PatchSet 2747 Date: 2001/08/13 09:26:48 Author: rbcollins Branch: squid-amake Tag: (none) Log: Manual merge of Makefile changes from HEAD Members: src/fs/Makefile.am:1.1.2.1->1.1.2.2 Index: squid/src/fs/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid/src/fs/Makefile.am,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/src/fs/Makefile.am 6 Apr 2001 12:40:29 -0000 1.1.2.1 +++ squid/src/fs/Makefile.am 13 Aug 2001 09:26:48 -0000 1.1.2.2 @@ -16,7 +16,8 @@ libaufs_a_SOURCES = aufs/aiops.c aufs/async_io.c aufs/store_asyncufs.h \ aufs/store_dir_aufs.c aufs/store_io_aufs.c -libcoss_a_SOURCES = coss/store_coss.h coss/store_io_coss.c coss/store_dir_coss.c +libcoss_a_SOURCES = coss/store_coss.h coss/store_io_coss.c coss/store_dir_coss.c \ + coss/async_io.c coss/async_io.h libdiskd_a_SOURCES = diskd/diskd.c diskd/store_dir_diskd.c diskd/store_diskd.h \ diskd/store_io_diskd.c libnull_a_SOURCES = null/store_null.c