Index: build_tools/strip_nonapi
===================================================================
--- build_tools/strip_nonapi	(revision 44045)
+++ build_tools/strip_nonapi	(working copy)
@@ -20,7 +20,7 @@
 case "${OSARCH}" in
     linux-gnu)
 	nm ${1} | grep -e " T " | cut -d" " -f3 | ${FILTER} > striplist
-	sed -e "s/^/-N /" striplist | xargs strip ${1}
+	sed -e "s/^/-N /" striplist | xargs ${STRIP} ${1}
 	rm -f striplist
 	;;
     *)
Index: Makefile
===================================================================
--- Makefile	(revision 44045)
+++ Makefile	(working copy)
@@ -59,7 +59,7 @@
 endif
 
 #Uncomment this to see all build commands instead of 'quiet' output
-#NOISY_BUILD=yes
+NOISY_BUILD=yes
 
 # Create OPTIONS variable
 OPTIONS=
@@ -77,7 +77,7 @@
 # For example, make DESTDIR=/tmp/asterisk woud put things in
 # /tmp/asterisk/etc/asterisk
 # !!! Watch out, put no spaces or comments after the value !!!
-#DESTDIR?=/tmp/asterisk
+DESTDIR?=/users/walther/cvs/soft/head/ndc/test/set_smp86xx_rootfs/build_mipsel/root
 
 # Define standard directories for various platforms
 # These apply if they are not redefined in asterisk.conf 
@@ -121,6 +121,11 @@
 # Determine by a grep 'ScriptAlias' of your Apache httpd.conf file
 HTTP_CGIDIR=/var/www/cgi-bin
 
+<<<<<<< .mine
+ASTCFLAGS= $(CFLAGS)
+
+=======
+>>>>>>> .r44045
 # Uncomment this to use the older DSP routines
 #ASTCFLAGS+=-DOLD_DSP_ROUTINES
 
@@ -135,7 +140,9 @@
 
 MOD_SUBDIR_CFLAGS=-I../include
 OTHER_SUBDIR_CFLAGS=-I../include
-
+ifeq ($(PROC),mipsel)
+  PROC=mips32r2
+endif
 ifeq ($(OSARCH),linux-gnu)
   ifeq ($(PROC),x86_64)
     # You must have GCC 3.4 to use k8, otherwise use athlon
Index: codecs/gsm/Makefile
===================================================================
--- codecs/gsm/Makefile	(revision 44045)
+++ codecs/gsm/Makefile	(working copy)
@@ -36,9 +36,12 @@
 ######### which support MMX instructions.  This should be newer pentiums,
 ######### ppro's, etc, as well as the AMD K6 and K7.  The compile will
 ######### probably require gcc. 
+ifeq ($(PROC),mipsel)
+PROC=mips32r2
+endif
 
 ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
-ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm ppc powerpc ppc64 ia64 s390 bfin ))
+ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm ppc powerpc ppc64 ia64 s390 bfin mips32r2 ))
 ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
 OPTIMIZE+=-march=$(PROC)
 endif
@@ -209,7 +212,7 @@
 # XXX should merge with GSM_OBJECTS
 ifeq ($(OSARCH),linux-gnu)
 ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
-ifeq (,$(findstring $(PROC) , arm ia64 s390 bfin ))
+ifeq (,$(findstring $(PROC) , arm ia64 s390 bfin mips32r2 ))
 GSM_SOURCES+= $(SRC)/k6opt.s
 endif
 endif
@@ -261,7 +264,7 @@
 
 ifeq ($(OSARCH),linux-gnu)
 ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
-ifeq (,$(findstring $(PROC) , arm ia64 bfin ))
+ifeq (,$(findstring $(PROC) , arm ia64 bfin mips32r2 ))
 GSM_OBJECTS+= $(SRC)/k6opt.o
 endif
 endif
Index: Makefile.rules
===================================================================
--- Makefile.rules	(revision 44045)
+++ Makefile.rules	(working copy)
@@ -88,7 +88,11 @@
 define ast_make_final_host
 $(1): $(2)
 	$(ECHO_PREFIX) echo "   [LD] $$^ -> $$@"
+<<<<<<< .mine
+	$(CMD_PREFIX) $$(HOST_CC) $$(STATIC_BUILD) -o $$@  $$(LDFLAGS) $$^ $$(LIBS)
+=======
 	$(CMD_PREFIX) $$(HOST_CC) $$(STATIC_BUILD) -o $$@ $$(HOST_CFLAGS) $$(HOST_LDFLAGS) $$^ $$(LIBS)
+>>>>>>> .r44045
 endef
 
 $(eval $(call ast_make_o_c,%.o,%.c))