Added suppor /and fix things for SunOS port

git-svn-id: http://svn.pjsip.org/repos/pjproject/main@2 74dad513-b988-da41-8d7b-12977e46ad98

4 files changed, 248 insertions, 248 deletions

diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
index 08b24b04..cc650fe4 100644
--- a/pjmedia/build/Makefile
+++ b/pjmedia/build/Makefile
@@ -1,67 +1,67 @@
-include make-$(TARGET).inc

-

-export PJMEDIA_SRCEXT = .c

-export PJMEDIA_SRCDIR = ../src/pjmedia

-export PJMEDIA_SRCS = 	$(PJMEDIA_SOURCES) codec.c jbuf.c rtp.c mediamgr.c \

-		      	session.c g711.c  rtcp.c  stream.c sdp.c pasound.c \

-		      	$(PA_DIR)/pa_allocation.c \

-			$(PA_DIR)/pa_converters.c \

-			$(PA_DIR)/pa_cpuload.c \

-			$(PA_DIR)/pa_dither.c \

-			$(PA_DIR)/pa_front.c \

-			$(PA_DIR)/pa_process.c \

-			$(PA_DIR)/pa_skeleton.c \

-			$(PA_DIR)/pa_stream.c \

-			$(PA_DIR)/pa_trace.c

-

-export TEST_SRCEXT = .c

-export TEST_SRCDIR = ../src/test

-export TEST_SRCS = $(TEST_SOURCES) jbuf_test.c rtp_test.c main.c \

-		session_test.c sdptest.c

-		   

-

-export PJAUT_SRCEXT = .c

-export PJAUT_SRCDIR = ../src/test

-export PJAUT_SRCS = $(PJAUT_SOURCES) audio_tool.c

-

-export CCOUT CC AR RANLIB MV RM RMDIR MKDIR OBJEXT LD LDOUT 

-

-all: pjmedia test pjaut

-

-doc:

-	cd .. && doxygen docs/doxygen.cfg

-

-print:

-	$(MAKE) -f make-rules APP=PJMEDIA app=pjmedia print_lib

-	$(MAKE) -f make-rules APP=TEST app=test print_bin

-	$(MAKE) -f make-rules APP=PJAUT app=pjaut print_bin

-	

-depend:

-	$(MAKE) -f make-rules APP=PJMEDIA app=pjmedia depend

-	$(MAKE) -f make-rules APP=TEST app=test depend

-	$(MAKE) -f make-rules APP=PJAUT app=pjaut depend

-

-dep: depend

-

-pjmedia:

-	$(MAKE) -f make-rules APP=PJMEDIA app=pjmedia $(PJMEDIA_LIB)

-

-test:

-	$(MAKE) -f make-rules APP=TEST app=test $(TEST_EXE)

-

-pjaut:

-	$(MAKE) -f make-rules APP=PJAUT app=pjaut $(PJAUT_EXE)

-	

-clean:

-	$(MAKE) -f make-rules APP=PJMEDIA app=pjmedia clean

-	$(MAKE) -f make-rules APP=TEST app=test clean

-	$(MAKE) -f make-rules APP=PJAUT app=pjaut clean

-

-realclean:

-	$(MAKE) -f make-rules APP=PJMEDIA app=pjmedia realclean

-	$(MAKE) -f make-rules APP=TEST app=test realclean

-	$(MAKE) -f make-rules APP=PJAUT app=pjaut realclean

-

-distclean: realclean

-

-

+include make-$(TARGET).inc
+
+export PJMEDIA_SRCEXT = .c
+export PJMEDIA_SRCDIR = ../src/pjmedia
+export PJMEDIA_SRCS = 	$(PJMEDIA_SOURCES) codec.c jbuf.c rtp.c mediamgr.c \
+		      	session.c g711.c  rtcp.c  stream.c sdp.c pasound.c \
+		      	$(PA_DIR)/pa_allocation.c \
+			$(PA_DIR)/pa_converters.c \
+			$(PA_DIR)/pa_cpuload.c \
+			$(PA_DIR)/pa_dither.c \
+			$(PA_DIR)/pa_front.c \
+			$(PA_DIR)/pa_process.c \
+			$(PA_DIR)/pa_skeleton.c \
+			$(PA_DIR)/pa_stream.c \
+			$(PA_DIR)/pa_trace.c
+
+export TEST_SRCEXT = .c
+export TEST_SRCDIR = ../src/test
+export TEST_SRCS = $(TEST_SOURCES) jbuf_test.c rtp_test.c main.c \
+		session_test.c sdptest.c
+		   
+
+export PJAUT_SRCEXT = .c
+export PJAUT_SRCDIR = ../src/test
+export PJAUT_SRCS = $(PJAUT_SOURCES) audio_tool.c
+
+export CCOUT CC AR RANLIB MV RM RMDIR MKDIR OBJEXT LD LDOUT 
+
+all: pjmedia test pjaut
+
+doc:
+	cd .. && doxygen docs/doxygen.cfg
+
+print:
+	$(MAKE) -f make-rules APP=PJMEDIA app=pjmedia print_lib
+	$(MAKE) -f make-rules APP=TEST app=test print_bin
+	$(MAKE) -f make-rules APP=PJAUT app=pjaut print_bin
+	
+depend:
+	$(MAKE) -f make-rules APP=PJMEDIA app=pjmedia depend
+	$(MAKE) -f make-rules APP=TEST app=test depend
+	$(MAKE) -f make-rules APP=PJAUT app=pjaut depend
+
+dep: depend
+
+pjmedia:
+	$(MAKE) -f make-rules APP=PJMEDIA app=pjmedia $(PJMEDIA_LIB)
+
+test:
+	$(MAKE) -f make-rules APP=TEST app=test $(TEST_EXE)
+
+pjaut:
+	$(MAKE) -f make-rules APP=PJAUT app=pjaut $(PJAUT_EXE)
+	
+clean:
+	$(MAKE) -f make-rules APP=PJMEDIA app=pjmedia clean
+	$(MAKE) -f make-rules APP=TEST app=test clean
+	$(MAKE) -f make-rules APP=PJAUT app=pjaut clean
+
+realclean:
+	$(MAKE) -f make-rules APP=PJMEDIA app=pjmedia realclean
+	$(MAKE) -f make-rules APP=TEST app=test realclean
+	$(MAKE) -f make-rules APP=PJAUT app=pjaut realclean
+
+distclean: realclean
+
+
diff --git a/pjmedia/build/make-linux-i386.inc b/pjmedia/build/make-linux-i386.inc
index cddeb2f8..e09320bf 100644
--- a/pjmedia/build/make-linux-i386.inc
+++ b/pjmedia/build/make-linux-i386.inc
@@ -1,32 +1,32 @@
-include ../../pjlib/build/make-$(TARGET).inc

-

-PA_DIR := portaudio

-PA_CFLAGS := 	-DPA_LITTLE_ENDIAN -DPA_USE_OSS \

-		-I$(PA_DIR) -I../src/pjmedia/portaudio

-

-_CFLAGS := $(_CFLAGS) -I../src -I../../pjlib/src $(PA_CFLAGS)

-_LDFLAGS := $(_LDFLAGS) -L../lib -L../../pjlib/lib \

-		      -lpjmedia -lpj -lpthread

-

-export PA_SOURCES :=	$(PA_DIR)/pa_unix_hostapis.c \

-			$(PA_DIR)/pa_unix_util.c \

-			$(PA_DIR)/pa_unix_oss.c

-#			$(PA_DIR)/pa_linux_alsa.c

-

-

-export PJMEDIA_SOURCES = $(PA_SOURCES)

-export PJMEDIA_CFLAGS = $(_CFLAGS) 

-export PJMEDIA_LIB = ../lib/libpjmedia.a

-export PJMEDIA_EXTRA_DEP := ../../pjlib/build/$(PJLIB_LIB)

-

-export TEST_EXE := ../bin/test_linux

-export TEST_SOURCES := 

-export TEST_CFLAGS := $(PJMEDIA_CFLAGS)

-export TEST_LDFLAGS := $(_LDFLAGS)

-export TEST_EXTRA_DEP := $(PJMEDIA_LIB)

-

-export PJAUT_EXE := ../bin/pjaut_linux

-export PJAUT_SOURCES := 

-export PJAUT_CFLAGS := $(PJMEDIA_CFLAGS)

-export PJAUT_LDFLAGS = $(_LDFLAGS)

-export PJAUT_EXTRA_DEP := $(PJMEDIA_LIB)

+include ../../pjlib/build/make-$(TARGET).inc
+
+PA_DIR := portaudio
+PA_CFLAGS := 	-DPA_LITTLE_ENDIAN -DPA_USE_OSS \
+		-I$(PA_DIR) -I../src/pjmedia/portaudio
+
+_CFLAGS := $(_CFLAGS) -I../src -I../../pjlib/src $(PA_CFLAGS)
+_LDFLAGS := $(_LDFLAGS) -L../lib -L../../pjlib/lib \
+		      -lpjmedia -lpj -lpthread
+
+export PA_SOURCES :=	$(PA_DIR)/pa_unix_hostapis.c \
+			$(PA_DIR)/pa_unix_util.c \
+			$(PA_DIR)/pa_unix_oss.c
+#			$(PA_DIR)/pa_linux_alsa.c
+
+
+export PJMEDIA_SOURCES = $(PA_SOURCES)
+export PJMEDIA_CFLAGS = $(_CFLAGS) 
+export PJMEDIA_LIB = ../lib/libpjmedia.a
+export PJMEDIA_EXTRA_DEP := ../../pjlib/build/$(PJLIB_LIB)
+
+export TEST_EXE := ../bin/test_linux
+export TEST_SOURCES := 
+export TEST_CFLAGS := $(PJMEDIA_CFLAGS)
+export TEST_LDFLAGS := $(_LDFLAGS)
+export TEST_EXTRA_DEP := $(PJMEDIA_LIB)
+
+export PJAUT_EXE := ../bin/pjaut_linux
+export PJAUT_SOURCES := 
+export PJAUT_CFLAGS := $(PJMEDIA_CFLAGS)
+export PJAUT_LDFLAGS = $(_LDFLAGS)
+export PJAUT_EXTRA_DEP := $(PJMEDIA_LIB)
diff --git a/pjmedia/build/make-mingw.inc b/pjmedia/build/make-mingw.inc
index 3ee353c3..9db9fa7a 100644
--- a/pjmedia/build/make-mingw.inc
+++ b/pjmedia/build/make-mingw.inc
@@ -1,30 +1,30 @@
-include ../../pjlib/build/make-$(TARGET).inc

-

-PA_DIR := portaudio

-PA_CFLAGS := -DPA_NO_ASIO -DPA_NO_DS -I$(PA_DIR) -I../src/pjmedia/portaudio

-

-_CFLAGS := $(_CFLAGS) -I../src -I../../pjlib/src $(PA_CFLAGS)

-_LDFLAGS := -L../../pjlib/lib -lpjmedia $(_LDFLAGS) -lwinmm

-

-

-export PA_SOURCES := 	$(PA_DIR)/pa_win_hostapis.c \

-			$(PA_DIR)/pa_win_util.c \

-			$(PA_DIR)/pa_win_wmme.c

-#			$(PA_DIR)/pa_x86_plain_converters.c \

-

-export PJMEDIA_SOURCES := $(PA_SOURCES)

-export PJMEDIA_CFLAGS := $(_CFLAGS)

-export PJMEDIA_LIB := ../lib/libpjmedia.a

-export PJMEDIA_EXTRA_DEP := ../../pjlib/build/$(PJLIB_LIB)

-

-export TEST_EXE := ../bin/test_mingw.exe

-export TEST_SOURCES := 

-export TEST_CFLAGS := $(_CFLAGS)

-export TEST_LDFLAGS := $(_LDFLAGS)

-export TEST_EXTRA_DEP := $(PJMEDIA_LIB)

-

-export PJAUT_EXE := ../bin/pjaut_mingw.exe

-export PJAUT_SOURCES := 

-export PJAUT_CFLAGS = $(_CFLAGS)

-export PJAUT_LDFLAGS := $(_LDFLAGS)

-export PJAUT_EXTRA_DEP := $(PJMEDIA_LIB)

+include ../../pjlib/build/make-$(TARGET).inc
+
+PA_DIR := portaudio
+PA_CFLAGS := -DPA_NO_ASIO -DPA_NO_DS -I$(PA_DIR) -I../src/pjmedia/portaudio
+
+_CFLAGS := $(_CFLAGS) -I../src -I../../pjlib/src $(PA_CFLAGS)
+_LDFLAGS := -L../../pjlib/lib -lpjmedia $(_LDFLAGS) -lwinmm
+
+
+export PA_SOURCES := 	$(PA_DIR)/pa_win_hostapis.c \
+			$(PA_DIR)/pa_win_util.c \
+			$(PA_DIR)/pa_win_wmme.c
+#			$(PA_DIR)/pa_x86_plain_converters.c \
+
+export PJMEDIA_SOURCES := $(PA_SOURCES)
+export PJMEDIA_CFLAGS := $(_CFLAGS)
+export PJMEDIA_LIB := ../lib/libpjmedia.a
+export PJMEDIA_EXTRA_DEP := ../../pjlib/build/$(PJLIB_LIB)
+
+export TEST_EXE := ../bin/test_mingw.exe
+export TEST_SOURCES := 
+export TEST_CFLAGS := $(_CFLAGS)
+export TEST_LDFLAGS := $(_LDFLAGS)
+export TEST_EXTRA_DEP := $(PJMEDIA_LIB)
+
+export PJAUT_EXE := ../bin/pjaut_mingw.exe
+export PJAUT_SOURCES := 
+export PJAUT_CFLAGS = $(_CFLAGS)
+export PJAUT_LDFLAGS := $(_LDFLAGS)
+export PJAUT_EXTRA_DEP := $(PJMEDIA_LIB)
diff --git a/pjmedia/build/make-rules b/pjmedia/build/make-rules
index 5bc71e99..d33f5835 100644
--- a/pjmedia/build/make-rules
+++ b/pjmedia/build/make-rules
@@ -1,119 +1,119 @@
-LIBDIR = ../lib

-BINDIR = ../bin

-

-#

-# The full path of output lib file (e.g. ../lib/libapp.a).

-#

-LIB = $($(APP)_LIB)

-

-#

-# The full path of output executable file (e.g. ../bin/app.exe).

-#

-EXE = $($(APP)_EXE)

-

-#

-# Source directory

-#

-SRCDIR = $($(APP)_SRCDIR)

-

-#

-# SRCEXT is .c

-# SRCS is file.c

-# FULL_SRCS is ../src/app/file.c

-#

-SRCEXT = $($(APP)_SRCEXT)

-SRCS = $($(APP)_SRCS)

-FULL_SRCS = $(foreach file, $(SRCS), $(SRCDIR)/$(file))

-

-

-#

-# Output directory for object files (i.e. output/target)

-#

-OBJDIR = ./output/$(app)-$(TARGET)

-

-#

-# OBJS1 is ./output/target/file.c

-# OBJS is ./output/target/file.o

-#

-OBJS1 = $(foreach file, $(SRCS), $(OBJDIR)/$(file))

-OBJS = $(OBJS1:%$(SRCEXT)=%$(OBJEXT))

-OBJDIRS := $(sort $(foreach file, $(SRCS), $(dir $(OBJDIR)/$(file))))

-

-

-#

-# When generating dependency (gcc -MM), ideally we use only either

-# CFLAGS or CXXFLAGS (not both). But I just couldn't make if/ifeq to work.

-#

-DEPFLAGS = $($(APP)_CXXFLAGS) $($(APP)_CFLAGS)

-

-print_common:

-	@echo "###"

-	@echo "### DUMPING MAKE VARIABLES (I WON'T DO ANYTHING ELSE):"

-	@echo "###"

-	@echo APP=$(APP)

-	@echo SRCEXT=$(SRCEXT)

-	@echo OBJDIR=$(OBJDIR)

-	@echo OBJS=$(OBJS)

-	@echo SRCDIR=$(SRCDIR)

-	@echo FULL_SRCS=$(FULL_SRCS)

-	@echo $(APP)_CFLAGS=$($(APP)_CFLAGS)

-	@echo $(APP)_CXXFLAGS=$($(APP)_CXXFLAGS)

-	@echo $(APP)_LDFLAGS=$($(APP)_LDFLAGS)

-	@echo DEPFLAGS=$(DEPFLAGS)

-

-print_bin: print_common

-	@echo EXE=$(EXE)

-	@echo BINDIR=$(BINDIR)

-

-print_lib: print_common

-	@echo LIB=$(LIB)

-	@echo LIBDIR=$(LIBDIR)

-

-$(LIB): $(LIBDIR) $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)

-	$(AR) $(LIB) $(OBJS)

-	$(RANLIB) $(LIB)

-

-$(EXE): $(BINDIR) $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)

-	$(LD) $(LDOUT) $(EXE) $(OBJS) $($(APP)_LDFLAGS)

-

-$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.c

-	$(CC) $($(APP)_CFLAGS) $< $(CCOUT) $@

-

-$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cpp

-	$(CC) $($(APP)_CXXFLAGS) $< $(CCOUT) $@

-

-#$(OBJDIR):

-#	$(MKDIR) $(OBJDIR)

-$(OBJDIRS):

-	$(MKDIR) $@

-

-$(LIBDIR):

-	$(MKDIR) $(LIBDIR)

-

-$(BINDIR):

-	$(MKDIR) $(BINDIR)

-

-clean:

-	$(RM) -r $(OBJDIR)/*

-	$(RMDIR) $(OBJDIR)

-

-realclean: clean

-	$(RM) $(LIB) $(EXE)

-	$(RM) .$(app).depend

-

-depend:

-	$(RM) .$(app).depend

-	for F in $(FULL_SRCS); do \

-	   echo -n $(OBJDIR)/ >> .$(app).depend; \

-	   if gcc -MM $(DEPFLAGS) $$F >> .$(app).depend; then \

-		true; \

-	   else \

-		echo 'err:' >> .$(app).depend; \

-		exit 1; \

-	   fi; \

-	done

-

-dep: depend

-

--include .$(app).depend

-

+LIBDIR = ../lib
+BINDIR = ../bin
+
+#
+# The full path of output lib file (e.g. ../lib/libapp.a).
+#
+LIB = $($(APP)_LIB)
+
+#
+# The full path of output executable file (e.g. ../bin/app.exe).
+#
+EXE = $($(APP)_EXE)
+
+#
+# Source directory
+#
+SRCDIR = $($(APP)_SRCDIR)
+
+#
+# SRCEXT is .c
+# SRCS is file.c
+# FULL_SRCS is ../src/app/file.c
+#
+SRCEXT = $($(APP)_SRCEXT)
+SRCS = $($(APP)_SRCS)
+FULL_SRCS = $(foreach file, $(SRCS), $(SRCDIR)/$(file))
+
+
+#
+# Output directory for object files (i.e. output/target)
+#
+OBJDIR = ./output/$(app)-$(TARGET)
+
+#
+# OBJS1 is ./output/target/file.c
+# OBJS is ./output/target/file.o
+#
+OBJS1 = $(foreach file, $(SRCS), $(OBJDIR)/$(file))
+OBJS = $(OBJS1:%$(SRCEXT)=%$(OBJEXT))
+OBJDIRS := $(sort $(foreach file, $(SRCS), $(dir $(OBJDIR)/$(file))))
+
+
+#
+# When generating dependency (gcc -MM), ideally we use only either
+# CFLAGS or CXXFLAGS (not both). But I just couldn't make if/ifeq to work.
+#
+DEPFLAGS = $($(APP)_CXXFLAGS) $($(APP)_CFLAGS)
+
+print_common:
+	@echo "###"
+	@echo "### DUMPING MAKE VARIABLES (I WON'T DO ANYTHING ELSE):"
+	@echo "###"
+	@echo APP=$(APP)
+	@echo SRCEXT=$(SRCEXT)
+	@echo OBJDIR=$(OBJDIR)
+	@echo OBJS=$(OBJS)
+	@echo SRCDIR=$(SRCDIR)
+	@echo FULL_SRCS=$(FULL_SRCS)
+	@echo $(APP)_CFLAGS=$($(APP)_CFLAGS)
+	@echo $(APP)_CXXFLAGS=$($(APP)_CXXFLAGS)
+	@echo $(APP)_LDFLAGS=$($(APP)_LDFLAGS)
+	@echo DEPFLAGS=$(DEPFLAGS)
+
+print_bin: print_common
+	@echo EXE=$(EXE)
+	@echo BINDIR=$(BINDIR)
+
+print_lib: print_common
+	@echo LIB=$(LIB)
+	@echo LIBDIR=$(LIBDIR)
+
+$(LIB): $(LIBDIR) $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
+	$(AR) $(LIB) $(OBJS)
+	$(RANLIB) $(LIB)
+
+$(EXE): $(BINDIR) $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
+	$(LD) $(LDOUT) $(EXE) $(OBJS) $($(APP)_LDFLAGS)
+
+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.c
+	$(CC) $($(APP)_CFLAGS) $< $(CCOUT) $@
+
+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cpp
+	$(CC) $($(APP)_CXXFLAGS) $< $(CCOUT) $@
+
+#$(OBJDIR):
+#	$(MKDIR) $(OBJDIR)
+$(OBJDIRS):
+	$(MKDIR) $@
+
+$(LIBDIR):
+	$(MKDIR) $(LIBDIR)
+
+$(BINDIR):
+	$(MKDIR) $(BINDIR)
+
+clean:
+	$(RM) -r $(OBJDIR)/*
+	$(RMDIR) $(OBJDIR)
+
+realclean: clean
+	$(RM) $(LIB) $(EXE)
+	$(RM) .$(app).depend
+
+depend:
+	$(RM) .$(app).depend
+	for F in $(FULL_SRCS); do \
+	   echo -n $(OBJDIR)/ >> .$(app).depend; \
+	   if gcc -MM $(DEPFLAGS) $$F >> .$(app).depend; then \
+		true; \
+	   else \
+		echo 'err:' >> .$(app).depend; \
+		exit 1; \
+	   fi; \
+	done
+
+dep: depend
+
+-include .$(app).depend
+