From a43eb98099f8bcaf69ab8ace8433ef883e009b70 Mon Sep 17 00:00:00 2001
From: Nathan Moinvaziri <nathan@solidstatenetworks.com>
Date: Tue, 27 Mar 2018 20:37:53 -0700
Subject: [PATCH] Remove src directory.

---
 CMakeLists.txt                         | 64 +++++++++++++-------------
 Minizip.podspec                        |  2 +-
 src/minizip.c => minizip.c             |  0
 src/mz.h => mz.h                       |  0
 src/mz_compat.c => mz_compat.c         |  0
 src/mz_compat.h => mz_compat.h         |  0
 src/mz_os.c => mz_os.c                 |  0
 src/mz_os.h => mz_os.h                 |  0
 src/mz_os_posix.c => mz_os_posix.c     |  0
 src/mz_os_posix.h => mz_os_posix.h     |  0
 src/mz_os_win32.c => mz_os_win32.c     |  0
 src/mz_os_win32.h => mz_os_win32.h     |  0
 src/mz_strm.c => mz_strm.c             |  0
 src/mz_strm.h => mz_strm.h             |  0
 src/mz_strm_aes.c => mz_strm_aes.c     |  0
 src/mz_strm_aes.h => mz_strm_aes.h     |  0
 src/mz_strm_buf.c => mz_strm_buf.c     |  0
 src/mz_strm_buf.h => mz_strm_buf.h     |  0
 src/mz_strm_bzip.c => mz_strm_bzip.c   |  0
 src/mz_strm_bzip.h => mz_strm_bzip.h   |  0
 src/mz_strm_crypt.c => mz_strm_crypt.c |  0
 src/mz_strm_crypt.h => mz_strm_crypt.h |  0
 src/mz_strm_lzma.c => mz_strm_lzma.c   |  0
 src/mz_strm_lzma.h => mz_strm_lzma.h   |  0
 src/mz_strm_mem.c => mz_strm_mem.c     |  0
 src/mz_strm_mem.h => mz_strm_mem.h     |  0
 src/mz_strm_posix.c => mz_strm_posix.c |  0
 src/mz_strm_posix.h => mz_strm_posix.h |  0
 src/mz_strm_split.c => mz_strm_split.c |  0
 src/mz_strm_split.h => mz_strm_split.h |  0
 src/mz_strm_win32.c => mz_strm_win32.c |  0
 src/mz_strm_win32.h => mz_strm_win32.h |  0
 src/mz_strm_zlib.c => mz_strm_zlib.c   |  0
 src/mz_strm_zlib.h => mz_strm_zlib.h   |  0
 src/mz_zip.c => mz_zip.c               |  0
 src/mz_zip.h => mz_zip.h               |  0
 36 files changed, 33 insertions(+), 33 deletions(-)
 rename src/minizip.c => minizip.c (100%)
 rename src/mz.h => mz.h (100%)
 rename src/mz_compat.c => mz_compat.c (100%)
 rename src/mz_compat.h => mz_compat.h (100%)
 rename src/mz_os.c => mz_os.c (100%)
 rename src/mz_os.h => mz_os.h (100%)
 rename src/mz_os_posix.c => mz_os_posix.c (100%)
 rename src/mz_os_posix.h => mz_os_posix.h (100%)
 rename src/mz_os_win32.c => mz_os_win32.c (100%)
 rename src/mz_os_win32.h => mz_os_win32.h (100%)
 rename src/mz_strm.c => mz_strm.c (100%)
 rename src/mz_strm.h => mz_strm.h (100%)
 rename src/mz_strm_aes.c => mz_strm_aes.c (100%)
 rename src/mz_strm_aes.h => mz_strm_aes.h (100%)
 rename src/mz_strm_buf.c => mz_strm_buf.c (100%)
 rename src/mz_strm_buf.h => mz_strm_buf.h (100%)
 rename src/mz_strm_bzip.c => mz_strm_bzip.c (100%)
 rename src/mz_strm_bzip.h => mz_strm_bzip.h (100%)
 rename src/mz_strm_crypt.c => mz_strm_crypt.c (100%)
 rename src/mz_strm_crypt.h => mz_strm_crypt.h (100%)
 rename src/mz_strm_lzma.c => mz_strm_lzma.c (100%)
 rename src/mz_strm_lzma.h => mz_strm_lzma.h (100%)
 rename src/mz_strm_mem.c => mz_strm_mem.c (100%)
 rename src/mz_strm_mem.h => mz_strm_mem.h (100%)
 rename src/mz_strm_posix.c => mz_strm_posix.c (100%)
 rename src/mz_strm_posix.h => mz_strm_posix.h (100%)
 rename src/mz_strm_split.c => mz_strm_split.c (100%)
 rename src/mz_strm_split.h => mz_strm_split.h (100%)
 rename src/mz_strm_win32.c => mz_strm_win32.c (100%)
 rename src/mz_strm_win32.h => mz_strm_win32.h (100%)
 rename src/mz_strm_zlib.c => mz_strm_zlib.c (100%)
 rename src/mz_strm_zlib.h => mz_strm_zlib.h (100%)
 rename src/mz_zip.c => mz_zip.c (100%)
 rename src/mz_zip.h => mz_zip.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e15cb4..1193673 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,31 +51,31 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/minizip.pc.cmakein ${MINIZIP_PC} @ONL
 set(PROJECT_NAME libminizip)
 
 set(MINIZIP_SRC
-    src/mz_os.c
-    src/mz_compat.c
-    src/mz_strm.c
-    src/mz_strm_buf.c
-    src/mz_strm_mem.c
-    src/mz_strm_posix.c
-    src/mz_strm_split.c
-    src/mz_strm_zlib.c
-    src/mz_zip.c)
+    mz_os.c
+    mz_compat.c
+    mz_strm.c
+    mz_strm_buf.c
+    mz_strm_mem.c
+    mz_strm_posix.c
+    mz_strm_split.c
+    mz_strm_zlib.c
+    mz_zip.c)
 
 set(MINIZIP_PUBLIC_HEADERS
-    src/mz.h
-    src/mz_os.h
-    src/mz_compat.h
-    src/mz_strm.h
-    src/mz_strm_buf.h
-    src/mz_strm_mem.h
-    src/mz_strm_posix.h
-    src/mz_strm_split.h
-    src/mz_strm_zlib.h
-    src/mz_zip.h)
+    mz.h
+    mz_os.h
+    mz_compat.h
+    mz_strm.h
+    mz_strm_buf.h
+    mz_strm_mem.h
+    mz_strm_posix.h
+    mz_strm_split.h
+    mz_strm_zlib.h
+    mz_zip.h)
 
 if(WIN32)
-    list(APPEND MINIZIP_SRC "src/mz_os_win32.c" "src/mz_strm_win32.c")
-    list(APPEND MINIZIP_PUBLIC_HEADERS "src/mz_os_win32.h" "src/mz_strm_win32.h")
+    list(APPEND MINIZIP_SRC "mz_os_win32.c" "mz_strm_win32.c")
+    list(APPEND MINIZIP_PUBLIC_HEADERS "mz_os_win32.h" "mz_strm_win32.h")
 
     add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
 endif()
@@ -87,8 +87,8 @@ endif()
 if(UNIX)
     add_compile_options(-O3)
 
-    list(APPEND MINIZIP_SRC "src/mz_os_posix.c")
-    list(APPEND MINIZIP_PUBLIC_HEADERS "src/mz_os_posix.h")
+    list(APPEND MINIZIP_SRC "mz_os_posix.c")
+    list(APPEND MINIZIP_PUBLIC_HEADERS "mz_os_posix.h")
 
     set(define_lfs_macros TRUE)
 
@@ -120,15 +120,15 @@ endif()
 if(USE_CRYPT)
     add_definitions(-DHAVE_CRYPT)
 
-    list(APPEND MINIZIP_SRC "src/mz_strm_crypt.c")
-    list(APPEND MINIZIP_PUBLIC_HEADERS "src/mz_strm_crypt.h")
+    list(APPEND MINIZIP_SRC "mz_strm_crypt.c")
+    list(APPEND MINIZIP_PUBLIC_HEADERS "mz_strm_crypt.h")
 endif()
 
 if(USE_AES)
     add_definitions(-DHAVE_AES)
 
-    list(APPEND MINIZIP_SRC "src/mz_strm_aes.c")
-    list(APPEND MINIZIP_PUBLIC_HEADERS "src/mz_strm_aes.h")
+    list(APPEND MINIZIP_SRC "mz_strm_aes.c")
+    list(APPEND MINIZIP_PUBLIC_HEADERS "mz_strm_aes.h")
 
     set(AES_SRC
         lib/aes/aescrypt.c
@@ -171,8 +171,8 @@ if(USE_BZIP2)
     add_definitions(-DHAVE_BZIP2)
     add_definitions(-DBZ_NO_STDIO)
 
-    list(APPEND MINIZIP_SRC "src/mz_strm_bzip.c")
-    list(APPEND MINIZIP_PUBLIC_HEADERS "src/mz_strm_bzip.h")
+    list(APPEND MINIZIP_SRC "mz_strm_bzip.c")
+    list(APPEND MINIZIP_PUBLIC_HEADERS "mz_strm_bzip.h")
 
     set(BZIP2_SRC
         lib/bzip2/blocksort.c
@@ -197,8 +197,8 @@ if(USE_LZMA)
     add_definitions(-DHAVE_CONFIG_H)
     add_definitions(-DLZMA_API_STATIC)
 
-    list(APPEND MINIZIP_SRC "src/mz_strm_lzma.c")
-    list(APPEND MINIZIP_PUBLIC_HEADERS "src/mz_strm_lzma.h")
+    list(APPEND MINIZIP_SRC "mz_strm_lzma.c")
+    list(APPEND MINIZIP_PUBLIC_HEADERS "mz_strm_lzma.h")
 
     set(LZMA_CHECK_SRC
         lib/liblzma/check/check.c
@@ -356,7 +356,7 @@ install(FILES ${MINIZIP_PUBLIC_HEADERS} DESTINATION "${INSTALL_INC_DIR}")
 install(FILES ${MINIZIP_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}")
 
 if(BUILD_TEST)
-    add_executable(minizip "src/minizip.c")
+    add_executable(minizip "minizip.c")
     target_link_libraries(minizip ${PROJECT_NAME})
 
     install(TARGETS minizip
diff --git a/Minizip.podspec b/Minizip.podspec
index e553339..e1758b5 100644
--- a/Minizip.podspec
+++ b/Minizip.podspec
@@ -17,7 +17,7 @@ DESC
   s.libraries = 'z'
 
   s.subspec 'Core' do |sp|
-    sp.source_files = 'src/{mz_os,mz_compat,mz_strm,mz_strm_mem,mz_strm_buf,mz_zip,mz_strm_crypt,mz_strm_posix,mz_strm_zlib}.{c,h}'
+    sp.source_files = '{mz_os,mz_compat,mz_strm,mz_strm_mem,mz_strm_buf,mz_zip,mz_strm_crypt,mz_strm_posix,mz_strm_zlib}.{c,h}'
   end
 
   s.subspec 'AES' do |sp|
diff --git a/src/minizip.c b/minizip.c
similarity index 100%
rename from src/minizip.c
rename to minizip.c
diff --git a/src/mz.h b/mz.h
similarity index 100%
rename from src/mz.h
rename to mz.h
diff --git a/src/mz_compat.c b/mz_compat.c
similarity index 100%
rename from src/mz_compat.c
rename to mz_compat.c
diff --git a/src/mz_compat.h b/mz_compat.h
similarity index 100%
rename from src/mz_compat.h
rename to mz_compat.h
diff --git a/src/mz_os.c b/mz_os.c
similarity index 100%
rename from src/mz_os.c
rename to mz_os.c
diff --git a/src/mz_os.h b/mz_os.h
similarity index 100%
rename from src/mz_os.h
rename to mz_os.h
diff --git a/src/mz_os_posix.c b/mz_os_posix.c
similarity index 100%
rename from src/mz_os_posix.c
rename to mz_os_posix.c
diff --git a/src/mz_os_posix.h b/mz_os_posix.h
similarity index 100%
rename from src/mz_os_posix.h
rename to mz_os_posix.h
diff --git a/src/mz_os_win32.c b/mz_os_win32.c
similarity index 100%
rename from src/mz_os_win32.c
rename to mz_os_win32.c
diff --git a/src/mz_os_win32.h b/mz_os_win32.h
similarity index 100%
rename from src/mz_os_win32.h
rename to mz_os_win32.h
diff --git a/src/mz_strm.c b/mz_strm.c
similarity index 100%
rename from src/mz_strm.c
rename to mz_strm.c
diff --git a/src/mz_strm.h b/mz_strm.h
similarity index 100%
rename from src/mz_strm.h
rename to mz_strm.h
diff --git a/src/mz_strm_aes.c b/mz_strm_aes.c
similarity index 100%
rename from src/mz_strm_aes.c
rename to mz_strm_aes.c
diff --git a/src/mz_strm_aes.h b/mz_strm_aes.h
similarity index 100%
rename from src/mz_strm_aes.h
rename to mz_strm_aes.h
diff --git a/src/mz_strm_buf.c b/mz_strm_buf.c
similarity index 100%
rename from src/mz_strm_buf.c
rename to mz_strm_buf.c
diff --git a/src/mz_strm_buf.h b/mz_strm_buf.h
similarity index 100%
rename from src/mz_strm_buf.h
rename to mz_strm_buf.h
diff --git a/src/mz_strm_bzip.c b/mz_strm_bzip.c
similarity index 100%
rename from src/mz_strm_bzip.c
rename to mz_strm_bzip.c
diff --git a/src/mz_strm_bzip.h b/mz_strm_bzip.h
similarity index 100%
rename from src/mz_strm_bzip.h
rename to mz_strm_bzip.h
diff --git a/src/mz_strm_crypt.c b/mz_strm_crypt.c
similarity index 100%
rename from src/mz_strm_crypt.c
rename to mz_strm_crypt.c
diff --git a/src/mz_strm_crypt.h b/mz_strm_crypt.h
similarity index 100%
rename from src/mz_strm_crypt.h
rename to mz_strm_crypt.h
diff --git a/src/mz_strm_lzma.c b/mz_strm_lzma.c
similarity index 100%
rename from src/mz_strm_lzma.c
rename to mz_strm_lzma.c
diff --git a/src/mz_strm_lzma.h b/mz_strm_lzma.h
similarity index 100%
rename from src/mz_strm_lzma.h
rename to mz_strm_lzma.h
diff --git a/src/mz_strm_mem.c b/mz_strm_mem.c
similarity index 100%
rename from src/mz_strm_mem.c
rename to mz_strm_mem.c
diff --git a/src/mz_strm_mem.h b/mz_strm_mem.h
similarity index 100%
rename from src/mz_strm_mem.h
rename to mz_strm_mem.h
diff --git a/src/mz_strm_posix.c b/mz_strm_posix.c
similarity index 100%
rename from src/mz_strm_posix.c
rename to mz_strm_posix.c
diff --git a/src/mz_strm_posix.h b/mz_strm_posix.h
similarity index 100%
rename from src/mz_strm_posix.h
rename to mz_strm_posix.h
diff --git a/src/mz_strm_split.c b/mz_strm_split.c
similarity index 100%
rename from src/mz_strm_split.c
rename to mz_strm_split.c
diff --git a/src/mz_strm_split.h b/mz_strm_split.h
similarity index 100%
rename from src/mz_strm_split.h
rename to mz_strm_split.h
diff --git a/src/mz_strm_win32.c b/mz_strm_win32.c
similarity index 100%
rename from src/mz_strm_win32.c
rename to mz_strm_win32.c
diff --git a/src/mz_strm_win32.h b/mz_strm_win32.h
similarity index 100%
rename from src/mz_strm_win32.h
rename to mz_strm_win32.h
diff --git a/src/mz_strm_zlib.c b/mz_strm_zlib.c
similarity index 100%
rename from src/mz_strm_zlib.c
rename to mz_strm_zlib.c
diff --git a/src/mz_strm_zlib.h b/mz_strm_zlib.h
similarity index 100%
rename from src/mz_strm_zlib.h
rename to mz_strm_zlib.h
diff --git a/src/mz_zip.c b/mz_zip.c
similarity index 100%
rename from src/mz_zip.c
rename to mz_zip.c
diff --git a/src/mz_zip.h b/mz_zip.h
similarity index 100%
rename from src/mz_zip.h
rename to mz_zip.h