From bb5dbff74a135957f3774e0ee1175bf7cf06edce Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel@rtems.org>
Date: Fri, 26 May 2023 10:40:13 -0500
Subject: Move various compression libraries into single subdirectory

This improves the organization of the cpukit.

Closes #4912.
---
 spec/build/cpukit/librtemscpu.yml |  6 +++---
 spec/build/cpukit/libz.yml        | 30 +++++++++++++++---------------
 2 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'spec')

diff --git a/spec/build/cpukit/librtemscpu.yml b/spec/build/cpukit/librtemscpu.yml
index a0068b1e36..0a7d849c18 100644
--- a/spec/build/cpukit/librtemscpu.yml
+++ b/spec/build/cpukit/librtemscpu.yml
@@ -526,6 +526,9 @@ links:
 - role: build-dependency
   uid: vckey
 source:
+- cpukit/compression/xz/xz_crc32.c
+- cpukit/compression/xz/xz_dec_lzma2.c
+- cpukit/compression/xz/xz_dec_stream.c
 - cpukit/dev/flash/flashdev.c
 - cpukit/dev/i2c/eeprom.c
 - cpukit/dev/i2c/fpga-i2c-slave.c
@@ -974,9 +977,6 @@ source:
 - cpukit/libmisc/uuid/unpack.c
 - cpukit/libmisc/uuid/unparse.c
 - cpukit/libmisc/uuid/uuid_time.c
-- cpukit/libmisc/xz/xz_crc32.c
-- cpukit/libmisc/xz/xz_dec_lzma2.c
-- cpukit/libmisc/xz/xz_dec_stream.c
 - cpukit/libstdthreads/call_once.c
 - cpukit/libstdthreads/cnd.c
 - cpukit/libstdthreads/mtx.c
diff --git a/spec/build/cpukit/libz.yml b/spec/build/cpukit/libz.yml
index f241b2c1dc..5f1ea57a17 100644
--- a/spec/build/cpukit/libz.yml
+++ b/spec/build/cpukit/libz.yml
@@ -15,20 +15,20 @@ install:
 install-path: ${BSP_LIBDIR}
 links: []
 source:
-- cpukit/zlib/adler32.c
-- cpukit/zlib/compress.c
-- cpukit/zlib/crc32.c
-- cpukit/zlib/deflate.c
-- cpukit/zlib/gzclose.c
-- cpukit/zlib/gzlib.c
-- cpukit/zlib/gzread.c
-- cpukit/zlib/gzwrite.c
-- cpukit/zlib/infback.c
-- cpukit/zlib/inffast.c
-- cpukit/zlib/inflate.c
-- cpukit/zlib/inftrees.c
-- cpukit/zlib/trees.c
-- cpukit/zlib/uncompr.c
-- cpukit/zlib/zutil.c
+- cpukit/compression/zlib/adler32.c
+- cpukit/compression/zlib/compress.c
+- cpukit/compression/zlib/crc32.c
+- cpukit/compression/zlib/deflate.c
+- cpukit/compression/zlib/gzclose.c
+- cpukit/compression/zlib/gzlib.c
+- cpukit/compression/zlib/gzread.c
+- cpukit/compression/zlib/gzwrite.c
+- cpukit/compression/zlib/infback.c
+- cpukit/compression/zlib/inffast.c
+- cpukit/compression/zlib/inflate.c
+- cpukit/compression/zlib/inftrees.c
+- cpukit/compression/zlib/trees.c
+- cpukit/compression/zlib/uncompr.c
+- cpukit/compression/zlib/zutil.c
 target: z
 type: build
-- 
cgit v1.2.3