aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYinhang Liu <yinhangx.liu@intel.com>2018-12-13 16:51:43 +0800
committerZong Wei <wei.zong@intel.com>2018-12-14 13:38:10 +0800
commit9f91a59e06249470f75b3e8d24e09a8f60b1c16a (patch)
tree1ab06efee720f2a29e744630c9939bb58162cd70
parentcadb09cf1024b8e95a1c2ee18b002f1a93a4305e (diff)
downloadlibxcam-9f91a59e06249470f75b3e8d24e09a8f60b1c16a.tar.gz
thread: remove unnecessary PTHREAD_LDFLAGS
-rw-r--r--capi/Makefile.am1
-rw-r--r--configure.ac3
-rw-r--r--modules/gles/Makefile.am1
-rw-r--r--modules/isp/Makefile.am1
-rw-r--r--modules/ocl/Makefile.am1
-rw-r--r--modules/render/Makefile.am1
-rw-r--r--modules/soft/Makefile.am1
-rw-r--r--modules/vulkan/Makefile.am1
-rw-r--r--plugins/3a/aiq/Makefile.am1
-rw-r--r--plugins/3a/hybrid/Makefile.am1
-rw-r--r--plugins/smart/dvs/Makefile.am1
-rw-r--r--plugins/smart/sample/Makefile.am1
-rw-r--r--wrapper/gstreamer/Makefile.am3
-rw-r--r--xcore/Makefile.am10
14 files changed, 7 insertions, 20 deletions
diff --git a/capi/Makefile.am b/capi/Makefile.am
index 029fd7a..0dc818c 100644
--- a/capi/Makefile.am
+++ b/capi/Makefile.am
@@ -41,7 +41,6 @@ libxcam_capi_la_LIBADD = \
libxcam_capi_la_LDFLAGS = \
$(XCAM_LT_LDFLAGS) \
- $(PTHREAD_LDFLAGS) \
$(NULL)
libxcam_capiincludedir = $(includedir)/xcam/capi
diff --git a/configure.ac b/configure.ac
index 9d301f8..1e28e53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -376,9 +376,6 @@ XCAM_CXXFLAGS="$XCAM_CFLAGS -std=c++0x"
AC_SUBST(XCAM_CFLAGS)
AC_SUBST(XCAM_CXXFLAGS)
-PTHREAD_LDFLAGS="$PTHREAD_LDFLAGS -pthread"
-AC_SUBST(PTHREAD_LDFLAGS)
-
# define macor in config.h
AC_DEFINE_UNQUOTED([ENABLE_PROFILING], $ENABLE_PROFILING,
[enable profiling])
diff --git a/modules/gles/Makefile.am b/modules/gles/Makefile.am
index 8fbf4e6..952c198 100644
--- a/modules/gles/Makefile.am
+++ b/modules/gles/Makefile.am
@@ -48,7 +48,6 @@ libxcam_gles_la_LIBADD = \
libxcam_gles_la_LDFLAGS = \
$(XCAM_LT_LDFLAGS) \
- $(PTHREAD_LDFLAGS) \
$(NULL)
libxcam_glesincludedir = $(includedir)/xcam/gles
diff --git a/modules/isp/Makefile.am b/modules/isp/Makefile.am
index 9ad978c..6bcbd93 100644
--- a/modules/isp/Makefile.am
+++ b/modules/isp/Makefile.am
@@ -75,7 +75,6 @@ libxcam_isp_la_LIBADD = \
libxcam_isp_la_LDFLAGS = \
$(XCAM_LT_LDFLAGS) \
- $(PTHREAD_LDFLAGS) \
$(NULL)
libxcam_isp_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/modules/ocl/Makefile.am b/modules/ocl/Makefile.am
index d09a1ab..e5a2886 100644
--- a/modules/ocl/Makefile.am
+++ b/modules/ocl/Makefile.am
@@ -104,7 +104,6 @@ libxcam_ocl_la_LIBADD = \
libxcam_ocl_la_LDFLAGS = \
$(XCAM_LT_LDFLAGS) \
- $(PTHREAD_LDFLAGS) \
$(NULL)
libxcam_oclincludedir = $(includedir)/xcam/ocl
diff --git a/modules/render/Makefile.am b/modules/render/Makefile.am
index e102192..206430c 100644
--- a/modules/render/Makefile.am
+++ b/modules/render/Makefile.am
@@ -38,7 +38,6 @@ libxcam_render_la_LIBADD = \
libxcam_render_la_LDFLAGS = \
$(XCAM_LT_LDFLAGS) \
- $(PTHREAD_LDFLAGS) \
$(NULL)
libxcam_renderincludedir = $(includedir)/xcam/render
diff --git a/modules/soft/Makefile.am b/modules/soft/Makefile.am
index b1cd92b..176d8f5 100644
--- a/modules/soft/Makefile.am
+++ b/modules/soft/Makefile.am
@@ -47,7 +47,6 @@ libxcam_soft_la_LIBADD = \
libxcam_soft_la_LDFLAGS = \
$(XCAM_LT_LDFLAGS) \
- $(PTHREAD_LDFLAGS) \
$(NULL)
libxcam_softincludedir = $(includedir)/xcam/soft
diff --git a/modules/vulkan/Makefile.am b/modules/vulkan/Makefile.am
index d83cbc5..48fa26b 100644
--- a/modules/vulkan/Makefile.am
+++ b/modules/vulkan/Makefile.am
@@ -46,7 +46,6 @@ libxcam_vulkan_la_LIBADD = \
libxcam_vulkan_la_LDFLAGS = \
$(XCAM_LT_LDFLAGS) \
- $(PTHREAD_LDFLAGS) \
$(NULL)
libxcam_vulkanincludedir = $(includedir)/xcam/vulkan
diff --git a/plugins/3a/aiq/Makefile.am b/plugins/3a/aiq/Makefile.am
index c1ca926..b75fd6e 100644
--- a/plugins/3a/aiq/Makefile.am
+++ b/plugins/3a/aiq/Makefile.am
@@ -37,7 +37,6 @@ libxcam_3a_aiq_la_LIBADD = \
libxcam_3a_aiq_la_LDFLAGS = \
-module -avoid-version \
$(top_builddir)/xcore/libxcam_core.la \
- $(PTHREAD_LDFLAGS) \
$(NULL)
libxcam_3a_aiq_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/plugins/3a/hybrid/Makefile.am b/plugins/3a/hybrid/Makefile.am
index df23f61..4195b60 100644
--- a/plugins/3a/hybrid/Makefile.am
+++ b/plugins/3a/hybrid/Makefile.am
@@ -24,7 +24,6 @@ libxcam_3a_hybrid_la_LIBADD = \
libxcam_3a_hybrid_la_LDFLAGS = \
-module -avoid-version \
$(top_builddir)/xcore/libxcam_core.la \
- $(PTHREAD_LDFLAGS) \
$(NULL)
libxcam_3a_hybrid_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/plugins/smart/dvs/Makefile.am b/plugins/smart/dvs/Makefile.am
index 2675621..38bc011 100644
--- a/plugins/smart/dvs/Makefile.am
+++ b/plugins/smart/dvs/Makefile.am
@@ -40,7 +40,6 @@ libxcam_plugin_dvs_la_LIBADD = \
libxcam_plugin_dvs_la_LDFLAGS = \
-module -avoid-version \
$(top_builddir)/xcore/libxcam_core.la \
- $(PTHREAD_LDFLAGS) \
$(OPENCV_LIBS) \
$(NULL)
diff --git a/plugins/smart/sample/Makefile.am b/plugins/smart/sample/Makefile.am
index 407d2dd3..49acd47 100644
--- a/plugins/smart/sample/Makefile.am
+++ b/plugins/smart/sample/Makefile.am
@@ -39,7 +39,6 @@ libxcam_sample_smart_la_LIBADD = \
libxcam_sample_smart_la_LDFLAGS = \
-module -avoid-version \
$(top_builddir)/xcore/libxcam_core.la \
- $(PTHREAD_LDFLAGS) \
$(NULL)
endif
diff --git a/wrapper/gstreamer/Makefile.am b/wrapper/gstreamer/Makefile.am
index 8a47a6f..90a6f88 100644
--- a/wrapper/gstreamer/Makefile.am
+++ b/wrapper/gstreamer/Makefile.am
@@ -68,8 +68,7 @@ libgstxcamsrc_la_LIBADD = $(XCAMGST_LIBS) \
$(NULL)
libgstxcamsrc_la_LDFLAGS = \
- -module -avoid-version \
- $(PTHREAD_LDFLAGS) $(XCORE_LA) \
+ -module -avoid-version $(XCORE_LA) \
$(NULL)
libgstxcamsrc_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/xcore/Makefile.am b/xcore/Makefile.am
index 7fae36f..50439ea 100644
--- a/xcore/Makefile.am
+++ b/xcore/Makefile.am
@@ -1,9 +1,11 @@
lib_LTLIBRARIES = libxcam_core.la
-XCAM_CORE_CXXFLAGS = $(XCAM_CXXFLAGS)
+XCAM_CORE_CXXFLAGS = \
+ $(XCAM_CXXFLAGS) \
+ -pthread \
+ $(NULL)
XCAM_CORE_LIBS = \
- -ldl \
- -lpthread \
+ -ldl \
$(NULL)
xcam_sources = \
@@ -78,8 +80,8 @@ libxcam_core_la_SOURCES = \
libxcam_core_la_LDFLAGS = \
-no-undefined \
+ -pthread \
$(XCAM_LT_LDFLAGS) \
- $(PTHREAD_LDFLAGS) \
$(NULL)
libxcam_core_la_LIBADD = \