From 2fbc95ffc0f71130ecaa9498526b07bf478dfaee Mon Sep 17 00:00:00 2001
From: Git Merciol <merciol@univ-ubs.fr>
Date: Fri, 23 Feb 2018 16:45:32 +0100
Subject: [PATCH] =?UTF-8?q?=09modifi=C3=A9=C2=A0:=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20MakefileNoOTB=20=09renomm=C3=A9=C2=A0:=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20src/testMain.cpp=20->=20src/apGenerator.cpp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MakefileNoOTB                         | 10 +++++-----
 src/{testMain.cpp => apGenerator.cpp} |  0
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename src/{testMain.cpp => apGenerator.cpp} (100%)

diff --git a/MakefileNoOTB b/MakefileNoOTB
index 8274b16..ddb3a85 100644
--- a/MakefileNoOTB
+++ b/MakefileNoOTB
@@ -8,7 +8,7 @@ LIB_DIR   = $(BLD_DIR)/lib
 OBJ_DIR   = $(BLD_DIR)/obj
 
 ## PRG #################################
-TST_PRG = testMain
+TST_PRG = apGenerator
 TST_SRC = $(patsubst %, $(CPP_DIR)/%.cpp, $(TST_PRG))
 TST_OUT = $(patsubst %, $(OUT_DIR)/%, $(TST_PRG))
 
@@ -31,7 +31,7 @@ $(OUT_DIR)/%: $(CPP_DIR)/*/%.cpp
 	$(CC) $(IFLAGS) $< -L$(LIB_DIR) $(LFLAGS) -cpp -o $@
 
 ## ENTRIES #############################
-all:	init libtriskele testMain
+all:	init libtriskele apGenerator
 
 init:
 	mkdir -p $(OUT_DIR) $(OBJ_DIR) $(LIB_DIR)
@@ -45,7 +45,7 @@ wipe: clean
 libtriskele: $(LIB_DIR)/libtriskele.a
 
 $(TST_OUT): $(TST_SRC) $(LIB_DIR)/libtriskele.a
-testMain: $(TST_OUT)
+apGenerator: $(TST_OUT)
 #	$(TST_OUT) data/nairobi-byte.tif data/result.tif -b 0 -w 4000 -h 4000 --min-tree -A data/areaThresholds.txt #  --debug
 #	$(TST_OUT) data/10m.tif data/result.tif -b 0 --min-tree --max-tree --tos-tree -A data/areaThresholds.txt -S data/sdThresholds.txt -M data/moiThresholds.txt #  --debug
 	$(TST_OUT) data/10m.tif data/result.tif --min-tree --max-tree --tos-tree -A data/areaThresholds.txt -S data/sdThresholds.txt -M data/moiThresholds.txt #  --debug
@@ -53,9 +53,9 @@ testMain: $(TST_OUT)
 
 ## DEPENDS #############################
 ALL_OUT = $(TST_OUT)
-ALL_OBJ = $(OBJ_DIR)/IImage.o $(OBJ_DIR)/triskeleArrayTreeBase.o $(OBJ_DIR)/Tree.o $(OBJ_DIR)/triskeleDebug.o $(OBJ_DIR)/triskeleBase.o $(OBJ_DIR)/QuadTreeBuilder.o $(OBJ_DIR)/XMLTreeBuilder.o $(OBJ_DIR)/Option.o  $(OBJ_DIR)/Selected.o 
+ALL_OBJ = $(OBJ_DIR)/IImage.o $(OBJ_DIR)/triskeleArrayTreeBase.o $(OBJ_DIR)/Tree.o $(OBJ_DIR)/triskeleDebug.o $(OBJ_DIR)/triskeleBase.o $(OBJ_DIR)/QuadTreeBuilder.o $(OBJ_DIR)/Option.o  $(OBJ_DIR)/Selected.o 
 
-#ALL_OBJ_NO_XML = $(OBJ_DIR)/IImage.o $(OBJ_DIR)/triskeleArrayTreeBase.o $(OBJ_DIR)/Tree.o $(OBJ_DIR)/triskeleDebug.o $(OBJ_DIR)/triskeleBase.o $(OBJ_DIR)/QuadTreeBuilder.o $(OBJ_DIR)/Option.o $(OBJ_DIR)/Selected.o 
+ALL_OBJ_XML = $(OBJ_DIR)/IImage.o $(OBJ_DIR)/triskeleArrayTreeBase.o $(OBJ_DIR)/Tree.o $(OBJ_DIR)/triskeleDebug.o $(OBJ_DIR)/triskeleBase.o $(OBJ_DIR)/QuadTreeBuilder.o $(OBJ_DIR)/XMLTreeBuilder.o $(OBJ_DIR)/Option.o $(OBJ_DIR)/Selected.o 
 
 DEPENDS = ${ALL_OUT:=.d} ${ALL_OBJ:.o=.d}
 -include ${DEPENDS}
diff --git a/src/testMain.cpp b/src/apGenerator.cpp
similarity index 100%
rename from src/testMain.cpp
rename to src/apGenerator.cpp