[Pkg-voip-commits] [pjproject] 17/45: Remove video libs dependency for pj-utils and pjnath
Jonas Smedegaard
dr at jones.dk
Tue Jun 7 22:01:22 UTC 2016
This is an automated email from the git hooks/post-receive script.
js pushed a commit to branch master
in repository pjproject.
commit 02756cc4c005bb5ef889c8057a62d6344ef3e0b1
Author: Tzafrir Cohen <tzafrir at debian.org>
Date: Fri Oct 31 23:14:49 2014 +0200
Remove video libs dependency for pj-utils and pjnath
The video LD flags were duplicated on the app LD flags and the HOST
LD flags. Remove them from the app LD flags. Remove HOST_LDFLAGS for
some projects.
---
build.mak.in | 1 -
pjlib-util/build/Makefile | 2 +-
pjnath/build/Makefile | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/build.mak.in b/build.mak.in
index faa9c98..5c4fc40 100644
--- a/build.mak.in
+++ b/build.mak.in
@@ -186,7 +186,6 @@ export APP_LDFLAGS := -L$(PJDIR)/pjlib/lib\
-L$(PJDIR)/pjmedia/lib\
-L$(PJDIR)/pjsip/lib\
-L$(PJDIR)/third_party/lib\
- $(PJ_VIDEO_LDFLAGS) \
@LDFLAGS@
export APP_LDXXFLAGS := $(APP_LDFLAGS)
diff --git a/pjlib-util/build/Makefile b/pjlib-util/build/Makefile
index cb601cb..a03a558 100644
--- a/pjlib-util/build/Makefile
+++ b/pjlib-util/build/Makefile
@@ -28,7 +28,7 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
$(CFLAGS) $(CC_INC)../include $(CC_INC)../../pjlib/include
export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
$(HOST_CXXFLAGS) $(CXXFLAGS)
-export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
+export _LDFLAGS := $(CC_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
$(APP_LDFLAGS) $(LDFLAGS)
###############################################################################
diff --git a/pjnath/build/Makefile b/pjnath/build/Makefile
index 1bc08b5..5f08a8a 100644
--- a/pjnath/build/Makefile
+++ b/pjnath/build/Makefile
@@ -30,7 +30,7 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
$(CC_INC)../../pjlib-util/include
export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
$(HOST_CXXFLAGS) $(CXXFLAGS)
-export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
+export _LDFLAGS := $(CC_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
$(APP_LDFLAGS) $(LDFLAGS)
###############################################################################
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/pjproject.git
More information about the Pkg-voip-commits
mailing list