do a better job with dependency tracking so the the mods don't keep trying to build...

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

diff --git a/Makefile.am b/Makefile.am
index 31c433ef5fec8da374e399e0b473d38a19215ebc..ded0451e9b56f965be4fc117e21021bff6e6ab23 100644 (file)
--- 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

diff --git a/Makefile.in b/Makefile.in
index 8adb60ac78a6cb8ddda3a583c015a9dcc74f9145..b62a740db04dbb2ae0d6a5ceb080099975958362 100644 (file)
--- 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

diff --git a/libs/iksemel/configure.gnu b/libs/iksemel/configure.gnu
new file mode 100644 (file)
index 0000000..f719542
--- /dev/null
+++ b/libs/iksemel/configure.gnu
@@ -0,0 +1,3 @@
+#! /bin/sh
+./configure "$@"  --disable-shared --with-pic 
+

diff --git a/libs/libdingaling/Makefile.am b/libs/libdingaling/Makefile.am
index 96ab8afea08121996b343bf0628dad76a400e813..21ca13e6e5f533885cc8baa81d37fe38fdad14eb 100644 (file)
--- 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
 

diff --git a/libs/libdingaling/Makefile.in b/libs/libdingaling/Makefile.in
index 262cf6ff7b95ee2112637b0a19f14b89b2c1fe65..a99f303a8572a57ca5e8be2743a3a93de8dbcbbb 100644 (file)
--- 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

diff --git a/src/mod/Makefile.am b/src/mod/Makefile.am
index 2700ddfd73984ebdde9a5a47d6c73fbd0761c142..064f181dc9f4071896b602c7a1e6b07eb10277c4 100644 (file)
--- 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

diff --git a/src/mod/Makefile.in b/src/mod/Makefile.in
index 0e9353f8d9821c13d612f0e8eea019d8985b6230..456bd66a2ea1c4659deb6cdf9b8286f80bfc72d8 100644 (file)
--- 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

diff --git a/src/mod/applications/mod_enum/Makefile b/src/mod/applications/mod_enum/Makefile
index f747638cf1c6fbda0810c073810834c2c69c0bed..cc145874c9413c2c98adf2b21a99bdcff29ded34 100644 (file)
--- 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
 
 

diff --git a/src/mod/codecs/mod_amr/Makefile b/src/mod/codecs/mod_amr/Makefile
index 5427797ef5d2402affe79d6d8df8a66e806e667b..bbdc825752ee9e000f0cd5717a377e4edbba6cba 100644 (file)
--- 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

diff --git a/src/mod/codecs/mod_g722/Makefile b/src/mod/codecs/mod_g722/Makefile
index 2889c74669e4238c36abc7a384e4df02cee5faf4..60aca28462f504313cb30a8d2348fb6ee6a505e1 100644 (file)
--- 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)
 

diff --git a/src/mod/codecs/mod_g723_1/Makefile b/src/mod/codecs/mod_g723_1/Makefile
index 67b0ef553ef23a9885430a95b8e74bcba6c12d04..bf699a3fd91e4ddd0f4246e83b1900bc949e7f82 100644 (file)
--- 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

diff --git a/src/mod/codecs/mod_g726/Makefile b/src/mod/codecs/mod_g726/Makefile
index 39ad5ecf5af906e202ac37389946198cb62e47a9..82247809027adce3836247a5fa24d2f787ab978a 100644 (file)
--- 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)
 

diff --git a/src/mod/codecs/mod_g729/Makefile b/src/mod/codecs/mod_g729/Makefile
index 2edcfa8c7f50cf003e7014754e56428b128bc063..9000b2a29e18e908df176282cd7b868cf3cb3cef 100644 (file)
--- 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

diff --git a/src/mod/codecs/mod_gsm/Makefile b/src/mod/codecs/mod_gsm/Makefile
index b9020f68b552fb0f01eb0ac1313cb6726b410c35..0ee7c15fac5dca28f8ec8a6cadd50cd3b5dfc4bb 100644 (file)
--- 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)

diff --git a/src/mod/codecs/mod_ilbc/Makefile b/src/mod/codecs/mod_ilbc/Makefile
index 4b9ec6d7c2094cc0b01385a84568f4401d52d9de..39a9b0a93a5a69734474bb84a19b5059a20fac7d 100644 (file)
--- 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)

diff --git a/src/mod/codecs/mod_lpc10/Makefile b/src/mod/codecs/mod_lpc10/Makefile
index 6698a64d2b2d52eab3e72bee39198f5e0ecc3a63..f5e969293a021849e7552e06c647d150b9e7c3a0 100644 (file)
--- 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)

diff --git a/src/mod/codecs/mod_speex/Makefile b/src/mod/codecs/mod_speex/Makefile
index 5fe1b0fd046ff3e0143040b8f62d29083f1b44ed..f5f2fe0dbc41da83128c12e8308423b3f79ba6cc 100644 (file)
--- 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
+
+BASE=../../../..
+
+SPEEXLA=$(BASE)/libs/speex/libspeex/libspeex.la
+
 LOCAL_CFLAGS=-I$(BASE)/libs/speex/include
-LOCAL_LDFLAGS=$(BASE)/libs/speex/libspeex/libspeex.la
+LOCAL_LDFLAGS=$(SPEEXLA)
 LOCAL_OBJS=
-include ../../../../build/modmake.rules
+include $(BASE)/build/modmake.rules
+
+local_depend: $(SPEEXLA)
 
-local_depend:
+$(SPEEXLA): $(BASE)/libs/speex/stamp-h1
        cd $(BASE)/libs/speex && $(MAKE)

diff --git a/src/mod/directories/mod_ldap/Makefile b/src/mod/directories/mod_ldap/Makefile
index abe57097d33e3caeec47de5104d977800bf5bc0c..0e5a32344c4d407eef579a9f2cbdd877e9e8b9e0 100644 (file)
--- 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)

diff --git a/src/mod/endpoints/mod_dingaling/Makefile b/src/mod/endpoints/mod_dingaling/Makefile
index d1a60acb4388b13d3877f6f58c14618f9b914cd4..f8eaa5f0b2fefe48ff81fb5793a54f54933bd878 100644 (file)
--- 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
+BASE=../../../..
+
+IKSEMELLA=$(BASE)/libs/iksemel/src/libiksemel.la
+DINGLA=$(BASE)/libs/libdingaling/libdingaling.la
+
 LOCAL_CFLAGS=-I$(BASE)/libs/libdingaling/src
-LOCAL_LDFLAGS=$(BASE)/libs/libdingaling/libdingaling.la
+LOCAL_LDFLAGS=
 LOCAL_OBJS=
-include ../../../../build/modmake.rules
+LOCAL_LIBADD=$(DINGLA)
+
+include $(BASE)/build/modmake.rules
 
-local_depend:
+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
 

diff --git a/src/mod/endpoints/mod_iax/Makefile b/src/mod/endpoints/mod_iax/Makefile
index 17acba8899dfdb7fa47f538e41bbf0f41241b353..528edfe87576aa3559845b0c350d3e0d0161502e 100644 (file)
--- 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)
 

diff --git a/src/mod/endpoints/mod_portaudio/Makefile b/src/mod/endpoints/mod_portaudio/Makefile
index c5fb848034561991985c61cfbfc364f4771399ad..eb7d36df236c834d8b734608e8879889dc826f27 100644 (file)
--- 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

diff --git a/src/mod/endpoints/mod_sofia/Makefile b/src/mod/endpoints/mod_sofia/Makefile
index fd005d3c41182f0559796e20282c312876c05c20..e1287495becd46368552640855148fdfcc297779 100644 (file)
--- 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)

diff --git a/src/mod/event_handlers/mod_xmpp_event/Makefile b/src/mod/event_handlers/mod_xmpp_event/Makefile
index 038b301fa48e572e95126ba56e01472f8d9db7db..ff2e378efb37f396ea93c61bcb64cc1bb45bae7e 100644 (file)
--- 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
+BASE=../../../..
+
+IKSEMELLA=$(BASE)/libs/iksemel/src/libiksemel.la
+
 LOCAL_CFLAGS=-I$(BASE)/libs/iksemel/include
-LOCAL_LDFLAGS=$(BASE)/libs/iksemel/src/libiksemel.la
+LOCAL_LDFLAGS=$(IKSEMELA)
 LOCAL_OBJS=
-include ../../../../build/modmake.rules
+include $(BASE)/build/modmake.rules
+
+local_depend: $(IKSEMELLA)
 
-local_depend:
+$(IKSEMELLA):
        cd $(BASE)/libs/iksemel && $(MAKE)

diff --git a/src/mod/formats/mod_sndfile/Makefile b/src/mod/formats/mod_sndfile/Makefile
index 761963f3dc000d9d432d52c2e6819c70b8213777..6166f4de7ec8c958c654dfa28f7932c4d1efcfae 100644 (file)
--- 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
+MODNAME=mod_sndfile
+
+BASE=../../../..
+
+SNDFILELA=$(BASE)/libs/libsndfile/src/libsndfile.la
+
 LOCAL_CFLAGS=-I$(BASE)/libs/libsndfile/src
-LOCAL_LDFLAGS=$(BASE)/libs/libsndfile/src/libsndfile.la
+LOCAL_LDFLAGS=$(SNDFILELA)
 LOCAL_OBJS=
-include ../../../../build/modmake.rules
 
-local_depend:
+include $(BASE)/build/modmake.rules
+
+local_depend: $(SNDFILELA)
+
+$(SNDFILELA):
        cd $(BASE)/libs/libsndfile && $(MAKE)

diff --git a/src/mod/xml_int/mod_xml_rpc/Makefile b/src/mod/xml_int/mod_xml_rpc/Makefile
index a32bc53b819f6f2804ef45e86f358c57df910a53..93d59bc22267de5ec9dcd157f99797e4ec25d27a 100644 (file)
--- 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)