shithub: openh264

Info  •  Files  •  Log  •  Branches

Set LDFLAGS after the object files in shared library linking commands

This makes sure that the built libopenh264.so actually links to
libpthread.so.

--- a/Makefile

+++ b/Makefile

@@ -191,7 +191,7 @@

 $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX): $(ENCODER_OBJS) $(DECODER_OBJS) $(PROCESSING_OBJS) $(COMMON_OBJS)

 	$(QUIET)rm -f $@

-	$(QUIET_CXX)$(CXX) $(SHARED) $(LDFLAGS) $(CXX_LINK_O) $+ $(SHLDFLAGS)

+	$(QUIET_CXX)$(CXX) $(SHARED) $(CXX_LINK_O) $+ $(LDFLAGS) $(SHLDFLAGS)

 ifeq ($(HAVE_GMP_API),Yes)

 plugin: $(LIBPREFIX)$(MODULE_NAME).$(SHAREDLIBSUFFIX)

@@ -204,7 +204,7 @@

 $(LIBPREFIX)$(MODULE_NAME).$(SHAREDLIBSUFFIX): $(MODULE_OBJS) $(ENCODER_OBJS) $(DECODER_OBJS) $(PROCESSING_OBJS) $(COMMON_OBJS)

 	$(QUIET)rm -f $@

-	$(QUIET_CXX)$(CXX) $(SHARED) $(LDFLAGS) $(CXX_LINK_O) $+ $(SHLDFLAGS) $(MODULE_LDFLAGS)

+	$(QUIET_CXX)$(CXX) $(SHARED) $(CXX_LINK_O) $+ $(LDFLAGS) $(SHLDFLAGS) $(MODULE_LDFLAGS)

 install-headers:

 	mkdir -p $(PREFIX)/include/wels

@@ -241,7 +241,7 @@

 LIBRARIES +=$(LIBPREFIX)ut.$(SHAREDLIBSUFFIX)

 $(LIBPREFIX)ut.$(SHAREDLIBSUFFIX): $(DECODER_UNITTEST_OBJS) $(ENCODER_UNITTEST_OBJS) $(PROCESSING_UNITTEST_OBJS) $(API_TEST_OBJS) $(COMMON_UNITTEST_OBJS)  $(CODEC_UNITTEST_DEPS)

 	$(QUIET)rm -f $@

-	$(QUIET_CXX)$(CXX) $(SHARED) $(LDFLAGS) $(CXX_LINK_O) $+ $(CODEC_UNITTEST_LDFLAGS)

+	$(QUIET_CXX)$(CXX) $(SHARED) $(CXX_LINK_O) $+ $(LDFLAGS) $(CODEC_UNITTEST_LDFLAGS)

 binaries: codec_unittest$(EXEEXT)

 BINARIES += codec_unittest$(EXEEXT)