From 50fdaad132b2939d8fc935cfa68df74497a6f4b5 Mon Sep 17 00:00:00 2001
From: Yuval Adam <_@yuv.al>
Date: Mon, 18 Jul 2022 07:34:28 +0300
Subject: Move to workspace file structure

---
 Cargo.toml               | 14 ++++----------
 build.rs                 | 20 --------------------
 codec2-sys/Cargo.toml    | 11 +++++++++++
 codec2-sys/build.rs      | 20 ++++++++++++++++++++
 codec2-sys/src/lib.rs    | 13 +++++++++++++
 codec2-sys/src/wrapper.h |  1 +
 src/lib.rs               | 13 -------------
 src/wrapper.h            |  1 -
 8 files changed, 49 insertions(+), 44 deletions(-)
 delete mode 100644 build.rs
 create mode 100644 codec2-sys/Cargo.toml
 create mode 100644 codec2-sys/build.rs
 create mode 100644 codec2-sys/src/lib.rs
 create mode 100644 codec2-sys/src/wrapper.h
 delete mode 100644 src/lib.rs
 delete mode 100644 src/wrapper.h

diff --git a/Cargo.toml b/Cargo.toml
index 9e4794f..56d630f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,11 +1,5 @@
-[package]
-name = "codec2-sys"
-description = "System bindings for codec2"
-version = "1.0.0"
-edition = "2021"
-repository = "https://github.com/yuvadm/codec2-sys"
-license = "LGPL-2.1"
-readme = "README.md"
+[workspace]
 
-[build-dependencies]
-bindgen = "0.60.1"
+members = [
+    "codec2-sys",
+]
\ No newline at end of file
diff --git a/build.rs b/build.rs
deleted file mode 100644
index 9fbac37..0000000
--- a/build.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-extern crate bindgen;
-
-use std::env;
-use std::path::PathBuf;
-
-fn main() {
-    println!("cargo:rustc-link-search=/usr/lib");
-    println!("cargo:rustc-link-lib=codec2");
-    println!("cargo:rerun-if-changed=src/wrapper.h");
-    let bindings = bindgen::Builder::default()
-        .header("src/wrapper.h")
-        .parse_callbacks(Box::new(bindgen::CargoCallbacks))
-        .generate()
-        .expect("Unable to generate bindings");
-
-    let out_path = PathBuf::from(env::var("OUT_DIR").unwrap());
-    bindings
-        .write_to_file(out_path.join("bindings.rs"))
-        .expect("Couldn't write bindings!");
-}
diff --git a/codec2-sys/Cargo.toml b/codec2-sys/Cargo.toml
new file mode 100644
index 0000000..7950644
--- /dev/null
+++ b/codec2-sys/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "codec2-sys"
+description = "System bindings for codec2"
+version = "1.0.0"
+edition = "2021"
+repository = "https://github.com/yuvadm/codec2.rs"
+license = "LGPL-2.1"
+readme = "README.md"
+
+[build-dependencies]
+bindgen = "0.60.1"
diff --git a/codec2-sys/build.rs b/codec2-sys/build.rs
new file mode 100644
index 0000000..9fbac37
--- /dev/null
+++ b/codec2-sys/build.rs
@@ -0,0 +1,20 @@
+extern crate bindgen;
+
+use std::env;
+use std::path::PathBuf;
+
+fn main() {
+    println!("cargo:rustc-link-search=/usr/lib");
+    println!("cargo:rustc-link-lib=codec2");
+    println!("cargo:rerun-if-changed=src/wrapper.h");
+    let bindings = bindgen::Builder::default()
+        .header("src/wrapper.h")
+        .parse_callbacks(Box::new(bindgen::CargoCallbacks))
+        .generate()
+        .expect("Unable to generate bindings");
+
+    let out_path = PathBuf::from(env::var("OUT_DIR").unwrap());
+    bindings
+        .write_to_file(out_path.join("bindings.rs"))
+        .expect("Couldn't write bindings!");
+}
diff --git a/codec2-sys/src/lib.rs b/codec2-sys/src/lib.rs
new file mode 100644
index 0000000..1a1db18
--- /dev/null
+++ b/codec2-sys/src/lib.rs
@@ -0,0 +1,13 @@
+include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    
+    #[test]
+    fn it_works() {
+        let _c : CODEC2;
+        let result = 2 + 2;
+        assert_eq!(result, 4);
+    }
+}
diff --git a/codec2-sys/src/wrapper.h b/codec2-sys/src/wrapper.h
new file mode 100644
index 0000000..ae333d5
--- /dev/null
+++ b/codec2-sys/src/wrapper.h
@@ -0,0 +1 @@
+#include <codec2/codec2.h>
diff --git a/src/lib.rs b/src/lib.rs
deleted file mode 100644
index 1a1db18..0000000
--- a/src/lib.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    
-    #[test]
-    fn it_works() {
-        let _c : CODEC2;
-        let result = 2 + 2;
-        assert_eq!(result, 4);
-    }
-}
diff --git a/src/wrapper.h b/src/wrapper.h
deleted file mode 100644
index ae333d5..0000000
--- a/src/wrapper.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <codec2/codec2.h>
-- 
cgit v1.3.1