Create merge crate and merge_derive

ekke-rs · Feb 24, 2019 · 4544a58 · 4544a58
1 parent f9f0721
commit 4544a58
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -9,4 +9,13 @@
 	url = [email protected]:najamelan/ekke_io.git
 [submodule "apps/systemd"]
 	path = apps/systemd
-	url = [email protected]:najamelan/ekke_systemd.git
+	url = [email protected]:najamelan/ekke_systemd.git
+[submodule "ekke_config"]
+	path = ekke_config
+	url = [email protected]:najamelan/ekke_config.git
+[submodule "ekke_merge"]
+	path = ekke_merge
+	url = [email protected]:najamelan/ekke_merge
+[submodule "ekke_merge_derive"]
+	path = ekke_merge_derive
+	url = [email protected]:najamelan/ekke_merge_derive
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,9 +2,12 @@
 
 	members = [
 
-		  "ekke_core"        ,
-		  "ekke_io"          ,
-		  #"apps/filebrowser" ,
-		  "apps/systemd"
-
+		"ekke_core"        ,
+		"ekke_io"          ,
+		"ekke_config"      ,
+		"ekke_merge"       ,
+		"ekke_merge/examples/derive",
+		"ekke_merge_derive",
+		#"apps/filebrowser" ,
+		"apps/systemd"     ,
 	]
diff --git a/ekke_config b/ekke_config
diff --git a/ekke_merge b/ekke_merge
diff --git a/ekke_merge_derive b/ekke_merge_derive