do a better job with dependency tracking so the the mods don't keep trying to build or install when they don't need to. This should start to help with the speed of the build.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4602 d0543943-73ff-0310-b7d9-9358b9ac24b2
2025-04-18 01:28:42 +00:00 · 2007-03-15 04:32:09 +00:00 · 2007-03-15 04:32:09 +00:00 · 18b47de4b2
commit 18b47de4b2
parent 2da5437e0b
25 changed files with 162 additions and 149 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -85,7 +85,7 @@ libfreeswitch_la_LDFLAGS  = -version-info 1:0:0 $(AM_LDFLAGS)
 libfreeswitch_la_LIBADD  = $(CORE_LIBS)
 nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h

-$(libfreeswitch_la_SOURCES): deps
+$(libfreeswitch_la_SOURCES): $(CORE_LIBS)

 MOD_LINK       = $(BASE)/libfreeswitch.la

@ -144,29 +144,15 @@ nodepends: .nodepends
 yesdepends:
 	rm .nodepends

-sqlite:
+$(CORE_LIBS):
 	cd libs/sqlite && $(MAKE)
-
-apr:
 	cd libs/apr && $(MAKE)
-
-apr-util:
 	cd libs/apr-util && $(MAKE)
-
-pcre:
 	cd libs/pcre && $(MAKE)
-
-srtp:
 	cd libs/srtp && $(MAKE)
-
-resample:
 	cd libs/libresample && $(MAKE)
-
-teletone:
 	cd libs/libteletone && $(MAKE)

-deps: sqlite apr apr-util pcre srtp resample teletone
-
 core: deps libfreeswitch.la  

 install_core: install-libLTLIBRARIES
--- a/Makefile.in
+++ b/Makefile.in
@ -1085,7 +1085,7 @@ uninstall-info: uninstall-info-recursive
 	uninstall-libLTLIBRARIES uninstall-library_includeHEADERS


-$(libfreeswitch_la_SOURCES): deps
+$(libfreeswitch_la_SOURCES): $(CORE_LIBS)

 install-data-local:
 	@echo Installing $(NAME)
@ -1133,29 +1133,15 @@ nodepends: .nodepends
 yesdepends:
 	rm .nodepends

-sqlite:
+$(CORE_LIBS):
 	cd libs/sqlite && $(MAKE)
-
-apr:
 	cd libs/apr && $(MAKE)
-
-apr-util:
 	cd libs/apr-util && $(MAKE)
-
-pcre:
 	cd libs/pcre && $(MAKE)
-
-srtp:
 	cd libs/srtp && $(MAKE)
-
-resample:
 	cd libs/libresample && $(MAKE)
-
-teletone:
 	cd libs/libteletone && $(MAKE)

-deps: sqlite apr apr-util pcre srtp resample teletone
-
 core: deps libfreeswitch.la  

 install_core: install-libLTLIBRARIES
--- a/libs/iksemel/configure.gnu
+++ b/libs/iksemel/configure.gnu
@ -0,0 +1,3 @@
+#! /bin/sh
+./configure "$@"  --disable-shared --with-pic 
+
--- a/libs/libdingaling/Makefile.am
+++ b/libs/libdingaling/Makefile.am
@ -16,12 +16,13 @@ AM_LDFLAGS += $(shell $(APR_CONFIG) --link-ld --libs )
 AM_CFLAGS  += $(shell $(APU_CONFIG) --includes) 
 AM_LDFLAGS += $(shell $(APU_CONFIG) --link-ld --libs )
 AM_CFLAGS  += -I../iksemel/include
-AM_LDFLAGS += ../iksemel/src/libiksemel.la
+

 lib_LTLIBRARIES		= libdingaling.la
 libdingaling_la_SOURCES	= src/libdingaling.c src/sha1.c
 libdingaling_la_CFLAGS	= $(AM_CFLAGS)
 libdingaling_la_LDFLAGS	= 
+libdingaling_la_LIBADD  = ../iksemel/src/libiksemel.la
 library_includedir	= $(prefix)/include
 library_include_HEADERS = src/libdingaling.h

--- a/libs/libdingaling/Makefile.in
+++ b/libs/libdingaling/Makefile.in
@ -74,7 +74,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" \
 	"$(DESTDIR)$(library_includedir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libdingaling_la_LIBADD =
+libdingaling_la_DEPENDENCIES = ../iksemel/src/libiksemel.la
 am_libdingaling_la_OBJECTS = libdingaling_la-libdingaling.lo \
 	libdingaling_la-sha1.lo
 libdingaling_la_OBJECTS = $(am_libdingaling_la_OBJECTS)
@ -227,14 +227,14 @@ AM_CFLAGS = $(new_AM_CFLAGS) -I./src -I$(prefix)/include \
 	-I../iksemel/include
 AM_CPPFLAGS = $(AM_CFLAGS)
 AM_LDFLAGS = $(new_AM_LDFLAGS) -L$(PREFIX)/lib $(shell $(APR_CONFIG) \
-	--link-ld --libs ) $(shell $(APU_CONFIG) --link-ld --libs ) \
-	../iksemel/src/libiksemel.la
+	--link-ld --libs ) $(shell $(APU_CONFIG) --link-ld --libs )
 APR_CONFIG = $(shell which ../apr/apr-1-config || which $(prefix)/bin/apr-1-config )
 APU_CONFIG = $(shell which ../apr-util/apu-1-config || which $(prefix)/bin/apu-1-config)
 lib_LTLIBRARIES = libdingaling.la
 libdingaling_la_SOURCES = src/libdingaling.c src/sha1.c
 libdingaling_la_CFLAGS = $(AM_CFLAGS)
 libdingaling_la_LDFLAGS = 
+libdingaling_la_LIBADD = ../iksemel/src/libiksemel.la
 library_includedir = $(prefix)/include
 library_include_HEADERS = src/libdingaling.h
 all: all-recursive
--- a/src/mod/Makefile.am
+++ b/src/mod/Makefile.am
@ -13,8 +13,8 @@ all:
 	   echo making $$i ; \
 	   moddir=$(MOD_DIR); \
 	   if test -f $$moddir/Makefile ; then \
-	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) ; else  \
-	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules ; \
+	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) || exit 1; else  \
+	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules || exit 1; \
 	   fi; \
 	 done

@ -23,8 +23,8 @@ clean:
 	   echo making clean $$i ; \
 	   moddir=$(MOD_DIR); \
 	   if test -f $$moddir/Makefile ; then \
-	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) clean ; else  \
-	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules clean ; \
+	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) clean || exit 1; else  \
+	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules clean || exit 1; \
 	   fi; \
 	 done

@ -34,8 +34,8 @@ install:
 	   echo making install $$i ; \
 	   moddir=$(MOD_DIR); \
 	   if test -f $$moddir/Makefile ; then \
-	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) install ; else  \
-	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules install ; \
+	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) install || exit 1; else  \
+	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules install || exit 1; \
 	   fi; \
 	done
 	@echo done
@ -46,8 +46,8 @@ uninstall:
 	   echo making uninstall $$i ; \
 	   moddir=$(MOD_DIR); \
 	   if test -f $$moddir/Makefile ; then \
-	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) uninstall ; else  \
-	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules uninstall ; \
+	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) uninstall || exit 1; else  \
+	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules uninstall || exit 1; \
 	   fi; \
 	done
 	@echo done
--- a/src/mod/Makefile.in
+++ b/src/mod/Makefile.in
@ -362,8 +362,8 @@ all:
 	   echo making $$i ; \
 	   moddir=$(MOD_DIR); \
 	   if test -f $$moddir/Makefile ; then \
-	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) ; else  \
-	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules ; \
+	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) || exit 1; else  \
+	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules || exit 1; \
 	   fi; \
 	 done

@ -372,8 +372,8 @@ clean:
 	   echo making clean $$i ; \
 	   moddir=$(MOD_DIR); \
 	   if test -f $$moddir/Makefile ; then \
-	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) clean ; else  \
-	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules clean ; \
+	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) clean || exit 1; else  \
+	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules clean || exit 1; \
 	   fi; \
 	 done

@ -383,8 +383,8 @@ install:
 	   echo making install $$i ; \
 	   moddir=$(MOD_DIR); \
 	   if test -f $$moddir/Makefile ; then \
-	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) install ; else  \
-	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules install ; \
+	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) install || exit 1; else  \
+	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules install || exit 1; \
 	   fi; \
 	done
 	@echo done
@ -395,8 +395,8 @@ uninstall:
 	   echo making uninstall $$i ; \
 	   moddir=$(MOD_DIR); \
 	   if test -f $$moddir/Makefile ; then \
-	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) uninstall ; else  \
-	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules uninstall ; \
+	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) uninstall || exit 1; else  \
+	      cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules uninstall || exit 1; \
 	   fi; \
 	done
 	@echo done
--- a/src/mod/applications/mod_enum/Makefile
+++ b/src/mod/applications/mod_enum/Makefile
@ -1,14 +1,11 @@
-# define these targets in your makefile if you wish
-# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
-
-# and define these variables to impact your build
 MODNAME=mod_enum
+BASE=../../../..
+UDNSA=$(BASE)/libs/udns/libudns.a
 LOCAL_CFLAGS=-I$(BASE)/libs/udns
-LOCAL_LDFLAGS=
-LOCAL_OBJS=$(BASE)/libs/udns/libudns.a
-include ../../../../build/modmake.rules
+LOCAL_LIBADD=$(UDNSA)
+include $(BASE)/build/modmake.rules

-local_depend:
+$(UDNSA):
 	cd $(BASE)/libs/udns && $(MAKE) staticlib


--- a/src/mod/codecs/mod_amr/Makefile
+++ b/src/mod/codecs/mod_amr/Makefile
@ -1,13 +1,16 @@
 MODNAME=mod_amr
-ifeq ($(shell ls -d $(BASE)/libs/amr),$(BASE)/libs/amr)
+BASE=../../../..

-LOCAL_CFLAGS += -I$(PREFIX)/include/amr
-LOCAL_LDFLAGS +=-lamr
+topdir=$(shell cd $(BASE) && pwd)
+ifeq ($(shell test -d $(topdir)/libs/amr && cd $(topdir)/libs/amr && pwd),$(topdir)/libs/amr)
+
+LOCAL_CFLAGS = -I$(PREFIX)/include/amr
+LOCAL_LDFLAGS =-lamr

 else

-LOCAL_CFLAGS += -DAMR_PASSTHROUGH
+LOCAL_CFLAGS = -DAMR_PASSTHROUGH

 endif

-include ../../../../build/modmake.rules
+include $(BASE)/build/modmake.rules
--- a/src/mod/codecs/mod_g722/Makefile
+++ b/src/mod/codecs/mod_g722/Makefile
@ -1,13 +1,10 @@
-# define these targets in your makefile if you wish
-# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
-
-# and define these variables to impact your build
 MODNAME=mod_g722
+BASE=../../../..
+G7XXLA=$(BASE)/libs/codec/g7xx/libg7xx.la
 LOCAL_CFLAGS=-I$(BASE)/libs/codec/g7xx/src/include/
-LOCAL_LDFLAGS=$(BASE)/libs/codec/g7xx/libg7xx.la
-LOCAL_OBJS=
-include ../../../../build/modmake.rules
+LOCAL_LIBADD=$(G7XXLA)
+include $(BASE)/build/modmake.rules

-local_depend:
+$(G7XXLA):
 	cd $(BASE)/libs/codec/g7xx && $(MAKE)

--- a/src/mod/codecs/mod_g723_1/Makefile
+++ b/src/mod/codecs/mod_g723_1/Makefile
@ -1,8 +1,10 @@
 MODNAME=mod_g723_1
-ifeq ($(shell ls -d $(BASE)/libs/libg723_1),$(BASE)/libs/libg723_1)
+BASE=../../../..
+topdir=$(shell cd $(BASE) && pwd)
+ifeq ($(shell test -d $(topdir)/libs/libg723_1 && cd $(topdir)/libs/libg723_1 && pwd),$(topdir)/libs/libg723_1)
 LOCAL_CFLAGS += -I$(PREFIX)/include/g723
 LOCAL_LDFLAGS +=-lg723
 else
 LOCAL_CFLAGS += -DG723_PASSTHROUGH
 endif
-include ../../../../build/modmake.rules
+include $(BASE)/build/modmake.rules
--- a/src/mod/codecs/mod_g726/Makefile
+++ b/src/mod/codecs/mod_g726/Makefile
@ -1,13 +1,10 @@
-# define these targets in your makefile if you wish
-# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
-
-# and define these variables to impact your build
 MODNAME=mod_g726
+BASE=../../../..
+G726LA=$(BASE)/libs/codec/g726/libg726.la
 LOCAL_CFLAGS=-I$(BASE)/libs/codec/g726/src
-LOCAL_LDFLAGS=
-LOCAL_OBJS=$(BASE)/libs/codec/g726/libg726.la
-include ../../../../build/modmake.rules
+LOCAL_LIBADD=$(G726LA)
+include $(BASE)/build/modmake.rules

-local_depend:
+$(G726LA):
 	cd $(BASE)/libs/codec/g726 && $(MAKE)

--- a/src/mod/codecs/mod_g729/Makefile
+++ b/src/mod/codecs/mod_g729/Makefile
@ -1,9 +1,11 @@
 MODNAME=mod_g729
-ifeq ($(shell ls -d $(BASE)/libs/libg729),$(BASE)/libs/libg729)
+BASE=../../../..
+topdir=$(shell cd $(BASE) && pwd)
+ifeq ($(shell test -d $(topdir)/libs/libg729 && cd $(topdir)/libs/libg729 && pwd),$(topdir)/libs/libg729)
 LOCAL_CFLAGS += -I$(PREFIX)/include/libg729
 LOCAL_LDFLAGS +=-lg729
 else
 LOCAL_CFLAGS += -DG729_PASSTHROUGH
 endif

-include ../../../../build/modmake.rules
+include $(BASE)/build/modmake.rules
--- a/src/mod/codecs/mod_gsm/Makefile
+++ b/src/mod/codecs/mod_gsm/Makefile
@ -1,12 +1,9 @@
-# define these targets in your makefile if you wish
-# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
-
-# and define these variables to impact your build
 MODNAME=mod_gsm
+BASE=../../../..
+GSMLA=$(BASE)/libs/codec/gsm/libgsm.la
 LOCAL_CFLAGS=-I$(BASE)/libs/codec/gsm/inc
-LOCAL_LDFLAGS=$(BASE)/libs/codec/gsm/libgsm.la
-LOCAL_OBJS=
-include ../../../../build/modmake.rules
+LOCAL_LIBADD=$(GSMLA)
+include $(BASE)/build/modmake.rules

-local_depend:
+$(GSMLA):
 	cd $(BASE)/libs/codec/gsm && $(MAKE)
--- a/src/mod/codecs/mod_ilbc/Makefile
+++ b/src/mod/codecs/mod_ilbc/Makefile
@ -1,12 +1,9 @@
-# define these targets in your makefile if you wish
-# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
-
-# and define these variables to impact your build
 MODNAME=mod_ilbc
+BASE=../../../..
+ILBCLA=$(BASE)/libs/codec/ilbc/libilbc.la
 LOCAL_CFLAGS=-I$(BASE)/libs/codec/ilbc/src
-LOCAL_LDFLAGS=$(BASE)/libs/codec/ilbc/libilbc.la
-LOCAL_OBJS=
-include ../../../../build/modmake.rules
+LOCAL_LIBADD=$(ILBCLA)
+include $(BASE)/build/modmake.rules

-local_depend:
+$(ILBCLA):
 	cd $(BASE)/libs/codec/ilbc && $(MAKE)
--- a/src/mod/codecs/mod_lpc10/Makefile
+++ b/src/mod/codecs/mod_lpc10/Makefile
@ -1,12 +1,9 @@
-# define these targets in your makefile if you wish
-# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
-
-# and define these variables to impact your build
 MODNAME=mod_lpc10
+BASE=../../../..
+LPC10LA=$(BASE)/libs/codec/lpc10/liblpc10.la
 LOCAL_CFLAGS=-I$(BASE)/libs/codec/lpc10/src
-LOCAL_LDFLAGS=$(BASE)/libs/codec/lpc10/liblpc10.la
-LOCAL_OBJS=
-include ../../../../build/modmake.rules
+LOCAL_LIBADD=$(LPC10LA)
+include $(BASE)/build/modmake.rules

-local_depend:
+$(LPC10LA):
 	cd $(BASE)/libs/codec/lpc10 && $(MAKE)
--- a/src/mod/codecs/mod_speex/Makefile
+++ b/src/mod/codecs/mod_speex/Makefile
@ -3,10 +3,17 @@

 # and define these variables to impact your build
 MODNAME=mod_speex
-LOCAL_CFLAGS=-I$(BASE)/libs/speex/include
-LOCAL_LDFLAGS=$(BASE)/libs/speex/libspeex/libspeex.la
-LOCAL_OBJS=
-include ../../../../build/modmake.rules

-local_depend:
+BASE=../../../..
+
+SPEEXLA=$(BASE)/libs/speex/libspeex/libspeex.la
+
+LOCAL_CFLAGS=-I$(BASE)/libs/speex/include
+LOCAL_LDFLAGS=$(SPEEXLA)
+LOCAL_OBJS=
+include $(BASE)/build/modmake.rules
+
+local_depend: $(SPEEXLA)
+
+$(SPEEXLA): $(BASE)/libs/speex/stamp-h1
 	cd $(BASE)/libs/speex && $(MAKE)
--- a/src/mod/directories/mod_ldap/Makefile
+++ b/src/mod/directories/mod_ldap/Makefile
@ -19,5 +19,5 @@ $(LDAP_DIR)/Makefile:
 	$(GETLIB) $(LDAP).tgz
 	cd $(LDAP_DIR) && ./configure $(DEFAULT_ARGS) --disable-bdb --disable-hdb

-$(LDAPLA) $(LIBLBERLA): $(LDAP_DIR)/Makefile
+$(LDAPLA) $(LIBLBERLA): $(LDAP_DIR)/Makefile $(LDAP_DIR)/stamp-h
 	cd $(LDAP_DIR) && $(MAKE)
--- a/src/mod/endpoints/mod_dingaling/Makefile
+++ b/src/mod/endpoints/mod_dingaling/Makefile
@ -3,16 +3,28 @@

 # and define these variables to impact your build
 MODNAME=mod_dingaling
-LOCAL_CFLAGS=-I$(BASE)/libs/libdingaling/src
-LOCAL_LDFLAGS=$(BASE)/libs/libdingaling/libdingaling.la
-LOCAL_OBJS=
-include ../../../../build/modmake.rules
+BASE=../../../..

-local_depend:
+IKSEMELLA=$(BASE)/libs/iksemel/src/libiksemel.la
+DINGLA=$(BASE)/libs/libdingaling/libdingaling.la
+
+LOCAL_CFLAGS=-I$(BASE)/libs/libdingaling/src
+LOCAL_LDFLAGS=
+LOCAL_OBJS=
+LOCAL_LIBADD=$(DINGLA)
+
+include $(BASE)/build/modmake.rules
+
+INST_DINGLA=$(PREFIX)/lib/libdingaling.la
+
+$(IKSEMELLA):
 	cd $(BASE)/libs/iksemel && $(MAKE)
+
+$(DINGLA): $(IKSEMELLA)
 	cd $(BASE)/libs/libdingaling && $(MAKE)

-depend_install:
-	cd $(BASE)/libs/iksemel && $(MAKE) install
+depend_install: $(INST_DINGLA)
+
+$(INST_DINGLA): $(DINGLA)
 	cd $(BASE)/libs/libdingaling && $(MAKE) install

--- a/src/mod/endpoints/mod_iax/Makefile
+++ b/src/mod/endpoints/mod_iax/Makefile
@ -3,11 +3,13 @@

 # and define these variables to impact your build
 MODNAME=mod_iax
+BASE=../../../..
+IAXLA=$(BASE)/libs/iax/src/libiax.la
 LOCAL_CFLAGS=-I$(BASE)/libs/iax/src
-LOCAL_LDFLAGS=$(BASE)/libs/iax/src/libiax.la
-LOCAL_OBJS=
-include ../../../../build/modmake.rules
+LOCAL_LDFLAGS=
+LOCAL_LIBADD=$(IAXLA)
+include $(BASE)/build/modmake.rules

-local_depend:
+$(IAXLA):
 	cd $(BASE)/libs/iax && $(MAKE)

--- a/src/mod/endpoints/mod_portaudio/Makefile
+++ b/src/mod/endpoints/mod_portaudio/Makefile
@ -1,19 +1,20 @@
-# define these targets in your makefile if you wish
-# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
 BASE=../../../..
 OSARCH=$(shell uname -s)
-# and define these variables to impact your build
 MODNAME=mod_portaudio
+BASE=../../../..
+
+PALA=$(BASE)/libs/portaudio/lib/libportaudio.la
 LOCAL_CFLAGS=-I. -I$(BASE)/libs/portaudio/include
-LOCAL_LDFLAGS=$(BASE)/libs/portaudio/lib/libportaudio.la
+LOCAL_LDFLAGS=
 ifeq ($(OSARCH),Darwin)
 LOCAL_LDFLAGS += -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon
 endif
+LOCAL_LIBADD=$(PALA)
 LOCAL_OBJS=pablio.o pa_ringbuffer.o

-include ../../../../build/modmake.rules
+include $(BASE)/build/modmake.rules

-local_depend:
+$(PALA):
 	cd $(BASE)/libs/portaudio && $(MAKE)

 pa_ringbuffer.o: pa_ringbuffer.c
--- a/src/mod/endpoints/mod_sofia/Makefile
+++ b/src/mod/endpoints/mod_sofia/Makefile
@ -1,4 +1,7 @@
 MODNAME=mod_sofia
+
+BASE=../../../..
+
 OS_ARCH         := $(subst /,_,$(shell uname -s | sed /\ /s//_/))

 LOCAL_CFLAGS  = -I. -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/bnf  -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/features
@ -11,7 +14,9 @@ LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/soa -I$(BASE)/libs/sofi
 LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/stun -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/su
 LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/tport -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/url

-LOCAL_LDFLAGS=$(BASE)/libs/sofia-sip/libsofia-sip-ua/libsofia-sip-ua.la
+SOFIALA=$(BASE)/libs/sofia-sip/libsofia-sip-ua/libsofia-sip-ua.la
+
+LOCAL_LDFLAGS=$(SOFIALA)

 ifeq ($(OS_ARCH),Darwin)
 	LOCAL_LDFLAGS +=-framework CoreFoundation -framework SystemConfiguration
@ -19,5 +24,7 @@ endif

 include ../../../../build/modmake.rules

-local_depend:
+local_depend: $(SOFIALA)
+
+$(SOFIALA):
 	cd $(BASE)/libs/sofia-sip && $(MAKE)
--- a/src/mod/event_handlers/mod_xmpp_event/Makefile
+++ b/src/mod/event_handlers/mod_xmpp_event/Makefile
@ -3,10 +3,16 @@

 # and define these variables to impact your build
 MODNAME=mod_xmpp_event
-LOCAL_CFLAGS=-I$(BASE)/libs/iksemel/include
-LOCAL_LDFLAGS=$(BASE)/libs/iksemel/src/libiksemel.la
-LOCAL_OBJS=
-include ../../../../build/modmake.rules
+BASE=../../../..

-local_depend:
+IKSEMELLA=$(BASE)/libs/iksemel/src/libiksemel.la
+
+LOCAL_CFLAGS=-I$(BASE)/libs/iksemel/include
+LOCAL_LDFLAGS=$(IKSEMELA)
+LOCAL_OBJS=
+include $(BASE)/build/modmake.rules
+
+local_depend: $(IKSEMELLA)
+
+$(IKSEMELLA):
 	cd $(BASE)/libs/iksemel && $(MAKE)
--- a/src/mod/formats/mod_sndfile/Makefile
+++ b/src/mod/formats/mod_sndfile/Makefile
@ -2,11 +2,19 @@
 # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:

 # and define these variables to impact your build
-MONAME=mod_sndfile
-LOCAL_CFLAGS=-I$(BASE)/libs/libsndfile/src
-LOCAL_LDFLAGS=$(BASE)/libs/libsndfile/src/libsndfile.la
-LOCAL_OBJS=
-include ../../../../build/modmake.rules
+MODNAME=mod_sndfile

-local_depend:
+BASE=../../../..
+
+SNDFILELA=$(BASE)/libs/libsndfile/src/libsndfile.la
+
+LOCAL_CFLAGS=-I$(BASE)/libs/libsndfile/src
+LOCAL_LDFLAGS=$(SNDFILELA)
+LOCAL_OBJS=
+
+include $(BASE)/build/modmake.rules
+
+local_depend: $(SNDFILELA)
+
+$(SNDFILELA):
 	cd $(BASE)/libs/libsndfile && $(MAKE)
--- a/src/mod/xml_int/mod_xml_rpc/Makefile
+++ b/src/mod/xml_int/mod_xml_rpc/Makefile
@ -1,12 +1,17 @@
 MODNAME=mod_xml_rpc
-LOCAL_LDFLAGS  = $(BASE)/libs/xmlrpc-c/src/libxmlrpc.la $(BASE)/libs/xmlrpc-c/src/libxmlrpc_server.la 
-LOCAL_LDFLAGS += $(BASE)/libs/xmlrpc-c/src/libxmlrpc_server_abyss.la $(BASE)/libs/xmlrpc-c/lib/abyss/src/libxmlrpc_abyss.la
-LOCAL_LDFLAGS += $(BASE)/libs/xmlrpc-c/lib/expat/xmlparse/libxmlrpc_xmlparse.la
+BASE=../../../..

+XMLRPCLAS  = $(BASE)/libs/xmlrpc-c/src/libxmlrpc.la $(BASE)/libs/xmlrpc-c/src/libxmlrpc_server.la 
+XMLRPCLAS += $(BASE)/libs/xmlrpc-c/src/libxmlrpc_server_abyss.la $(BASE)/libs/xmlrpc-c/lib/abyss/src/libxmlrpc_abyss.la
+XMLRPCLAS += $(BASE)/libs/xmlrpc-c/lib/expat/xmlparse/libxmlrpc_xmlparse.la
+
+LOCAL_LDFLAGS = $(XMLRPCLAS)
 LOCAL_CFLAGS=-I$(BASE)/libs/xmlrpc-c/include

 include ../../../../build/modmake.rules

-local_depend:
+local_depend: $(XMLRPCLAS)
+
+$(XMLRPCLAS):
 	cd $(BASE)/libs/xmlrpc-c && $(MAKE)