shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #2633 from mstorsjo/pc-fix

Fixes for the pkg-config files

--- a/Makefile

+++ b/Makefile

@@ -282,10 +282,10 @@

 endif

 $(PROJECT_NAME).pc: $(PROJECT_NAME).pc.in

-	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@VERSION@;$(CURRENT_VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $< > $@

+	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $< > $@

 $(PROJECT_NAME)-static.pc: $(PROJECT_NAME).pc.in

-	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@VERSION@;$(CURRENT_VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $< > $@

+	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $< > $@

 install-headers:

 	mkdir -p $(DESTDIR)$(PREFIX)/include/wels

--- a/build/platform-bsd.mk

+++ b/build/platform-bsd.mk

@@ -5,6 +5,7 @@

 SHLDFLAGS = -Wl,-soname,$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER)

 CFLAGS += -fPIC

 LDFLAGS += -lpthread

+STATIC_LDFLAGS += -lpthread -lm

 ifeq ($(ASM_ARCH), x86)

 ifeq ($(ARCH), x86_64)

 ASMFLAGS += -f elf64

--- a/build/platform-darwin.mk

+++ b/build/platform-darwin.mk

@@ -11,7 +11,6 @@

 SHARED = -dynamiclib

 SHARED += -current_version $(CURRENT_VERSION) -compatibility_version $(COMPATIBILITY_VERSION)

 CFLAGS += -Wall -fPIC -MMD -MP

-LDFLAGS += -lpthread

 ifeq ($(ASM_ARCH), x86)

 ASMFLAGS += -DPREFIX

 ifeq ($(ARCH), x86_64)

--- a/build/platform-linux.mk

+++ b/build/platform-linux.mk

@@ -5,6 +5,7 @@

 SHLDFLAGS = -Wl,-soname,$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER)

 CFLAGS += -Wall -fno-strict-aliasing -fPIC -MMD -MP

 LDFLAGS += -lpthread

+STATIC_LDFLAGS += -lpthread -lm

 AR_OPTS = crD $@

 ifeq ($(ASM_ARCH), x86)

 ifeq ($(ARCH), x86_64)