Fixing general Makefile and moving OpenCV to edge detector Makefile

Author: ErickOF

modules/Makefile

@@ -1,6 +1,4 @@
-ifndef USER_DEF_SYSTEMC_DIR
 SYSTEMC?=$(HOME)/systemc-2.3.3
-endif # USER_DEF_SYSTEMC_DIR
 TARGET?=test
 
 # Compiler
@@ -19,15 +17,6 @@ BINDIR=./
 INCDIR=-I. -I./include -I$(SYSTEMC)/include -Ibasic_protocol -I$(SYSTEMC)/include/tlm_core/tlm_2
 LIBDIR=-L. -L$(SYSTEMC)/lib-linux64
 
-ifdef INCLUDE_OPENCV
-# Target
-LIBS+=-lopencv_imgcodecs -lopencv_core -lopencv_highgui -lopencv_imgproc
-
-# Source directories
-INCDIR+=-I/usr/local/include/opencv4
-LIBDIR+=-L/usr/local/lib
-endif # INCLUDE_OPENCV
-
 SOURCES := $(wildcard $(SRCDIR)/*.cpp)
 INCLUDES := $(wildcard $(INCDIR)/*.hpp)
 OBJECTS := $(SOURCES:$(SRCDIR)/%.cpp=$(OBJDIR)/%.o)

modules/edge-detector/Makefile

@@ -1,12 +1,14 @@
-# Adding stb lib for image handling
-INCDIR_STB=lib/stb
-INCLUDES_STB := $(wildcard $(INCDIR_STB)/*.h)
-
 # Include common Makefile
 include ../Makefile
 
-# Include stb lib for compilation
-INCLUDES += INCLUDES_STB
+ifdef INCLUDE_OPENCV
+# Target
+LIBS+=-lopencv_imgcodecs -lopencv_core -lopencv_highgui -lopencv_imgproc
+
+# Source directories
+INCDIR+=-I/usr/local/include/opencv4
+LIBDIR+=-L/usr/local/lib
+endif # INCLUDE_OPENCV
 
 # Defining preprocessor directive for debug
 ifdef IPS_DEBUG_EN