Switch to using external pjproject libraries.

ICE/STUN/TURN support in res_rtp_asterisk is also now optional.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@382900 65c4cc65-6c06-0410-ace0-fbb531ad65f3

40 files changed, 0 insertions, 793 deletions

diff --git a/res/pjproject/build/cc-auto.mak.in b/res/pjproject/build/cc-auto.mak.in
deleted file mode 100644
index 2530e210b..000000000
--- a/res/pjproject/build/cc-auto.mak.in
+++ /dev/null
@@ -1,22 +0,0 @@
-export CC = @CC@ -c
-export CXX = @CXX@ -c
-export AR = @AR@
-export AR_FLAGS = @AR_FLAGS@
-export LD = @LD@
-export LDOUT = -o 
-export RANLIB = @RANLIB@
-
-export OBJEXT := .@OBJEXT@
-export LIBEXT := .@LIBEXT@
-export LIBEXT2 := @LIBEXT2@
-
-export CC_OUT := @CC_OUT@
-export CC_INC := @CC_INC@
-export CC_DEF := @CC_DEF@
-export CC_OPTIMIZE := @CC_OPTIMIZE@
-export CC_LIB := -l
-
-export CC_SOURCES :=
-export CC_CFLAGS := @CC_CFLAGS@
-export CC_LDFLAGS :=
-
diff --git a/res/pjproject/build/cc-gcc.mak b/res/pjproject/build/cc-gcc.mak
deleted file mode 100644
index a3b4807e7..000000000
--- a/res/pjproject/build/cc-gcc.mak
+++ /dev/null
@@ -1,22 +0,0 @@
-export CC = $(CROSS_COMPILE)gcc -c
-export AR = $(CROSS_COMPILE)ar rv 
-export LD = $(CROSS_COMPILE)gcc
-export LDOUT = -o 
-export RANLIB = $(CROSS_COMPILE)ranlib
-
-export OBJEXT := .o
-export LIBEXT := .a
-export LIBEXT2 :=
-
-export CC_OUT := -o 
-export CC_INC := -I
-export CC_DEF := -D
-export CC_OPTIMIZE := -O2
-export CC_LIB := -l
-
-export CC_SOURCES :=
-export CC_CFLAGS := -Wall 
-#export CC_CFLAGS += -Wdeclaration-after-statement
-#export CC_CXXFLAGS := -Wdeclaration-after-statement
-export CC_LDFLAGS :=
-
diff --git a/res/pjproject/build/cc-vc.mak b/res/pjproject/build/cc-vc.mak
deleted file mode 100644
index 187372d1c..000000000
--- a/res/pjproject/build/cc-vc.mak
+++ /dev/null
@@ -1,20 +0,0 @@
-export CC := cl /c /nologo
-export AR := lib /NOLOGO /OUT:
-export LD := cl /nologo
-export LDOUT := /Fe
-export RANLIB := echo ranlib
-
-export OBJEXT := .obj
-export LIBEXT := .lib
-export LIBEXT2 := .LIB
-
-export CC_OUT := /Fo
-export CC_INC := /I
-export CC_DEF := /D
-export CC_OPTIMIZE := /Ox
-export CC_LIB :=
-
-export CC_SOURCES :=
-export CC_CFLAGS := /W4 /MT
-export CC_CXXFLAGS := /GX
-export CC_LDFLAGS := /MT 
diff --git a/res/pjproject/build/common.mak b/res/pjproject/build/common.mak
deleted file mode 100644
index ad6df03e9..000000000
--- a/res/pjproject/build/common.mak
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Include host/target/compiler selection.
-# This will export CC_NAME, MACHINE_NAME, OS_NAME, and HOST_NAME variables.
-#
-include $(PJDIR)/build.mak
-
-#
-# Include global compiler specific definitions
-#
-include $(PJDIR)/build/cc-$(CC_NAME).mak
-
-#
-# (Optionally) Include compiler specific configuration that is
-# specific to this project. This configuration file is
-# located in this directory.
-#
--include cc-$(CC_NAME).mak
-
-#
-# Include auto configured compiler specification.
-# This will override the compiler settings above.
-# Currently this is made OPTIONAL, to prevent people
-# from getting errors because they don't re-run ./configure
-# after downloading new PJSIP.
-#
--include $(PJDIR)/build/cc-auto.mak
-
-#
-# Include global machine specific definitions
-#
-include $(PJDIR)/build/m-$(MACHINE_NAME).mak
--include m-$(MACHINE_NAME).mak
-
-#
-# Include target OS specific definitions
-#
-include $(PJDIR)/build/os-$(OS_NAME).mak
-
-#
-# (Optionally) Include target OS specific configuration that is
-# specific to this project. This configuration file is
-# located in this directory.
-#
--include os-$(OS_NAME).mak
-
-#
-# Include host specific definitions
-#
-include $(PJDIR)/build/host-$(HOST_NAME).mak
-
-#
-# (Optionally) Include host specific configuration that is
-# specific to this project. This configuration file is
-# located in this directory.
-#
--include host-$(HOST_NAME).mak
-
-#
-# Include global user configuration, if any
-#
--include $(PJDIR)/user.mak
-
-
diff --git a/res/pjproject/build/host-mingw.mak b/res/pjproject/build/host-mingw.mak
deleted file mode 100644
index 94d03af32..000000000
--- a/res/pjproject/build/host-mingw.mak
+++ /dev/null
@@ -1,13 +0,0 @@
-export HOST_MV := mv
-export HOST_RM := rm -f @@
-export HOST_RMR := rm -rf @@
-export HOST_RMDIR := rm -rf @@
-export HOST_MKDIR := mkdir @@
-export HOST_EXE := .exe
-export HOST_PSEP := /
-
-export HOST_SOURCES :=
-export HOST_CFLAGS :=
-export HOST_CXXFLAGS :=
-export HOST_LDFLAGS := $(CC_LIB)stdc++$(LIBEXT2)
-
diff --git a/res/pjproject/build/host-unix.mak b/res/pjproject/build/host-unix.mak
deleted file mode 100644
index 0c62ac543..000000000
--- a/res/pjproject/build/host-unix.mak
+++ /dev/null
@@ -1,13 +0,0 @@
-export HOST_MV := mv
-export HOST_RM := rm -f @@
-export HOST_RMR := rm -rf @@
-export HOST_RMDIR := rm -rf @@
-export HOST_MKDIR := mkdir -p @@
-export HOST_EXE := $(HOST_EXE)
-export HOST_PSEP := /
-
-export HOST_SOURCES :=
-export HOST_CFLAGS :=
-export HOST_CXXFLAGS :=
-export HOST_LDFLAGS := 
-
diff --git a/res/pjproject/build/host-win32.mak b/res/pjproject/build/host-win32.mak
deleted file mode 100644
index 9d0b379fb..000000000
--- a/res/pjproject/build/host-win32.mak
+++ /dev/null
@@ -1,12 +0,0 @@
-export HOST_MV := ren
-export HOST_RM := if exist @@; del /F /Q @@
-export HOST_RMR := if exist @@; del /F /Q @@
-export HOST_RMDIR := if exist @@; rmdir @@
-export HOST_MKDIR := if not exist @@; mkdir @@
-export HOST_EXE := .exe
-export HOST_PSEP := \\
-
-export HOST_SOURCES :=
-export HOST_CFLAGS :=
-export HOST_CXXFLAGS :=
-export HOST_LDFLAGS :=
diff --git a/res/pjproject/build/m-alpha.mak b/res/pjproject/build/m-alpha.mak
deleted file mode 100644
index f1c750251..000000000
--- a/res/pjproject/build/m-alpha.mak
+++ /dev/null
@@ -1,4 +0,0 @@
-export M_CFLAGS := $(CC_DEF)PJ_M_ALPHA=1
-export M_CXXFLAGS :=
-export M_LDFLAGS :=
-export M_SOURCES :=
diff --git a/res/pjproject/build/m-arm.mak b/res/pjproject/build/m-arm.mak
deleted file mode 100644
index 43a1ef2b3..000000000
--- a/res/pjproject/build/m-arm.mak
+++ /dev/null
@@ -1,4 +0,0 @@
-export M_CFLAGS := $(CC_DEF)PJ_M_ARMV4=1
-export M_CXXFLAGS :=
-export M_LDFLAGS :=
-export M_SOURCES :=
diff --git a/res/pjproject/build/m-auto.mak b/res/pjproject/build/m-auto.mak
deleted file mode 100644
index 3bd2ac349..000000000
--- a/res/pjproject/build/m-auto.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Nothing needs to be defined here
diff --git a/res/pjproject/build/m-i386.mak b/res/pjproject/build/m-i386.mak
deleted file mode 100644
index 1a8229d71..000000000
--- a/res/pjproject/build/m-i386.mak
+++ /dev/null
@@ -1,4 +0,0 @@
-export M_CFLAGS := $(CC_DEF)PJ_M_I386=1
-export M_CXXFLAGS :=
-export M_LDFLAGS :=
-export M_SOURCES :=
diff --git a/res/pjproject/build/m-m68k.mak b/res/pjproject/build/m-m68k.mak
deleted file mode 100644
index 265a6eae9..000000000
--- a/res/pjproject/build/m-m68k.mak
+++ /dev/null
@@ -1,4 +0,0 @@
-export M_CFLAGS := $(CC_DEF)PJ_M_M68K=1
-export M_CXXFLAGS :=
-export M_LDFLAGS :=
-export M_SOURCES :=
diff --git a/res/pjproject/build/m-mpc860.mak b/res/pjproject/build/m-mpc860.mak
deleted file mode 100644
index 04ff94711..000000000
--- a/res/pjproject/build/m-mpc860.mak
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# PowerPC MPC860 specific.
-# It's a PowerPC without floating point support.
-#
-export M_CFLAGS := $(CC_DEF)PJ_M_POWERPC=1 $(CC_DEF)PJ_HAS_FLOATING_POINT=0 -mcpu=860
-export M_CXXFLAGS :=
-export M_LDFLAGS := -mcpu=860
-export M_SOURCES :=
-
diff --git a/res/pjproject/build/m-powerpc.mak b/res/pjproject/build/m-powerpc.mak
deleted file mode 100644
index 6a8d44830..000000000
--- a/res/pjproject/build/m-powerpc.mak
+++ /dev/null
@@ -1,4 +0,0 @@
-export M_CFLAGS := $(CC_DEF)PJ_M_POWERPC=1
-export M_CXXFLAGS :=
-export M_LDFLAGS :=
-export M_SOURCES :=
diff --git a/res/pjproject/build/m-sparc.mak b/res/pjproject/build/m-sparc.mak
deleted file mode 100644
index fa27aacc5..000000000
--- a/res/pjproject/build/m-sparc.mak
+++ /dev/null
@@ -1,4 +0,0 @@
-export M_CFLAGS := $(CC_DEF)PJ_M_SPARC=1
-export M_CXXFLAGS :=
-export M_LDFLAGS :=
-export M_SOURCES :=
diff --git a/res/pjproject/build/m-x86_64.mak b/res/pjproject/build/m-x86_64.mak
deleted file mode 100644
index 5e847e9c0..000000000
--- a/res/pjproject/build/m-x86_64.mak
+++ /dev/null
@@ -1,4 +0,0 @@
-export M_CFLAGS := $(CC_DEF)PJ_M_X86_64=1
-export M_CXXFLAGS :=
-export M_LDFLAGS :=
-export M_SOURCES :=
diff --git a/res/pjproject/build/os-auto.mak.in b/res/pjproject/build/os-auto.mak.in
deleted file mode 100644
index 3d99927e5..000000000
--- a/res/pjproject/build/os-auto.mak.in
+++ /dev/null
@@ -1,11 +0,0 @@
-# @configure_input@
-
-export OS_CFLAGS   := $(CC_DEF)PJ_AUTOCONF=1 @CFLAGS@
-
-export OS_CXXFLAGS := $(CC_DEF)PJ_AUTOCONF=1 @CXXFLAGS@
-
-export OS_LDFLAGS  := @LDFLAGS@ @LIBS@
-
-export OS_SOURCES  := 
-
-
diff --git a/res/pjproject/build/os-darwinos.mak b/res/pjproject/build/os-darwinos.mak
deleted file mode 100644
index 9db31a160..000000000
--- a/res/pjproject/build/os-darwinos.mak
+++ /dev/null
@@ -1,9 +0,0 @@
-export OS_CFLAGS   := $(CC_DEF)PJ_DARWINOS=1
-
-export OS_CXXFLAGS := 
-
-export OS_LDFLAGS  := $(CC_LIB)pthread$(LIBEXT2) -framework CoreAudio -lm
-
-export OS_SOURCES  := 
-
-
diff --git a/res/pjproject/build/os-linux-kernel.mak b/res/pjproject/build/os-linux-kernel.mak
deleted file mode 100644
index f5591161a..000000000
--- a/res/pjproject/build/os-linux-kernel.mak
+++ /dev/null
@@ -1,43 +0,0 @@
-
-include $(KERNEL_DIR)/.config
-
-#
-# Basic kernel compilation flags.
-#
-export OS_CFLAGS   := $(CC_DEF)PJ_LINUX_KERNEL=1 -D__KERNEL__  \
-		      -I$(KERNEL_DIR)/include -iwithprefix include \
-		      -nostdinc -msoft-float
-
-#
-# Additional kernel compilation flags are taken from the kernel Makefile
-# itself.
-#
-
-KERNEL_CFLAGS := \
-    $(shell cd $(KERNEL_DIR) ; \
-    make script SCRIPT='@echo $$(CFLAGS) $$(CFLAGS_MODULE)' $(KERNEL_ARCH))
-
-export OS_CFLAGS += $(KERNEL_CFLAGS)
-
-#		      -DMODULE -I$(KERNEL_DIR)/include  -nostdinc \
-#		      -Wstrict-prototypes \
-#		      -Wno-trigraphs -fno-strict-aliasing -fno-common \
-#		      -msoft-float -m32 -fno-builtin-sprintf -fno-builtin-log2\
-#		      -fno-builtin-puts -mpreferred-stack-boundary=2 \
-#		      -fno-unit-at-a-time -march=i686 -mregparm=3 \
-#		      -iwithprefix include
-
-#export OS_CFLAGS += -U__i386__ -Ui386 -D__arch_um__ -DSUBARCH=\"i386\" \
-#		    -D_LARGEFILE64_SOURCE -I$(KERNEL_DIR)/arch/um/include \
-#		    -Derrno=kernel_errno \
-#		    -I$(KERNEL_DIR)/arch/um/kernel/tt/include \
-#		    -I$(KERNEL_DIR)/arch/um/kernel/skas/include \
-		    
-
-export OS_CXXFLAGS := 
-
-export OS_LDFLAGS  :=  
-
-export OS_SOURCES  := 
-
-
diff --git a/res/pjproject/build/os-linux.mak b/res/pjproject/build/os-linux.mak
deleted file mode 100644
index d3783b843..000000000
--- a/res/pjproject/build/os-linux.mak
+++ /dev/null
@@ -1,9 +0,0 @@
-export OS_CFLAGS   := $(CC_DEF)PJ_LINUX=1
-
-export OS_CXXFLAGS := 
-
-export OS_LDFLAGS  := -lportaudio-$(TARGET_NAME) -lgsmcodec-$(TARGET_NAME) -lilbccodec-$(TARGET_NAME) -lspeex-$(TARGET_NAME) -lresample-$(TARGET_NAME) $(CC_LIB)pthread$(LIBEXT2) -lm
-
-export OS_SOURCES  := 
-
-
diff --git a/res/pjproject/build/os-palmos.mak b/res/pjproject/build/os-palmos.mak
deleted file mode 100644
index 43f83bb3e..000000000
--- a/res/pjproject/build/os-palmos.mak
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# make-mingw.inc: Mingw specific compilation switches.
-#
-PALM_OS_SDK_VER := 0x06000000
-PALM_OS_TARGET_HOST := TARGET_HOST_PALMOS
-PALM_OS_TARGET_PLATFORM := TARGET_PLATFORM_PALMSIM_WIN32
-PALM_OS_BUILD_TYPE := BUILD_TYPE_DEBUG
-PALM_OS_TRACE_OUTPUT := TRACE_OUTPUT_ON
-PALM_OS_CPU_TYPE := CPU_ARM
-
-export CROSS_COMPILE := 
-
-ifeq ($(CC_NAME),gcc)
-	export CFLAGS += -mno-cygwin -fexceptions -frtti
-endif
-
-export OS_CFLAGS   := 	$(CC_DEF)PJ_PALMOS=1 \
-			$(CC_DEF)__PALMOS_KERNEL__=1 \
-			$(CC_DEF)__PALMOS__=$(PALM_OS_SDK_VER) \
-			$(CC_DEF)BUILD_TYPE=$(PALM_OS_BUILD_TYPE) \
-			$(CC_DEF)TRACE_OUTPUT=$(PALM_OS_TRACE_OUTPUT) \
-			$(CC_DEF)_SUPPORTS_NAMESPACE=0 \
-			$(CC_DEF)_SUPPORTS_RTTI=0 \
-			$(CC_DEF)TARGET_HOST=$(PALM_OS_TRAGET_HOST) \
-			$(CC_DEF)TARGET_PLATFORM=$(PALM_OS_TARGET_PLATFORM)
-
-export OS_CXXFLAGS := 
-
-export OS_LDFLAGS  := 
-
-export OS_SOURCES := 
-
diff --git a/res/pjproject/build/os-rtems.mak b/res/pjproject/build/os-rtems.mak
deleted file mode 100644
index af99dbfc1..000000000
--- a/res/pjproject/build/os-rtems.mak
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Global OS specific configurations for RTEMS OS.
-#
-# Thanks Zetron, Inc and Phil Torre <ptorre@zetron.com> for donating PJLIB
-# port to RTEMS.
-#
-export RTEMS_DEBUG := -ggdb3 -DRTEMS_DEBUG -DDEBUG -qrtems_debug 
-
-export OS_CFLAGS   := $(CC_DEF)PJ_RTEMS=1 \
-	-B$(RTEMS_LIBRARY_PATH)/lib/ -specs bsp_specs -qrtems
-
-export OS_CXXFLAGS := 
-
-export OS_LDFLAGS  := -B$(RTEMS_LIBRARY_PATH)/lib/ -specs bsp_specs -qrtems  -lm
-
-export OS_SOURCES  := 
-
diff --git a/res/pjproject/build/os-sunos.mak b/res/pjproject/build/os-sunos.mak
deleted file mode 100644
index 608f9ebb4..000000000
--- a/res/pjproject/build/os-sunos.mak
+++ /dev/null
@@ -1,13 +0,0 @@
-export OS_CFLAGS   := $(CC_DEF)PJ_SUNOS=1
-
-export OS_CXXFLAGS := 
-
-export OS_LDFLAGS  := $(CC_LIB)pthread$(LIBEXT2) \
-		      $(CC_LIB)socket$(LIBEXT2) \
-		      $(CC_LIB)rt$(LIBEXT2) \
-		      $(CC_LIB)nsl$(LIBEXT2) \
-		      $(CC_LIB)m$(LIBEXT2)
-
-export OS_SOURCES  := 
-
-
diff --git a/res/pjproject/build/os-win32.mak b/res/pjproject/build/os-win32.mak
deleted file mode 100644
index 816a97f13..000000000
--- a/res/pjproject/build/os-win32.mak
+++ /dev/null
@@ -1,12 +0,0 @@
-export OS_CFLAGS   := $(CC_DEF)PJ_WIN32=1
-
-export OS_CXXFLAGS := 
-
-export OS_LDFLAGS  := $(CC_LIB)wsock32$(LIBEXT2) \
-		      $(CC_LIB)ws2_32$(LIBEXT2)\
-		      $(CC_LIB)ole32$(LIBEXT2)\
-		      $(CC_LIB)m$(LIBEXT2)
-
-export OS_SOURCES  := 
-
-
diff --git a/res/pjproject/build/rules.mak b/res/pjproject/build/rules.mak
deleted file mode 100644
index 15ae66727..000000000
--- a/res/pjproject/build/rules.mak
+++ /dev/null
@@ -1,195 +0,0 @@
-ifeq ($(LIBDIR),)
-LIBDIR = ../lib
-endif
-ifeq ($(BINDIR),)
-BINDIR = ../bin
-endif
-
-#
-# The full path of output lib file (e.g. ../lib/libapp.a).
-#
-LIB = $($(APP)_LIB)
-
-#
-# The full path of output lib file (e.g. ../lib/libapp.a).
-#
-SHLIB = $($(APP)_SHLIB)
-
-#
-# The full path of output executable file (e.g. ../bin/app.exe).
-#
-EXE = $($(APP)_EXE)
-
-#
-# Source directory
-#
-SRCDIR = $($(APP)_SRCDIR)
-
-#
-# Output directory for object files (i.e. output/target)
-#
-OBJDIR = output/$(app)-$(TARGET_NAME)
-
-ifeq ($(OS_NAME),linux-kernel)
-export $(APP)_CFLAGS += -DKBUILD_MODNAME=$(app) -DKBUILD_BASENAME=$(app)
-endif
-
-
-#
-# OBJS is ./output/target/file.o
-#
-OBJS = $(foreach file, $($(APP)_OBJS), $(OBJDIR)/$(file))
-OBJDIRS := $(sort $(dir $(OBJS)))
-
-#
-# FULL_SRCS is ../src/app/file1.c ../src/app/file1.S
-#
-FULL_SRCS = $(foreach file, $($(APP)_OBJS), $(SRCDIR)/$(basename $(file)).m $(SRCDIR)/$(basename $(file)).c $(SRCDIR)/$(basename $(file)).cpp $(SRCDIR)/$(basename $(file)).S)
-
-#
-# 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)
-
-# Dependency file
-DEP_FILE := .$(app)-$(TARGET_NAME).depend
-
-
-print_common:
-	@echo "###"
-	@echo "### DUMPING MAKE VARIABLES (I WON'T DO ANYTHING ELSE):"
-	@echo "###"
-	@echo APP=$(APP)
-	@echo OBJDIR=$(OBJDIR)
-	@echo OBJDIRS=$(OBJDIRS)
-	@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)
-	@echo CC=$(CC)
-	@echo AR=$(AR)
-	@echo AR_FLAGS=$(AR_FLAGS)
-	@echo RANLIB=$(RANLIB)
-
-print_bin: print_common
-	@echo EXE=$(EXE)
-	@echo BINDIR=$(BINDIR)
-
-print_lib: print_common
-	@echo LIB=$(LIB)
-	@echo LIBDIR=$(LIBDIR)
-
-$(LIB): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
-	if test ! -d $(LIBDIR); then $(subst @@,$(subst /,$(HOST_PSEP),$(LIBDIR)),$(HOST_MKDIR)); fi
-	$(AR) $(AR_FLAGS) $(LIB) $(OBJS)
-	$(RANLIB) $(LIB)
-
-$(SHLIB): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
-	if test ! -d $(LIBDIR); then $(subst @@,$(subst /,$(HOST_PSEP),$(LIBDIR)),$(HOST_MKDIR)); fi
-	$(LD) $(LDOUT)$(subst /,$(HOST_PSEP),$(SHLIB)) \
-	    $(subst /,$(HOST_PSEP),$(OBJS)) $($(APP)_LDFLAGS)
-
-$(EXE): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
-	if test ! -d $(BINDIR); then $(subst @@,$(subst /,$(HOST_PSEP),$(BINDIR)),$(HOST_MKDIR)); fi
-	$(LD) $(LDOUT)$(subst /,$(HOST_PSEP),$(EXE)) \
-	    $(subst /,$(HOST_PSEP),$(OBJS)) $($(APP)_LDFLAGS)
-
-$(OBJDIR)/$(app).o: $(OBJDIRS) $(OBJS)
-	$(CROSS_COMPILE)ld -r -o $@ $(OBJS)
-
-$(OBJDIR)/$(app).ko: $(OBJDIR)/$(app).o
-	@echo Creating kbuild Makefile...
-	@echo "# Our module name:" > $(OBJDIR)/Makefile
-	@echo 'obj-m += $(app).o' >> $(OBJDIR)/Makefile
-	@echo >> $(OBJDIR)/Makefile
-	@echo "# Object members:" >> $(OBJDIR)/Makefile
-	@echo -n '$(app)-objs += ' >> $(OBJDIR)/Makefile
-	@for file in $($(APP)_OBJS); do \
-		echo -n "$$file " >> $(OBJDIR)/Makefile; \
-	done
-	@echo >> $(OBJDIR)/Makefile
-	@echo >> $(OBJDIR)/Makefile
-	@echo "# Prevent .o files to be built by kbuild:" >> $(OBJDIR)/Makefile
-	@for file in $($(APP)_OBJS); do \
-		echo ".PHONY: `pwd`/$(OBJDIR)/$$file" >> $(OBJDIR)/Makefile; \
-	done
-	@echo >> $(OBJDIR)/Makefile
-	@echo all: >> $(OBJDIR)/Makefile
-	@echo -e "\tmake -C $(KERNEL_DIR) M=`pwd`/$(OBJDIR) modules $(KERNEL_ARCH)" >> $(OBJDIR)/Makefile
-	@echo Invoking kbuild...
-	make -C $(OBJDIR)
-
-../lib/$(app).ko: $(LIB) $(OBJDIR)/$(app).ko
-	cp $(OBJDIR)/$(app).ko ../lib
-
-$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.m
-	$(CC) $($(APP)_CFLAGS) \
-		$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
-		$(subst /,$(HOST_PSEP),$<) 
-
-$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.c
-	$(CC) $($(APP)_CFLAGS) \
-		$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
-		$(subst /,$(HOST_PSEP),$<) 
-
-$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.S
-	$(CC) $($(APP)_CFLAGS) \
-		$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
-		$(subst /,$(HOST_PSEP),$<) 
-
-$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cpp
-	$(CC) $($(APP)_CXXFLAGS) \
-		$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
-		$(subst /,$(HOST_PSEP),$<)
-
-$(OBJDIRS):
-	$(subst @@,$(subst /,$(HOST_PSEP),$@),$(HOST_MKDIR)) 
-
-$(LIBDIR):
-	$(subst @@,$(subst /,$(HOST_PSEP),$(LIBDIR)),$(HOST_MKDIR))
-
-$(BINDIR):
-	$(subst @@,$(subst /,$(HOST_PSEP),$(BINDIR)),$(HOST_MKDIR))
-
-clean:
-	$(subst @@,$(subst /,$(HOST_PSEP),$(OBJDIR)/*),$(HOST_RMR))
-	$(subst @@,$(subst /,$(HOST_PSEP),$(OBJDIR)),$(HOST_RMDIR))
-ifeq ($(OS_NAME),linux-kernel)
-	rm -f ../lib/$(app).o
-endif
-
-gcov-report:
-	for file in $(FULL_SRCS); do \
-		gcov $$file -n -o $(OBJDIR); \
-	done
-
-realclean: clean
-	$(subst @@,$(subst /,$(HOST_PSEP),$(LIB)) $(subst /,$(HOST_PSEP),$(EXE)),$(HOST_RM))
-	$(subst @@,$(DEP_FILE),$(HOST_RM))
-ifeq ($(OS_NAME),linux-kernel)
-	rm -f ../lib/$(app).ko
-endif
-
-depend:
-	$(subst @@,$(DEP_FILE),$(HOST_RM))
-	for F in $(FULL_SRCS); do \
-	   if test -f $$F; then \
-	     echo "$(OBJDIR)/" | tr -d '\n' >> $(DEP_FILE); \
-	     if $(CC) -M $(DEPFLAGS) $$F | sed '/^#/d' >> $(DEP_FILE); then \
-		true; \
-	     else \
-		echo 'err:' >> $(DEP_FILE); \
-		rm -f $(DEP_FILE); \
-		exit 1; \
-	     fi; \
-	   fi; \
-	done;
-
-dep: depend
-
--include $(DEP_FILE)
-
diff --git a/res/pjproject/build/vs/pjproject-vs8-common-defaults.vsprops b/res/pjproject/build/vs/pjproject-vs8-common-defaults.vsprops
deleted file mode 100644
index f35dec27e..000000000
--- a/res/pjproject/build/vs/pjproject-vs8-common-defaults.vsprops
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="pjproject-vs8-common-defaults"
-	OutputDirectory=".\output\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName)"
-	IntermediateDirectory="$(OutDir)"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		BrowseInformation="1"
-		WarningLevel="4"
-		CompileAs="0"
-	/>
-	<Tool
-		Name="VCLibrarianTool"
-		OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		OutputFile="..\bin\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"
-	/>
-	<UserMacro
-		Name="VSVer"
-		Value="8"
-	/>
-</VisualStudioPropertySheet>
diff --git a/res/pjproject/build/vs/pjproject-vs8-debug-defaults.vsprops b/res/pjproject/build/vs/pjproject-vs8-debug-defaults.vsprops
deleted file mode 100644
index 61995d936..000000000
--- a/res/pjproject/build/vs/pjproject-vs8-debug-defaults.vsprops
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="pjproject-vs8-debug-defaults"
-	InheritedPropertySheets=".\pjproject-vs8-common-defaults.vsprops"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		Optimization="0"
-		PreprocessorDefinitions="_DEBUG;DEBUG"
-		DebugInformationFormat="4"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		GenerateDebugInformation="true"
-		ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
-	/>
-</VisualStudioPropertySheet>
diff --git a/res/pjproject/build/vs/pjproject-vs8-debug-dynamic-defaults.vsprops b/res/pjproject/build/vs/pjproject-vs8-debug-dynamic-defaults.vsprops
deleted file mode 100644
index f121c8fd3..000000000
--- a/res/pjproject/build/vs/pjproject-vs8-debug-dynamic-defaults.vsprops
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="pjproject-vs8-debug-dynamic-defaults"
-	InheritedPropertySheets=".\pjproject-vs8-debug-defaults.vsprops"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		RuntimeLibrary="3"
-	/>
-</VisualStudioPropertySheet>
diff --git a/res/pjproject/build/vs/pjproject-vs8-debug-static-defaults.vsprops b/res/pjproject/build/vs/pjproject-vs8-debug-static-defaults.vsprops
deleted file mode 100644
index 0330723c3..000000000
--- a/res/pjproject/build/vs/pjproject-vs8-debug-static-defaults.vsprops
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="pjproject-vs8-debug-static-defaults"
-	InheritedPropertySheets=".\pjproject-vs8-debug-defaults.vsprops"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		RuntimeLibrary="1"
-	/>
-</VisualStudioPropertySheet>
diff --git a/res/pjproject/build/vs/pjproject-vs8-release-defaults.vsprops b/res/pjproject/build/vs/pjproject-vs8-release-defaults.vsprops
deleted file mode 100644
index 8579da549..000000000
--- a/res/pjproject/build/vs/pjproject-vs8-release-defaults.vsprops
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="pjproject-vs8-release-defaults"
-	InheritedPropertySheets=".\pjproject-vs8-common-defaults.vsprops"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		Optimization="2"
-		PreprocessorDefinitions="NDEBUG"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		LinkIncremental="1"
-	/>
-</VisualStudioPropertySheet>
diff --git a/res/pjproject/build/vs/pjproject-vs8-release-dynamic-defaults.vsprops b/res/pjproject/build/vs/pjproject-vs8-release-dynamic-defaults.vsprops
deleted file mode 100644
index 5e4f35a38..000000000
--- a/res/pjproject/build/vs/pjproject-vs8-release-dynamic-defaults.vsprops
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="pjproject-vs8-release-dynamic-defaults"
-	InheritedPropertySheets=".\pjproject-vs8-release-defaults.vsprops"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		RuntimeLibrary="2"
-	/>
-</VisualStudioPropertySheet>
diff --git a/res/pjproject/build/vs/pjproject-vs8-release-static-defaults.vsprops b/res/pjproject/build/vs/pjproject-vs8-release-static-defaults.vsprops
deleted file mode 100644
index 94d084d38..000000000
--- a/res/pjproject/build/vs/pjproject-vs8-release-static-defaults.vsprops
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="pjproject-vs8-release-static-defaults"
-	InheritedPropertySheets=".\pjproject-vs8-release-defaults.vsprops"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		RuntimeLibrary="0"
-	/>
-</VisualStudioPropertySheet>
diff --git a/res/pjproject/build/vs/pjproject-vs8-win32-common-defaults.vsprops b/res/pjproject/build/vs/pjproject-vs8-win32-common-defaults.vsprops
deleted file mode 100644
index 2cfd97872..000000000
--- a/res/pjproject/build/vs/pjproject-vs8-win32-common-defaults.vsprops
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="pjproject-vs8-win32-common-defaults"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		PreprocessorDefinitions="WIN32;PJ_WIN32=1;PJ_M_I386=1;"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		SubSystem="1"
-		TargetMachine="1"
-	/>
-	<UserMacro
-		Name="TargetCPU"
-		Value="i386"
-	/>
-</VisualStudioPropertySheet>
diff --git a/res/pjproject/build/vs/pjproject-vs8-win32-release-defaults.vsprops b/res/pjproject/build/vs/pjproject-vs8-win32-release-defaults.vsprops
deleted file mode 100644
index 6b696ae27..000000000
--- a/res/pjproject/build/vs/pjproject-vs8-win32-release-defaults.vsprops
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="pjproject-vs8-win32-release-defaults"
-	InheritedPropertySheets=".\pjproject-vs8-win32-common-defaults.vsprops"
-	>
-</VisualStudioPropertySheet>
diff --git a/res/pjproject/build/vs/pjproject-vs8-wm2003-common-defaults.vsprops b/res/pjproject/build/vs/pjproject-vs8-wm2003-common-defaults.vsprops
deleted file mode 100644
index 6b94917a0..000000000
--- a/res/pjproject/build/vs/pjproject-vs8-wm2003-common-defaults.vsprops
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="pjproject-vs8-wm2003-common-defaults"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
-		DebugInformationFormat="3"
-		DisableSpecificWarnings="4214;4201"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		AdditionalDependencies="secchk.lib ccrtrtti.lib"
-		SubSystem="9"
-		StackReserveSize="65536"
-		StackCommitSize="4096"
-		EntryPointSymbol="WinMainCRTStartup"
-		TargetMachine="3"
-	/>
-	<Tool
-		Name="VCResourceCompilerTool"
-		PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
-	/>
-	<UserMacro
-		Name="TargetCPU"
-		Value="armv4"
-	/>
-</VisualStudioPropertySheet>
diff --git a/res/pjproject/build/vs/pjproject-vs8-wm2003-release-defaults.vsprops b/res/pjproject/build/vs/pjproject-vs8-wm2003-release-defaults.vsprops
deleted file mode 100644
index 6c6ada608..000000000
--- a/res/pjproject/build/vs/pjproject-vs8-wm2003-release-defaults.vsprops
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="pjproject-vs8-wm2003-release-defaults"
-	InheritedPropertySheets=".\pjproject-vs8-wm2003-common-defaults.vsprops"
-	>
-</VisualStudioPropertySheet>
diff --git a/res/pjproject/build/vs/pjproject-vs8-wm5-common-defaults.vsprops b/res/pjproject/build/vs/pjproject-vs8-wm5-common-defaults.vsprops
deleted file mode 100644
index d5135ea68..000000000
--- a/res/pjproject/build/vs/pjproject-vs8-wm5-common-defaults.vsprops
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="pjproject-vs8-wm5-common-defaults"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
-		DebugInformationFormat="3"
-		DisableSpecificWarnings="4214;4201"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		SubSystem="9"
-		StackReserveSize="65536"
-		StackCommitSize="4096"
-		EntryPointSymbol="WinMainCRTStartup"
-	/>
-	<Tool
-		Name="VCResourceCompilerTool"
-		PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
-	/>
-	<UserMacro
-		Name="TargetCPU"
-		Value="armv4i"
-	/>
-</VisualStudioPropertySheet>
diff --git a/res/pjproject/build/vs/pjproject-vs8-wm5-release-defaults.vsprops b/res/pjproject/build/vs/pjproject-vs8-wm5-release-defaults.vsprops
deleted file mode 100644
index 8372c8cb5..000000000
--- a/res/pjproject/build/vs/pjproject-vs8-wm5-release-defaults.vsprops
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="pjproject-vs8-wm5-release-defaults"
-	InheritedPropertySheets=".\pjproject-vs8-wm5-common-defaults.vsprops"
-	>
-</VisualStudioPropertySheet>
diff --git a/res/pjproject/build/vs/pjproject-vs8-wm6-common-defaults.vsprops b/res/pjproject/build/vs/pjproject-vs8-wm6-common-defaults.vsprops
deleted file mode 100644
index 5f94b0449..000000000
--- a/res/pjproject/build/vs/pjproject-vs8-wm6-common-defaults.vsprops
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="pjproject-vs8-wm6-common-defaults"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
-		DebugInformationFormat="3"
-		DisableSpecificWarnings="4214;4201"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		SubSystem="9"
-		StackReserveSize="65536"
-		StackCommitSize="4096"
-		EntryPointSymbol="WinMainCRTStartup"
-	/>
-	<Tool
-		Name="VCResourceCompilerTool"
-		PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
-	/>
-	<UserMacro
-		Name="TargetCPU"
-		Value="armv4i"
-	/>
-</VisualStudioPropertySheet>
diff --git a/res/pjproject/build/vs/pjproject-vs8-wm6-release-defaults.vsprops b/res/pjproject/build/vs/pjproject-vs8-wm6-release-defaults.vsprops
deleted file mode 100644
index ad75a1f91..000000000
--- a/res/pjproject/build/vs/pjproject-vs8-wm6-release-defaults.vsprops
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="pjproject-vs8-wm6-release-defaults"
-	InheritedPropertySheets=".\pjproject-vs8-wm6-common-defaults.vsprops"
-	>
-</VisualStudioPropertySheet>