summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Parker <jparker@digium.com>2013-02-13 11:04:23 -0600
committerJason Parker <jparker@digium.com>2013-03-11 15:24:47 -0500
commitf3d98ed4613b4832ea37cbeacb0f710b72107fa1 (patch)
treeb699a570e831ecdf42a1bf2e53aa3215a64f14c1
parent9e5b6c43b13a561b09908d2a57edb6c96e4fedaf (diff)
Fix (my) review feedback from GitHub.
-rw-r--r--build/rules.mak16
-rw-r--r--pjlib/build/os-auto.mak.in5
-rw-r--r--pjmedia/build/Makefile2
-rw-r--r--pjmedia/include/pjmedia-videodev/config.h2
-rw-r--r--pjmedia/src/pjmedia/format.c1
-rw-r--r--pjmedia/src/test/vid_dev_test.c1
6 files changed, 14 insertions, 13 deletions
diff --git a/build/rules.mak b/build/rules.mak
index b816643..fcc07f7 100644
--- a/build/rules.mak
+++ b/build/rules.mak
@@ -78,42 +78,42 @@ print_common:
@echo RANLIB=$(RANLIB)
print_bin: print_common
- @echo EXE=$(BINDIR)/$(EXE)
+ @echo EXE=$(subst /,$(HOST_PSEP),$(BINDIR)/$(EXE))
@echo BINDIR=$(BINDIR)
print_lib: print_common
ifneq ($(LIB),)
- @echo LIB=$(LIBDIR)/$(LIB)
+ @echo LIB=$(subst /,$(HOST_PSEP),$(LIBDIR)/$(LIB))
endif
ifneq ($(SHLIB),)
- @echo SHLIB=$(LIBDIR)/$(SHLIB)
+ @echo SHLIB=$(subst /,$(HOST_PSEP),$(LIBDIR)/$(SHLIB))
endif
ifneq ($(SONAME),)
- @echo SONAME=$(LIBDIR)/$(SONAME)
+ @echo SONAME=$(subst /,$(HOST_PSEP),$(LIBDIR)/$(SONAME))
endif
@echo LIBDIR=$(LIBDIR)
ifneq ($(LIB),)
-$(LIBDIR)/$(LIB): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
+$(subst /,$(HOST_PSEP),$(LIBDIR)/$(LIB)): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
if test ! -d $(LIBDIR); then $(subst @@,$(subst /,$(HOST_PSEP),$(LIBDIR)),$(HOST_MKDIR)); fi
$(AR) $(AR_FLAGS) $@ $(OBJS)
$(RANLIB) $@
endif
ifneq ($(SHLIB),)
-$(LIBDIR)/$(SHLIB): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
+$(subst /,$(HOST_PSEP),$(LIBDIR)/$(SHLIB)): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
if test ! -d $(LIBDIR); then $(subst @@,$(subst /,$(HOST_PSEP),$(LIBDIR)),$(HOST_MKDIR)); fi
$(LD) $(LDOUT)$(subst /,$(HOST_PSEP),$@) \
$(subst /,$(HOST_PSEP),$(OBJS)) $($(APP)_LDFLAGS) $(SHLIB_OPT)
endif
ifneq ($(SONAME),)
-$(LIBDIR)/$(SONAME): $(LIBDIR)/$(SHLIB)
+$(subst /,$(HOST_PSEP),$(LIBDIR)/$(SONAME)): $(subst /,$(HOST_PSEP),$(LIBDIR)/$(SHLIB))
ln -sf $(SHLIB) $@
endif
ifneq ($(EXE),)
-$(BINDIR)/$(EXE): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
+$(subst /,$(HOST_PSEP),$(BINDIR)/$(EXE)): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
if test ! -d $(BINDIR); then $(subst @@,$(subst /,$(HOST_PSEP),$(BINDIR)),$(HOST_MKDIR)); fi
$(LD) $(LDOUT)$(subst /,$(HOST_PSEP),$(BINDIR)/$(EXE)) \
$(subst /,$(HOST_PSEP),$(OBJS)) $($(APP)_LDFLAGS)
diff --git a/pjlib/build/os-auto.mak.in b/pjlib/build/os-auto.mak.in
index 8640255..3f35dce 100644
--- a/pjlib/build/os-auto.mak.in
+++ b/pjlib/build/os-auto.mak.in
@@ -29,10 +29,7 @@ export TEST_LDFLAGS += @LDFLAGS@ @LIBS@
# TARGETS are make targets in the Makefile, to be executed for this given
# operating system.
#
-export TARGETS = $(PJLIB_LIB) $(TEST_EXE)
-ifneq ($(PJ_SHARED_LIBRARIES),)
-export TARGETS += $(PJLIB_SONAME)
-endif
+export TARGETS = $(PJLIB_LIB) $(PJLIB_SONAME) $(TEST_EXE)
diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
index aeb7f0b..73a1315 100644
--- a/pjmedia/build/Makefile
+++ b/pjmedia/build/Makefile
@@ -172,7 +172,7 @@ 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) \
+ $(PJMEDIA_AUDIODEV_LIB) $(PJMEDIA_AUDIODEV_SONAME) \
$(PJSDP_LIB) $(PJSDP_SONAME) \
$(PJMEDIA_TEST_EXE)
diff --git a/pjmedia/include/pjmedia-videodev/config.h b/pjmedia/include/pjmedia-videodev/config.h
index 2ce0ca5..84042dc 100644
--- a/pjmedia/include/pjmedia-videodev/config.h
+++ b/pjmedia/include/pjmedia-videodev/config.h
@@ -26,6 +26,7 @@
#include <pjmedia/types.h>
#include <pj/pool.h>
+
PJ_BEGIN_DECL
/**
@@ -153,6 +154,7 @@ PJ_BEGIN_DECL
PJ_END_DECL
+
#endif /* __PJMEDIA_VIDEODEV_CONFIG_H__ */
/*
diff --git a/pjmedia/src/pjmedia/format.c b/pjmedia/src/pjmedia/format.c
index 1cf5ed1..5e1d253 100644
--- a/pjmedia/src/pjmedia/format.c
+++ b/pjmedia/src/pjmedia/format.c
@@ -72,6 +72,7 @@ PJ_DEF(pjmedia_format*) pjmedia_format_copy(pjmedia_format *dst,
#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+
static pj_status_t apply_packed_fmt(const pjmedia_video_format_info *fi,
pjmedia_video_apply_fmt_param *aparam);
diff --git a/pjmedia/src/test/vid_dev_test.c b/pjmedia/src/test/vid_dev_test.c
index 1c37e38..82f3def 100644
--- a/pjmedia/src/test/vid_dev_test.c
+++ b/pjmedia/src/test/vid_dev_test.c
@@ -26,6 +26,7 @@
#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+
#define THIS_FILE "vid_dev_test.c"
#define LOOP_DURATION 10