1 files changed, 39 insertions, 51 deletions
diff --git a/modules/soft/Makefile.am b/modules/soft/Makefile.am
index b1cd92b..83b2721 100644
--- a/modules/soft/Makefile.am
+++ b/modules/soft/Makefile.am
@@ -1,75 +1,63 @@
 lib_LTLIBRARIES = libxcam_soft.la
 
-XCAMSOFT_CXXFLAGS =               \
-    $(LIBCL_CFLAGS)               \
-    -I$(top_srcdir)/xcore         \
-    -I$(top_srcdir)/modules       \
+XCAMSOFT_CXXFLAGS = \
+    $(XCAM_CXXFLAGS)        \
+    -I$(top_srcdir)/xcore   \
+    -I$(top_srcdir)/modules \
     $(NULL)
 
-XCAMSOFT_LIBS =
-
-xcam_soft_sources =                  \
-    soft_handler.cpp                 \
-    soft_video_buf_allocator.cpp     \
-    soft_worker.cpp                  \
-    soft_blender_tasks_priv.cpp      \
-    soft_blender.cpp                 \
-    soft_geo_mapper.cpp              \
-    soft_geo_tasks_priv.cpp          \
-    soft_copy_task.cpp               \
-    soft_stitcher.cpp                \
-   $(NULL)
+XCAMSOFT_LIBS = \
+    $(top_builddir)/xcore/libxcam_core.la \
+    $(NULL)
 
 if HAVE_OPENCV
-XCAMSOFT_CXXFLAGS += $(OPENCV_CFLAGS)
-
-XCAMSOFT_LIBS += $(OPENCV_LIBS)
+XCAMSOFT_LIBS += $(top_builddir)/modules/ocv/libxcam_ocv.la
+endif
 
-xcam_soft_sources +=                 \
-    cv_capi_feature_match.cpp        \
+xcam_soft_sources = \
+    soft_handler.cpp             \
+    soft_video_buf_allocator.cpp \
+    soft_worker.cpp              \
+    soft_blender_tasks_priv.cpp  \
+    soft_blender.cpp             \
+    soft_geo_mapper.cpp          \
+    soft_geo_tasks_priv.cpp      \
+    soft_copy_task.cpp           \
+    soft_stitcher.cpp            \
    $(NULL)
 
-endif
-
-libxcam_soft_la_SOURCES =   \
-    $(xcam_soft_sources)    \
+libxcam_soft_la_SOURCES = \
+    $(xcam_soft_sources) \
     $(NULL)
 
-libxcam_soft_la_CXXFLAGS =  \
-    $(XCAMSOFT_CXXFLAGS)    \
-    $(XCAM_CXXFLAGS)        \
+libxcam_soft_la_CXXFLAGS = \
+    $(XCAMSOFT_CXXFLAGS) \
     $(NULL)
 
-libxcam_soft_la_LIBADD =                  \
-    $(top_builddir)/xcore/libxcam_core.la \
-    $(XCAMSOFT_LIBS)                      \
+libxcam_soft_la_LIBADD = \
+    $(XCAMSOFT_LIBS) \
     $(NULL)
 
-libxcam_soft_la_LDFLAGS =   \
-    $(XCAM_LT_LDFLAGS)      \
-    $(PTHREAD_LDFLAGS)      \
+libxcam_soft_la_LDFLAGS = \
+    $(XCAM_LT_LDFLAGS) \
     $(NULL)
 
 libxcam_softincludedir = $(includedir)/xcam/soft
 
-nobase_libxcam_softinclude_HEADERS =   \
-    soft_handler.h                     \
-    soft_video_buf_allocator.h         \
-    soft_worker.h                      \
-    soft_image.h                       \
-    soft_blender.h                     \
-    soft_geo_mapper.h                  \
-    soft_copy_task.h                   \
-    soft_stitcher.h                    \
+nobase_libxcam_softinclude_HEADERS = \
+    soft_handler.h             \
+    soft_video_buf_allocator.h \
+    soft_worker.h              \
+    soft_image.h               \
+    soft_blender.h             \
+    soft_geo_mapper.h          \
+    soft_copy_task.h           \
+    soft_stitcher.h            \
     $(NULL)
 
-noinst_HEADERS =                       \
-    soft_blender_tasks_priv.h          \
-    soft_geo_tasks_priv.h              \
+noinst_HEADERS = \
+    soft_blender_tasks_priv.h \
+    soft_geo_tasks_priv.h     \
     $(NULL)
 
-if HAVE_OPENCV
-noinst_HEADERS += cv_capi_feature_match.h
-endif
-
 libxcam_soft_la_LIBTOOLFLAGS = --tag=disable-static