From eef6eea1b935a67f1ae26b38e06a69d4410a12aa Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Mon, 30 Jul 2007 12:27:58 +0200
Subject: [PATCH 1/1] Move checksumming files to seperate directory

Too many of them now, move them out-of-sight. They will rarely
be modified anyway.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---
 Makefile                 | 19 +++++++++++++------
 crc16.c => crc/crc16.c   |  0
 crc16.h => crc/crc16.h   |  0
 crc32.c => crc/crc32.c   |  0
 crc32.h => crc/crc32.h   |  0
 crc64.c => crc/crc64.c   |  0
 crc64.h => crc/crc64.h   |  0
 crc7.c => crc/crc7.c     |  0
 crc7.h => crc/crc7.h     |  0
 md5.c => crc/md5.c       |  0
 md5.h => crc/md5.h       |  0
 sha256.c => crc/sha256.c |  0
 sha256.h => crc/sha256.h |  0
 sha512.c => crc/sha512.c |  0
 sha512.h => crc/sha512.h |  0
 verify.c                 | 14 +++++++-------
 16 files changed, 20 insertions(+), 13 deletions(-)
 rename crc16.c => crc/crc16.c (100%)
 rename crc16.h => crc/crc16.h (100%)
 rename crc32.c => crc/crc32.c (100%)
 rename crc32.h => crc/crc32.h (100%)
 rename crc64.c => crc/crc64.c (100%)
 rename crc64.h => crc/crc64.h (100%)
 rename crc7.c => crc/crc7.c (100%)
 rename crc7.h => crc/crc7.h (100%)
 rename md5.c => crc/md5.c (100%)
 rename md5.h => crc/md5.h (100%)
 rename sha256.c => crc/sha256.c (100%)
 rename sha256.h => crc/sha256.h (100%)
 rename sha512.c => crc/sha512.c (100%)
 rename sha512.h => crc/sha512.h (100%)

diff --git a/Makefile b/Makefile
index 410cf7c6..e6baade7 100644
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,17 @@ OPTFLAGS= -O2 -g $(EXTFLAGS)
 CFLAGS	= -Wwrite-strings -Wall -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(DEBUGFLAGS) -rdynamic
 PROGS	= fio
 SCRIPTS = fio_generate_plots
-OBJS = gettime.o fio.o ioengines.o init.o stat.o log.o time.o md5.o crc32.o \
-	crc16.o crc7.o crc64.o sha256.o sha512.o filesetup.o eta.o verify.o \
-	memory.o io_u.o parse.o mutex.o options.o rbtree.o diskutil.o fifo.o \
-	blktrace.o
+OBJS = gettime.o fio.o ioengines.o init.o stat.o log.o time.o filesetup.o \
+	eta.o verify.o memory.o io_u.o parse.o mutex.o options.o rbtree.o \
+	diskutil.o fifo.o blktrace.o
+
+OBJS += crc/crc7.o
+OBJS += crc/crc16.o
+OBJS += crc/crc32.o
+OBJS += crc/crc64.o
+OBJS += crc/sha256.o
+OBJS += crc/sha512.o
+OBJS += crc/md5.o
 
 OBJS += engines/cpu.o
 OBJS += engines/libaio.o
@@ -32,10 +39,10 @@ fio: $(OBJS)
 	$(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(EXTLIBS) -lpthread -lm -ldl -laio -lrt
 
 clean:
-	-rm -f *.o .depend cscope.out $(PROGS) engines/*.o core.* core
+	-rm -f *.o .depend cscope.out $(PROGS) engines/*.o crc/*.o core.* core
 
 depend:
-	@$(CC) -MM $(ALL_CFLAGS) *.c engines/*.c 1> .depend
+	@$(CC) -MM $(ALL_CFLAGS) *.c engines/*.c crc/*.[ch] 1> .depend
 
 cscope:
 	@cscope -b
diff --git a/crc16.c b/crc/crc16.c
similarity index 100%
rename from crc16.c
rename to crc/crc16.c
diff --git a/crc16.h b/crc/crc16.h
similarity index 100%
rename from crc16.h
rename to crc/crc16.h
diff --git a/crc32.c b/crc/crc32.c
similarity index 100%
rename from crc32.c
rename to crc/crc32.c
diff --git a/crc32.h b/crc/crc32.h
similarity index 100%
rename from crc32.h
rename to crc/crc32.h
diff --git a/crc64.c b/crc/crc64.c
similarity index 100%
rename from crc64.c
rename to crc/crc64.c
diff --git a/crc64.h b/crc/crc64.h
similarity index 100%
rename from crc64.h
rename to crc/crc64.h
diff --git a/crc7.c b/crc/crc7.c
similarity index 100%
rename from crc7.c
rename to crc/crc7.c
diff --git a/crc7.h b/crc/crc7.h
similarity index 100%
rename from crc7.h
rename to crc/crc7.h
diff --git a/md5.c b/crc/md5.c
similarity index 100%
rename from md5.c
rename to crc/md5.c
diff --git a/md5.h b/crc/md5.h
similarity index 100%
rename from md5.h
rename to crc/md5.h
diff --git a/sha256.c b/crc/sha256.c
similarity index 100%
rename from sha256.c
rename to crc/sha256.c
diff --git a/sha256.h b/crc/sha256.h
similarity index 100%
rename from sha256.h
rename to crc/sha256.h
diff --git a/sha512.c b/crc/sha512.c
similarity index 100%
rename from sha512.c
rename to crc/sha512.c
diff --git a/sha512.h b/crc/sha512.h
similarity index 100%
rename from sha512.h
rename to crc/sha512.h
diff --git a/verify.c b/verify.c
index afc25ce8..a0e26c9f 100644
--- a/verify.c
+++ b/verify.c
@@ -8,13 +8,13 @@
 
 #include "fio.h"
 
-#include "md5.h"
-#include "crc64.h"
-#include "crc32.h"
-#include "crc16.h"
-#include "crc7.h"
-#include "sha256.h"
-#include "sha512.h"
+#include "crc/md5.h"
+#include "crc/crc64.h"
+#include "crc/crc32.h"
+#include "crc/crc16.h"
+#include "crc/crc7.h"
+#include "crc/sha256.h"
+#include "crc/sha512.h"
 
 static void fill_random_bytes(struct thread_data *td, void *p, unsigned int len)
 {
-- 
2.25.1