From 8d92bce9f05ae38bd145545ca36ec10322056c27 Mon Sep 17 00:00:00 2001
From: Mario Fink <mario.fink@record-evolution.de>
Date: Wed, 12 Aug 2020 09:30:34 +0200
Subject: [PATCH] simplify directory structure, adjust makefile

---
 setup_raw_eater.py => cyt/setup_raw_eater.py |  0
 setup_raw_meat.py => cyt/setup_raw_meat.py   |  0
 makefile                                     | 23 ++++++++++----------
 3 files changed, 12 insertions(+), 11 deletions(-)
 rename setup_raw_eater.py => cyt/setup_raw_eater.py (100%)
 rename setup_raw_meat.py => cyt/setup_raw_meat.py (100%)

diff --git a/setup_raw_eater.py b/cyt/setup_raw_eater.py
similarity index 100%
rename from setup_raw_eater.py
rename to cyt/setup_raw_eater.py
diff --git a/setup_raw_meat.py b/cyt/setup_raw_meat.py
similarity index 100%
rename from setup_raw_meat.py
rename to cyt/setup_raw_meat.py
diff --git a/makefile b/makefile
index b525589..9a43f8f 100644
--- a/makefile
+++ b/makefile
@@ -8,6 +8,7 @@ RAW = ../raw/
 # directory names
 SRC = src/
 LIB = lib/
+CYT = cyt/
 
 # name of executable
 EXE = eatraw
@@ -57,26 +58,26 @@ uninstall :
 # Python
 
 # build python module
-build : setup_raw_eater.py cyt/raw_eater.pyx cyt/raw_eater.pxd $(LIB)raweat.hpp \
-        setup_raw_meat.py cyt/raw_meat.pyx cyt/raw_meat.pxd $(LIB)rawmerge.hpp
-	python3 setup_raw_eater.py build_ext --inplace
-	python3 setup_raw_meat.py build_ext --inplace
+py : $(CYT)setup_raw_eater.py $(CYT)raw_eater.pyx $(CYT)raw_eater.pxd $(LIB)raweat.hpp \
+     $(CYT)setup_raw_meat.py $(CYT)raw_meat.pyx $(CYT)raw_meat.pxd $(LIB)rawmerge.hpp
+	python3 $(CYT)setup_raw_eater.py build_ext --inplace
+	python3 $(CYT)setup_raw_meat.py build_ext --inplace
 	cp raw_eater.cpython-*.so pyt/
 	cp raw_meat.cpython-*.so pyt/
 	rm *.so
 
-py_install: setup_raw_eater.py cyt/raw_eater.pyx cyt/raw_eater.pxd $(LIB)raweat.hpp \
-            setup_raw_meat.py cyt/raw_meat.pyx cyt/raw_meat.pxd $(LIB)rawmerge.hpp
-	python3 setup_raw_eater.py install --record files_raw_eater.txt
-	python3 setup_raw_meat.py install --record files_raw_meat.txt
+py-install: $(CYT)setup_raw_eater.py $(CYT)raw_eater.pyx $(CYT)raw_eater.pxd $(LIB)raweat.hpp \
+            $(CYT)setup_raw_meat.py $(CYT)raw_meat.pyx $(CYT)raw_meat.pxd $(LIB)rawmerge.hpp
+	python3 $(CYT)setup_raw_eater.py install --record files_raw_eater.txt
+	python3 $(CYT)setup_raw_meat.py install --record files_raw_meat.txt
 
-py_clean :
+py-clean :
 	rm -f raw_eater.cpython-*.so
 	rm -f pyt/raw_eater.cpython-*.so
-	rm -f cyt/raw_eater.cpp
+	rm -f $(CYT)raw_eater.cpp
 	rm -f raw_meat.cpython-*.so
 	rm -f pyt/raw_meat.cpython-*.so
-	rm -f cyt/raw_meat.cpp
+	rm -f $(CYT)raw_meat.cpp
 	rm -rf build/
 	rm -f *.txt