Do a better job at tracking dependencies into the libs, so libs are re-built when they need to.

Eliminate some more gmakeisms in the modules makefiles




git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4629 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/mod/endpoints/mod_dingaling/Makefile

@@ -1,30 +1,27 @@
-# 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
-
 BASE=../../../..
 
-IKSEMELLA=$(BASE)/libs/iksemel/src/libiksemel.la
-DINGLA=$(BASE)/libs/libdingaling/libdingaling.la
+IKSEMEL_DIR=$(BASE)/libs/iksemel
+DING_DIR=$(BASE)/libs/libdingaling
+IKSEMELLA=$(IKSEMEL_DIR)/src/libiksemel.la
+DINGLA=$(DING_DIR)/libdingaling.la
 
-LOCAL_CFLAGS=-I$(BASE)/libs/libdingaling/src
-LOCAL_LDFLAGS=
-LOCAL_OBJS=
+LOCAL_CFLAGS=-I$(DING_DIR)/src
 LOCAL_LIBADD=$(DINGLA)
 
 include $(BASE)/build/modmake.rules
 
 INST_DINGLA=$(PREFIX)/lib/libdingaling.la
 
-$(IKSEMELLA):
-	cd $(BASE)/libs/iksemel && $(MAKE)
+$(IKSEMELLA): $(IKSEMEL_DIR) $(IKSEMEL_DIR)/.update
+	cd $(IKSEMEL_DIR) && $(MAKE)
+	$(TOUCH_TARGET)
 
-$(DINGLA): $(IKSEMELLA)
-	cd $(BASE)/libs/libdingaling && $(MAKE)
+$(DINGLA): $(IKSEMELLA) $(DING_DIR) $(DING_DIR)/.update
+	cd $(DING_DIR) && $(MAKE)
+	$(TOUCH_TARGET)
 
 depend_install: $(INST_DINGLA)
 
 $(INST_DINGLA): $(DINGLA)
-	cd $(BASE)/libs/libdingaling && $(MAKE) install
+	cd $(DING_DIR) && $(MAKE) install
 

src/mod/endpoints/mod_iax/Makefile

@@ -1,15 +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
-
 BASE=../../../..
-IAXLA=$(BASE)/libs/iax/src/libiax.la
-LOCAL_CFLAGS=-I$(BASE)/libs/iax/src
-LOCAL_LDFLAGS=
+
+IAX_DIR=$(BASE)/libs/iax
+IAXLA=$(IAX_DIR)/src/libiax.la
+LOCAL_CFLAGS=-I$(IAX_DIR)/src
 LOCAL_LIBADD=$(IAXLA)
 include $(BASE)/build/modmake.rules
 
-$(IAXLA):
-	cd $(BASE)/libs/iax && $(MAKE)
+$(IAXLA): $(IAX_DIR) $(IAX_DIR)/.update
+	cd $(IAX_DIR) && $(MAKE)
 

src/mod/endpoints/mod_portaudio/Makefile

@@ -1,10 +1,10 @@
 BASE=../../../..
 OSARCH=$(shell uname -s)
 
-BASE=../../../..
+PA_DIR=$(BASE)/libs/portaudio
 
-PALA=$(BASE)/libs/portaudio/lib/libportaudio.la
-LOCAL_CFLAGS=-I. -I$(BASE)/libs/portaudio/include
+PALA=$(PA_DIR)/lib/libportaudio.la
+LOCAL_CFLAGS=-I. -I$(PA_DIR)/include
 LOCAL_LDFLAGS=
 ifeq ($(OSARCH),Darwin)
 LOCAL_LDFLAGS += -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon
@@ -14,8 +14,11 @@ LOCAL_OBJS=pablio.o pa_ringbuffer.o
 
 include $(BASE)/build/modmake.rules
 
-$(PALA):
-	cd $(BASE)/libs/portaudio && $(MAKE)
+$(PALA): $(PA_DIR) $(PA_DIR)/.update
+	cd $(PA_DIR) && $(MAKE)
+	$(TOUCH_TARGET)
 
 pa_ringbuffer.o: pa_ringbuffer.c
 	$(COMPILE) -D__EXTENSION__=1  -c -o $@ $<
+
+pablio.o: pablio.c

src/mod/endpoints/mod_sofia/Makefile

@@ -1,30 +1,30 @@
-
-
 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
-LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/http -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/ipt
-LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/iptsec -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/msg
-LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/nea -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/nta
-LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/nth -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/nua
-LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/sdp -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/sip
-LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/soa -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/sresolv
-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
+SOFIA_DIR=$(BASE)/libs/sofia-sip
+SOFIAUA_DIR=$(SOFIA_DIR)/libsofia-sip-ua
 
-SOFIALA=$(BASE)/libs/sofia-sip/libsofia-sip-ua/libsofia-sip-ua.la
+LOCAL_CFLAGS  = -I. -I$(SOFIAUA_DIR)/bnf  -I$(SOFIAUA_DIR)/features
+LOCAL_CFLAGS += -I$(SOFIAUA_DIR)/http -I$(SOFIAUA_DIR)/ipt
+LOCAL_CFLAGS += -I$(SOFIAUA_DIR)/iptsec -I$(SOFIAUA_DIR)/msg
+LOCAL_CFLAGS += -I$(SOFIAUA_DIR)/nea -I$(SOFIAUA_DIR)/nta
+LOCAL_CFLAGS += -I$(SOFIAUA_DIR)/nth -I$(SOFIAUA_DIR)/nua
+LOCAL_CFLAGS += -I$(SOFIAUA_DIR)/sdp -I$(SOFIAUA_DIR)/sip
+LOCAL_CFLAGS += -I$(SOFIAUA_DIR)/soa -I$(SOFIAUA_DIR)/sresolv
+LOCAL_CFLAGS += -I$(SOFIAUA_DIR)/stun -I$(SOFIAUA_DIR)/su
+LOCAL_CFLAGS += -I$(SOFIAUA_DIR)/tport -I$(SOFIAUA_DIR)/url
 
-LOCAL_LDFLAGS=$(SOFIALA)
+SOFIALA=$(SOFIAUA_DIR)/libsofia-sip-ua.la
+
+LOCAL_LIBADD=$(SOFIALA)
 
 ifeq ($(OS_ARCH),Darwin)
 	LOCAL_LDFLAGS +=-framework CoreFoundation -framework SystemConfiguration
 endif
 
-include ../../../../build/modmake.rules
+include $(BASE)/build/modmake.rules
 
-local_depend: $(SOFIALA)
-
-$(SOFIALA):
-	cd $(BASE)/libs/sofia-sip && $(MAKE)
+$(SOFIALA): $(SOFIA_DIR) $(SOFIA_DIR)/.update
+	cd $(SOFIA_DIR) && $(MAKE)
+	$(TOUCH_TARGET)

src/mod/endpoints/mod_wanpipe/Makefile

@@ -1,13 +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
-
+BASE=../../../..
 LOCAL_CFLAGS  =-I/usr/local/include -I/usr/src/libpri -I/usr/src/linux/include -I. -I/usr/include 
 LOCAL_CFLAGS +=-D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API -I$(switch_srcdir)/libs/libteletone/src
 LOCAL_LDFLAGS=-lsangoma $(BASE)/libs/libteletone/libteletone.la
 LOCAL_OBJS=ss7boost_client.o
-include ../../../../build/modmake.rules
+include $(BASE)/build/modmake.rules
 
 local_depend:
 	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libsangoma --prefix=$(PREFIX) --with-libpri=/usr/src/libpri