[Pkg-voip-commits] [pjproject] 03/16: WIP: merge pjmedia-{audio, video}dev into pjmedia

[tzafrir at debian.org]

This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to branch master-mergelibs
in repository pjproject.

commit 90ddf35f990a14602ae0325e55a9c6ad77646a26
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Wed Dec 30 08:28:28 2015 +0200

    WIP: merge pjmedia-{audio,video}dev into pjmedia
    
    Merge pjmedia-audiodev, pjmedia-videodev and pjmedia to a single
    library.
    
    This patch will not work stand-alone and requires the following extra
    setup:
    
      ln -s pjmedia/src/pjmedia-audiodev/*.c pjmedia/src/pjmedia-videodev/*.c \
        pjmedia/src/pjmedia/
    
    and cleanup:
    
      find pjmedia/src/pjmedia -type l | xargs -r rm
---
 build.mak.in           |  2 --
 pjmedia/build/Makefile | 13 +++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/build.mak.in b/build.mak.in
index 7dc768c..08d8588 100644
--- a/build.mak.in
+++ b/build.mak.in
@@ -255,8 +255,6 @@ export APP_LDLIBS := $(PJSUA_LIB_LDLIB) \
 	$(PJSIP_LDLIB) \
 	$(PJMEDIA_CODEC_LDLIB) \
 	$(PJMEDIA_LDLIB) \
-	$(PJMEDIA_VIDEODEV_LDLIB) \
-	$(PJMEDIA_AUDIODEV_LDLIB) \
 	$(PJMEDIA_LDLIB) \
 	$(PJNATH_LDLIB) \
 	$(PJLIB_UTIL_LDLIB) \
diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
index 9578a1f..a5941f5 100644
--- a/pjmedia/build/Makefile
+++ b/pjmedia/build/Makefile
@@ -57,7 +57,7 @@ export _LDFLAGS := $(APP_THIRD_PARTY_LIBS) \
 # Defines for building PJMEDIA library
 #
 export PJMEDIA_SRCDIR = ../src/pjmedia
-export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
+PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
 			alaw_ulaw.o alaw_ulaw_table.o avi_player.o \
 			bidirectional.o clock_thread.o codec.o conference.o \
 			conf_switch.o converter.o  converter_libswscale.o converter_libyuv.o \
@@ -98,6 +98,7 @@ export PJMEDIA_AUDIODEV_OBJS +=  audiodev.o audiotest.o errno.o \
 export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS)
 export PJMEDIA_AUDIODEV_CXXFLAGS += $(_CXXFLAGS)
 export PJMEDIA_AUDIODEV_LDFLAGS += $(PJLIB_LDLIB) \
+				   $(PJMEDIA_LDLIB) \
 				   $(_LDFLAGS)
 
 
@@ -111,9 +112,11 @@ export PJMEDIA_VIDEODEV_OBJS +=  errno.o videodev.o avi_dev.o ffmpeg_dev.o \
 export PJMEDIA_VIDEODEV_CFLAGS += $(_CFLAGS)
 export PJMEDIA_VIDEODEV_CXXFLAGS += $(_CXXFLAGS)
 export PJMEDIA_VIDEODEV_LDFLAGS += $(PJLIB_LDLIB) \
+				   $(PJMEDIA_LDLIB) \
 				   $(_LDFLAGS)
 
 
+export PJMEDIA_OBJS += $(PJMEDIA_AUDIODEV_OBJS) $(PJMEDIA_VIDEODEV_OBJS)
 ###############################################################################
 # Defines for building PJSDP library
 # Note that SDP functionality is already INCLUDED in PJMEDIA.
@@ -177,8 +180,6 @@ export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT
 #
 TARGETS := $(PJMEDIA_LIB) $(PJMEDIA_SONAME) \
 	   $(PJMEDIA_CODEC_LIB) $(PJMEDIA_CODEC_SONAME)\
-	   $(PJMEDIA_VIDEODEV_LIB) $(PJMEDIA_VIDEODEV_SONAME) \
-	   $(PJMEDIA_AUDIODEV_LIB) $(PJMEDIA_AUDIODEV_SONAME) \
 	   $(PJSDP_LIB) $(PJSDP_SONAME)
 TARGETS_EXE := $(PJMEDIA_TEST_EXE)
 
@@ -211,7 +212,7 @@ distclean: realclean
 
 pjmedia: $(PJMEDIA_LIB)
 $(PJMEDIA_SONAME): $(PJMEDIA_LIB)
-$(PJMEDIA_LIB) $(PJMEDIA_SONAME): $(PJMEDIA_AUDIODEV_LIB) $(PJMEDIA_AUDIODEV_SONAME) $(PJMEDIA_VIDEODEV_LIB) $(PJMEDIA_VIDEODEV_SONAME)
+$(PJMEDIA_LIB) $(PJMEDIA_SONAME):
 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
 
 pjmedia-codec: $(PJMEDIA_CODEC_LIB)
@@ -221,12 +222,12 @@ $(PJMEDIA_CODEC_LIB) $(PJMEDIA_CODEC_SONAME): $(PJMEDIA_LIB) $(PJMEDIA_SONAME)
 
 pjmedia-videodev: $(PJMEDIA_VIDEODEV_LIB)
 $(PJMEDIA_VIDEODEV_SONAME): $(PJMEDIA_VIDEODEV_LIB)
-$(PJMEDIA_VIDEODEV_LIB) $(PJMEDIA_VIDEODEV_SONAME):
+$(PJMEDIA_VIDEODEV_LIB) $(PJMEDIA_VIDEODEV_SONAME): $(PJMEDIA_LIB) $(PJMEDIA_SONAME)
 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_VIDEODEV app=pjmedia-videodev $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
 
 pjmedia-audiodev: $(PJMEDIA_AUDIODEV_LIB)
 $(PJMEDIA_AUDIODEV_SONAME): $(PJMEDIA_AUDIODEV_LIB)
-$(PJMEDIA_AUDIODEV_LIB) $(PJMEDIA_AUDIODEV_SONAME):
+$(PJMEDIA_AUDIODEV_LIB) $(PJMEDIA_AUDIODEV_SONAME): $(PJMEDIA_LIB) $(PJMEDIA_SONAME)
 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_AUDIODEV app=pjmedia-audiodev $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
 
 pjsdp: $(PJSDP_LIB)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/pjproject.git