move all the in tree libs to use subst of the core configure, move all module builds...

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

diff --git a/Makefile.am b/Makefile.am
index e100324d5206c3bf7568807a2e3de82d034457b6..7591f0424515906a109baacf7fab68492042b44f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -150,7 +150,7 @@ modules: libfreeswitch.la
        @./build/addenv.sh build/freeswitch.env OSARCH "$(OSARCH)"
        @./build/addenv.sh build/freeswitch.env DYNAMIC_LIB_EXTEN "$(DYNAMIC_LIB_EXTEN)"
        @./build/addenv.sh build/freeswitch.env SOLINK "$(SOLINK)"
-       @./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) -lfreeswitch"
+       @./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) $(MOD_LINK)"
        @./build/addenv.sh build/freeswitch.env CFLAGS "$(AM_CFLAGS)"
        @./build/addenv.sh build/freeswitch.env CC "$(CC)"
        @./build/addenv.sh build/freeswitch.env CFGARGS "$(AM_CFGARGS)"
@@ -203,7 +203,7 @@ install_mod: modules
        @./build/addenv.sh build/freeswitch.env BASE "$(switch_srcdir)"
        @./build/addenv.sh build/freeswitch.env OSARCH "$(OSARCH)"
        @./build/addenv.sh build/freeswitch.env SOLINK "$(SOLINK)"
-       @./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) -lfreeswitch"
+       @./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS)  $(MOD_LINK)"
        @./build/addenv.sh build/freeswitch.env CFLAGS "$(AM_CFLAGS)"
        @./build/addenv.sh build/freeswitch.env CC "$(CC)"
        @./build/addenv.sh build/freeswitch.env LINK "$(LINK)"

diff --git a/configure.in b/configure.in
index cc71525654284dc6ec0e0c6f05633550a7e125d0..8b9ad00648997d8e5fad20f9ea4eeed208d69f1a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -284,4 +284,23 @@ AC_CONFIG_SUBDIRS(libs/libteletone)
 AC_CONFIG_SUBDIRS(libs/pcre)
 AC_CONFIG_SUBDIRS(libs/apr)
 AC_CONFIG_SUBDIRS(libs/apr-util)
+AC_CONFIG_SUBDIRS(libs/codec/g7xx)
+AC_CONFIG_SUBDIRS(libs/codec/g726)
+AC_CONFIG_SUBDIRS(libs/codec/gsm)
+AC_CONFIG_SUBDIRS(libs/codec/ilbc)
+AC_CONFIG_SUBDIRS(libs/codec/lpc10)
+AC_CONFIG_SUBDIRS(libs/curl)
+AC_CONFIG_SUBDIRS(libs/iax)
+AC_CONFIG_SUBDIRS(libs/iksemel)
+AC_CONFIG_SUBDIRS(libs/js/nsprpub)
+AC_CONFIG_SUBDIRS(libs/js)
+AC_CONFIG_SUBDIRS(libs/libdingaling)
+AC_CONFIG_SUBDIRS(libs/libetpan)
+AC_CONFIG_SUBDIRS(libs/libsndfile)
+AC_CONFIG_SUBDIRS(libs/sofia-sip)
+AC_CONFIG_SUBDIRS(libs/speex)
+AC_CONFIG_SUBDIRS(libs/xmlrpc-c)
+AC_CONFIG_SUBDIRS(libs/portaudio)
+
+
 AC_OUTPUT([src/include/switch_version.h])

diff --git a/src/mod/applications/mod_enum/Makefile b/src/mod/applications/mod_enum/Makefile
index d5fd3328c4dfb6e9834d09d5f5557d8c35a1348a..4398529a8841b48c5f1abf721bd9010d04ac6c44 100644 (file)
--- a/src/mod/applications/mod_enum/Makefile
+++ b/src/mod/applications/mod_enum/Makefile
@@ -1,21 +1,20 @@
 CFLAGS += -I$(BASE)/libs/udns
-LDFLAGS += -L$(BASE)/libs/udns -ludns
 LINKER=$(CC)
 
 all:   depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
-       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) udns
+       cd $(BASE)/libs/udns && $(MAKE) staticlib
 
 %.o:  %.c
        $(CC) -fPIC $(CFLAGS) -c -o $@ $<
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
-       $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-       $(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS)
+       $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o 
+       $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) $(BASE)/libs/udns/libudns.a
 
 clean:
        rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

diff --git a/src/mod/asr_tts/mod_cepstral/Makefile b/src/mod/asr_tts/mod_cepstral/Makefile
index 304faa336c2da3376a78619dd33de60cb0f07ac1..4165b06cbc213da62cb090312c070ce5d8a6ff9e 100644 (file)
--- a/src/mod/asr_tts/mod_cepstral/Makefile
+++ b/src/mod/asr_tts/mod_cepstral/Makefile
@@ -13,11 +13,11 @@ all:        depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 depends:
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
-       $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-       $(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
+       $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o 
+       $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

diff --git a/src/mod/codecs/mod_amr/Makefile b/src/mod/codecs/mod_amr/Makefile
index d86dd1fcdd48660bf2c1ce0b1c6205206048df8a..67e9237b3d304188d138065041aa84d5577f867f 100644 (file)
--- a/src/mod/codecs/mod_amr/Makefile
+++ b/src/mod/codecs/mod_amr/Makefile
@@ -15,10 +15,10 @@ depends:
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
        $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
-       $(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS)
+       $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

diff --git a/src/mod/codecs/mod_g711/Makefile b/src/mod/codecs/mod_g711/Makefile
index 823b01feb7c10dd71bdf8ed4e1f1c6a336cb9545..2f9ec6a81d953708fe68481a0e7291eb1ad533bf 100644 (file)
--- a/src/mod/codecs/mod_g711/Makefile
+++ b/src/mod/codecs/mod_g711/Makefile
@@ -3,13 +3,11 @@ all:  $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
        $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
-       $(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS)
-
-
+       $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
 

diff --git a/src/mod/codecs/mod_g722/Makefile b/src/mod/codecs/mod_g722/Makefile
index c7aecd71148de2cb8321c4748d0b2f5fd1f57aa4..45e1bb2a5364eb47c702202d86680cc1f7eb03c0 100644 (file)
--- a/src/mod/codecs/mod_g722/Makefile
+++ b/src/mod/codecs/mod_g722/Makefile
@@ -1,16 +1,16 @@
-LDFLAGS +=-lg7xx
+CFLAGS +=-I$(BASE)/libs/codec/g7xx/src/include/
 
 all:   depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
-       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install codec/g7xx --prefix=$(PREFIX)
+       cd $(BASE)/libs/codec/g7xx && $(MAKE)
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c 
-       $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
-       $(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS)
+       $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
+       $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS) $(BASE)/libs/codec/g7xx/libg7xx.la
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

diff --git a/src/mod/codecs/mod_g723_1/Makefile b/src/mod/codecs/mod_g723_1/Makefile
index 0c885fec19276ff4f731b680c0a3861973f50cd7..212c9e1993fe00f0679f9ea55eb009143fa0af8e 100644 (file)
--- a/src/mod/codecs/mod_g723_1/Makefile
+++ b/src/mod/codecs/mod_g723_1/Makefile
@@ -14,10 +14,10 @@ depends:
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
        $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
-       $(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS)
+       $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

diff --git a/src/mod/codecs/mod_g726/Makefile b/src/mod/codecs/mod_g726/Makefile
index 268ee99fcffbcf466bcc21ecd550f1734b49e05d..99e7ef7d1618eb4d6122ed6e69472a62d308bb2d 100644 (file)
--- a/src/mod/codecs/mod_g726/Makefile
+++ b/src/mod/codecs/mod_g726/Makefile
@@ -1,16 +1,16 @@
-LDFLAGS +=-lg726
+CFLAGS += -I$(BASE)/libs/codec/g726/src
 
 all:   depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
-       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install codec/g726 --prefix=$(PREFIX)
+       cd $(BASE)/libs/codec/g726 && $(MAKE)
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c ../../../include/switch_bitpack.h
        $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
-       $(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS)
+       $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS) $(BASE)/libs/codec/g726/libg726.la
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

diff --git a/src/mod/codecs/mod_g729/Makefile b/src/mod/codecs/mod_g729/Makefile
index 16852368c06a9975c8fa70087be68098a9b3d938..719d947eb4631a34909e47cbac64403711cfe588 100644 (file)
--- a/src/mod/codecs/mod_g729/Makefile
+++ b/src/mod/codecs/mod_g729/Makefile
@@ -15,10 +15,10 @@ depends:
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
        $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
-       $(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS)
+       $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

diff --git a/src/mod/codecs/mod_gsm/Makefile b/src/mod/codecs/mod_gsm/Makefile
index 0ee2964f5a7a2e0b69cda8af7640124f07b5c78d..f94861c9916377ef3330adc92368261d78420a81 100644 (file)
--- a/src/mod/codecs/mod_gsm/Makefile
+++ b/src/mod/codecs/mod_gsm/Makefile
@@ -3,14 +3,15 @@ LDFLAGS +=-lgsm
 all:   depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
-       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install codec/gsm --prefix=$(PREFIX)
+       cd $(BASE)/libs/codec/gsm && $(MAKE)
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
        $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
-       $(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS)
+       $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       cd $(BASE)/libs/codec/gsm && $(MAKE) install
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

diff --git a/src/mod/codecs/mod_ilbc/Makefile b/src/mod/codecs/mod_ilbc/Makefile
index 5c3b36424405d28eb921363dfd30529a600afb13..09117fdab2a681a46dc93d97626efb5a60833f20 100644 (file)
--- a/src/mod/codecs/mod_ilbc/Makefile
+++ b/src/mod/codecs/mod_ilbc/Makefile
@@ -1,16 +1,16 @@
-LDFLAGS +=-lilbc
+CFLAGS += -I$(BASE)/libs/codec/ilbc/src
 
 all:   depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
-       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install codec/ilbc --prefix=$(PREFIX) --disable-shared
+       cd $(BASE)/libs/codec/ilbc && $(MAKE)
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
-       $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
-       $(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS)
+       $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
+       $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS) $(BASE)/libs/codec/ilbc/libilbc.la
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

diff --git a/src/mod/codecs/mod_lpc10/Makefile b/src/mod/codecs/mod_lpc10/Makefile
index 1aa28a119befc9923c4dc038b839d69fb957ddaf..1bf83e7cd6bb52b2ba471eccabe1b9ec478b61af 100644 (file)
--- a/src/mod/codecs/mod_lpc10/Makefile
+++ b/src/mod/codecs/mod_lpc10/Makefile
@@ -1,16 +1,16 @@
-LDFLAGS +=-llpc10
+CFLAGS+=-I$(BASE)/libs/codec/lpc10/src
 
 all:   depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
-       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install codec/lpc10 --prefix=$(PREFIX)
+       cd $(BASE)/libs/codec/lpc10 && $(MAKE)
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c ../../../include/switch_bitpack.h
-       $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
-       $(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS)
+       $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
+       $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS) $(BASE)/libs/codec/lpc10/liblpc10.la
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

diff --git a/src/mod/codecs/mod_lpc10/mod_lpc10.c b/src/mod/codecs/mod_lpc10/mod_lpc10.c
index 2b364e0a2595c578b5700e42e37c91be63abb80d..7bb418da47be20f3bdf9354ab2466c24e985ba92 100644 (file)
--- a/src/mod/codecs/mod_lpc10/mod_lpc10.c
+++ b/src/mod/codecs/mod_lpc10/mod_lpc10.c
@@ -31,7 +31,7 @@
  */  
 
 #include "switch.h"
-#include "lpc10/lpc10.h"
+#include "lpc10.h"
 
 enum {
        SamplesPerFrame = 180,

diff --git a/src/mod/codecs/mod_speex/Makefile b/src/mod/codecs/mod_speex/Makefile
index 00a0778085637c811d79927547e0a7f551b2f7c2..f2db5cb61921151d7bb1f4d20177d4e9fdecabaa 100644 (file)
--- a/src/mod/codecs/mod_speex/Makefile
+++ b/src/mod/codecs/mod_speex/Makefile
@@ -1,14 +1,15 @@
+CFLAGS+=-I$(BASE)/libs/speex/include
 all:   depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
-       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install speex --prefix=$(PREFIX) --disable-shared --with-pic
+       cd $(BASE)/libs/speex && $(MAKE)
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
-       $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
-       $(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS) -lspeex
+       $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
+       $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS) $(BASE)/libs/speex/libspeex/libspeex.la
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

diff --git a/src/mod/endpoints/mod_dingaling/Makefile b/src/mod/endpoints/mod_dingaling/Makefile
index bde26668bffb28222321c6764cf35567574109ca..4ed8764a3e09eb01f4bc2c8a5f532c61a6abf745 100644 (file)
--- a/src/mod/endpoints/mod_dingaling/Makefile
+++ b/src/mod/endpoints/mod_dingaling/Makefile
@@ -1,19 +1,20 @@
-LDFLAGS += -ldingaling
-
+LDFLAGS += $(BASE)/libs/libdingaling/libdingaling.la
+CFLAGS  += -I$(BASE)/libs/libdingaling/src
 all:   depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
-       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install iksemel --prefix=$(PREFIX)
-       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libdingaling --prefix=$(PREFIX)
+       cd $(BASE)/libs/iksemel && $(MAKE)
+       cd $(BASE)/libs/libdingaling && $(MAKE)
 
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
        $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-       $(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
-
+       $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ *.so
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       cd $(BASE)/libs/iksemel && $(MAKE) install
+       cd $(BASE)/libs/libdingaling && $(MAKE) install
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

diff --git a/src/mod/endpoints/mod_iax/Makefile b/src/mod/endpoints/mod_iax/Makefile
index 03e67d1f4228f765c8a0403bab3f1aaaf9e28325..a15bb6a72685e31cc187f98445375a89958874ad 100644 (file)
--- a/src/mod/endpoints/mod_iax/Makefile
+++ b/src/mod/endpoints/mod_iax/Makefile
@@ -1,17 +1,17 @@
-LDFLAGS += -liax -L/usr/local/lib
+CFLAGS += -I$(BASE)/libs/iax/src
 
 all:   depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
-       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install iax --enable-newjb --prefix=$(PREFIX)
+       cd $(BASE)/libs/iax && $(MAKE)
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
-       $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-       $(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
+       $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o 
+       $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS) $(BASE)/libs/iax/src/libiax.la
 
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

diff --git a/src/mod/endpoints/mod_iax/mod_iax.c b/src/mod/endpoints/mod_iax/mod_iax.c
index c225838d4c3f85f90af97900c8fc28d0a53bced4..e83f04d9734c9b1e080da112ffad8bc28f41baa5 100644 (file)
--- a/src/mod/endpoints/mod_iax/mod_iax.c
+++ b/src/mod/endpoints/mod_iax/mod_iax.c
@@ -31,15 +31,11 @@
  */
 #include <switch.h>
 
-#ifdef WIN32
 #include <iax2.h>
 #include <iax-client.h>
 #include <iax2-parser.h>
+#ifdef WIN32
 #include <sys/timeb.h>
-#else
-#include <iax/iax2.h>
-#include <iax/iax-client.h>
-#include <iax/iax2-parser.h>
 #endif
 
 static const char modname[] = "mod_iax";

diff --git a/src/mod/endpoints/mod_portaudio/Makefile b/src/mod/endpoints/mod_portaudio/Makefile
index a465e8ca807ba7a1046d8d016116c99c402d88f4..d187e881f6202daddef670fc1432409b2542d516 100644 (file)
--- a/src/mod/endpoints/mod_portaudio/Makefile
+++ b/src/mod/endpoints/mod_portaudio/Makefile
@@ -1,22 +1,25 @@
-CFLAGS += -I.
-LDFLAGS += -lportaudio -L$(PREFIX) 
+CFLAGS += -I. -I$(BASE)/libs/portaudio/include
 MYOBJS = pablio.o pa_ringbuffer.o
+ifeq ($(OSARCH),Darwin)
+LDFLAGS += -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon
+endif
 
 all:   depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
-       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install portaudio --prefix=$(PREFIX) --with-pic
+       cd $(BASE)/libs/portaudio && $(MAKE)
+
 %.o:  %.c
-       $(CC) -fPIC $(CFLAGS) -c -o $@ $<
+       $(CC) $(CFLAGS) -c -o $@ $<
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(MYOBJS)
-       $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-       $(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(MYOBJS) $(LDFLAGS)
+       $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o 
+       $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MYOBJS) $(LDFLAGS) $(BASE)/libs/portaudio/lib/libportaudio.la
 
 
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

diff --git a/src/mod/endpoints/mod_sofia/Makefile b/src/mod/endpoints/mod_sofia/Makefile
index 10be9e7102f018ee0ec9ee845f7f1efb9a66c0eb..b1cf819a5163e2330079cc937430fdb6808a4336 100644 (file)
--- a/src/mod/endpoints/mod_sofia/Makefile
+++ b/src/mod/endpoints/mod_sofia/Makefile
@@ -1,25 +1,32 @@
 OS_ARCH         := $(subst /,_,$(shell uname -s | sed /\ /s//_/))
-VERSION = sofia-sip-1.12
-CFLAGS += -I. -I$(PREFIX)/include/$(VERSION)
-LDFLAGS += -lsofia-sip-ua
 LINKER=$(CC)
+CFLAGS += -I. -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/bnf  -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/features
+CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/http -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/ipt
+CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/iptsec -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/msg
+CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/nea -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/nta
+CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/nth -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/nua
+CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/sdp -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/sip
+CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/soa -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/sresolv
+CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/stun -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/su
+CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/tport -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/url
+
 ifeq ($(OS_ARCH),Darwin)
        LDFLAGS +=-framework CoreFoundation -framework SystemConfiguration
 endif
 all:   depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
-       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install sofia-sip --prefix=$(PREFIX) --with-pic --with-glib=no
+       cd $(BASE)/libs/sofia-sip && $(MAKE)
 
 %.o:  %.c
-       $(CC) -fPIC $(CFLAGS) -c -o $@ $<
+       $(CC) $(CFLAGS) -c -o $@ $<
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
-       $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-       $(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS)
+       $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o 
+       $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) $(BASE)/libs/sofia-sip/libsofia-sip-ua/libsofia-sip-ua.la
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

diff --git a/src/mod/endpoints/mod_wanpipe/Makefile b/src/mod/endpoints/mod_wanpipe/Makefile
index 9ce1df8c808917bf73419b33ade41a3443814ae2..994c61de2867f0697a1de053ad72907aa6b5f589 100644 (file)
--- a/src/mod/endpoints/mod_wanpipe/Makefile
+++ b/src/mod/endpoints/mod_wanpipe/Makefile
@@ -18,11 +18,11 @@ depends:
        $(CC) $(CFLAGS) $(MOD_CFLAGS) -g -ggdb -Werror -fPIC -c $< -o $@ 
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(OBJS) $(MODNAME).c
-       $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-       $(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(OBJS) $(LDFLAGS)
+       $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o 
+       $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(OBJS) $(LDFLAGS)
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

diff --git a/src/mod/event_handlers/mod_cdr/Makefile b/src/mod/event_handlers/mod_cdr/Makefile
index 26f0928e1abd70407b059f675cb9b36f6b39e54d..6a6bbaebb8941beb87812a4d3f33a62d5d70de17 100644 (file)
--- a/src/mod/event_handlers/mod_cdr/Makefile
+++ b/src/mod/event_handlers/mod_cdr/Makefile
@@ -14,15 +14,15 @@ all:        depends $(OBJS) $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 depends:
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(OBJS) $(MODNAME).cpp
-       $(CPPCC) $(CFLAGS) -fPIC -c $(MODNAME).cpp -o $(MODNAME).o 
-       $(CPPCC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(OBJS) $(LDFLAGS)
+       $(CPPCC) $(CFLAGS) -c $(MODNAME).cpp -o $(MODNAME).o 
+       $(LIBTOOL) --mode=link $(CPPCC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(OBJS) $(LDFLAGS)
 
 
 %.o:  %.cpp
        $(CPPCC) -Wall -Werror -fPIC $(CFLAGS) -c -o $@ $<
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

diff --git a/src/mod/event_handlers/mod_xmpp_event/Makefile b/src/mod/event_handlers/mod_xmpp_event/Makefile
index 5f1e6edf25f19de42869aae8b1f9a58ddef8db02..c287b001cc6c72a60e7f2f70024fb823ec92f0e8 100644 (file)
--- a/src/mod/event_handlers/mod_xmpp_event/Makefile
+++ b/src/mod/event_handlers/mod_xmpp_event/Makefile
@@ -1,4 +1,5 @@
-LDFLAGS += -liksemel -L/usr/local/lib
+CFLAGS +=  -I$(BASE)/libs/iksemel/include
+LDFLAGS += $(BASE)/libs/iksemel/src/libiksemel.la
 
 all:   depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
@@ -6,11 +7,12 @@ depends:
        MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install iksemel --prefix=$(PREFIX)
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
-       $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-       $(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
+       $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o 
+       $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       cd $(BASE)/libs/iksemel && $(MAKE) install
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

diff --git a/src/mod/event_handlers/mod_zeroconf/Makefile b/src/mod/event_handlers/mod_zeroconf/Makefile
index 36cf613ada781baade8b4de97c288a7a125e058f..8c7bd95cad992eda413dde534ebba4e1d1461ab1 100644 (file)
--- a/src/mod/event_handlers/mod_zeroconf/Makefile
+++ b/src/mod/event_handlers/mod_zeroconf/Makefile
@@ -9,11 +9,11 @@ depends:
        $(BASE)/build/buildlib.sh $(BASE) install howl-1.0.0.tar.gz --prefix=$(PREFIX)
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
-       $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-       $(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
+       $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o 
+       $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

diff --git a/src/mod/formats/mod_sndfile/Makefile b/src/mod/formats/mod_sndfile/Makefile
index bd39fed1f3b7f64bd90486d1af2b2ed379858ca2..3a9fceeed01abcf33548f6a84f1ddf10b9262aa0 100644 (file)
--- a/src/mod/formats/mod_sndfile/Makefile
+++ b/src/mod/formats/mod_sndfile/Makefile
@@ -1,19 +1,19 @@
-LDFLAGS += -lsndfile -L/usr/local/lib
+CFLAGS += -I$(BASE)/libs/libsndfile/src
 
 all:   depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
-       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libsndfile --prefix=$(PREFIX) --disable-sqlite
+       cd $(BASE)/libs/libsndfile && $(MAKE)
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
-       $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-       $(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
+       $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o 
+       $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS) $(BASE)/libs/libsndfile/src/libsndfile.la
 
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
 
 

diff --git a/src/mod/languages/mod_mono/Makefile b/src/mod/languages/mod_mono/Makefile
index f3a0d88eb500b14374958cd0c8c86d4f51a265f2..2bfa4f7a96fc40ad95fe46beedfcdb66d1aecc05 100644 (file)
--- a/src/mod/languages/mod_mono/Makefile
+++ b/src/mod/languages/mod_mono/Makefile
@@ -9,20 +9,20 @@ LDFLAGS += `$(PREFIX)/bin/pkg-config --libs mono`
 all:   depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
-       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install $(GETTEXT_TARBALL) --prefix=$(PREFIX) --with-pic
-       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install $(PKGCONFIG_TARBALL) --prefix=$(PREFIX) --with-pic
-       export PKG_CONFIG=$(PREFIX)/bin/pkg-config; export MSGFMT=$(PREFIX)/bin/; MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install $(GLIB_TARBALL) --prefix=$(PREFIX) --with-pic
-       export PATH=$(PATH):$(PREFIX)/bin/; MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install $(TARBALL) --prefix=$(PREFIX) --with-pic --with-gc=boehm --with-preview=yes --without-sigaltstack
+       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) configure install $(GETTEXT_TARBALL) --prefix=$(PREFIX) --with-pic
+       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) configure install $(PKGCONFIG_TARBALL) --prefix=$(PREFIX) --with-pic
+       export PKG_CONFIG=$(PREFIX)/bin/pkg-config; export MSGFMT=$(PREFIX)/bin/; MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) configure install $(GLIB_TARBALL) --prefix=$(PREFIX) --with-pic
+       export PATH=$(PATH):$(PREFIX)/bin/; MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) configure install $(TARBALL) --prefix=$(PREFIX) --with-pic --with-gc=boehm --with-preview=yes --without-sigaltstack
 
 %.o:  %.c
-       $(CC) -fPIC $(CFLAGS) -c -o $@ $<
+       $(CC) $(CFLAGS) -c -o $@ $<
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
-       $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-       $(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS)
+       $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o 
+       $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS)
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

diff --git a/src/mod/languages/mod_perl/Makefile b/src/mod/languages/mod_perl/Makefile
index f751563828b5818044a82e3020771340f0d61406..924f2bd3f289a2fb38ce1d81610254a193c5b973 100644 (file)
--- a/src/mod/languages/mod_perl/Makefile
+++ b/src/mod/languages/mod_perl/Makefile
@@ -20,7 +20,7 @@ all:  depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) fs_perl.$(DYNAMIC_LIB_EXTEN)
 depends:
 
 %.o:  %.c
-       $(CC) -fPIC $(CFLAGS) -c $< -o $@
+       $(CC) $(CFLAGS) -c $< -o $@
 
 reswig: 
        rm switch_swig_wrap.c
@@ -34,17 +34,17 @@ switch_swig_wrap.o: switch_swig_wrap.c
 
 
 fs_perl.$(DYNAMIC_LIB_EXTEN): $(MODNAME).$(DYNAMIC_LIB_EXTEN) switch_swig_wrap.o switch_swig.o
-       $(CC) $(SOLINK) -o fs_perl.$(DYNAMIC_LIB_EXTEN) switch_swig_wrap.o switch_swig.o $(LDFLAGS)
+       $(LINK) $(SOLINK) -o fs_perl.$(DYNAMIC_LIB_EXTEN) switch_swig_wrap.o switch_swig.o $(LDFLAGS)
 
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(MODNAME).o $(OBJS)
-       $(CC) -fPIC $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(OBJS) $(LDFLAGS)
+       $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(OBJS) $(LDFLAGS)
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .perlok
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .perlok .libs
 
 install:
        mkdir -p $(PREFIX)/perl
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
-       cp -f fs_perl.$(DYNAMIC_LIB_EXTEN) fs_perl.pm $(PREFIX)/perl
-       if [ ! -f $(PREFIX)/perl/freeswitch.pm ] ; then cp -f freeswitch.pm $(PREFIX)/perl ; fi
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
+       $(LTINSTALL) fs_perl.$(DYNAMIC_LIB_EXTEN) fs_perl.pm $(PREFIX)/perl
+       if [ ! -f $(PREFIX)/perl/freeswitch.pm ] ; then $(LTINSTALL) freeswitch.pm $(PREFIX)/perl ; fi

diff --git a/src/mod/languages/mod_python/Makefile b/src/mod/languages/mod_python/Makefile
index 84e687640983f8f39843869507ba04e84f9c7543..cd28a8b88891562e6470380d4050d4d1749dbf43 100644 (file)
--- a/src/mod/languages/mod_python/Makefile
+++ b/src/mod/languages/mod_python/Makefile
@@ -14,12 +14,12 @@ depends:
        MAKE=$(MAKE) PY_CFLAGS=-fPIC $(BASE)/build/buildlib.sh $(BASE) install Python-2.4.3.tgz --prefix=$(PREFIX) --enable-threads
 
 %.o: %.cpp
-       $(CPPCC) -Wall -Werror -fPIC $(CFLAGS) -c -o $@ $<
+       $(CPPCC) $(CFLAGS) -c -o $@ $<
 
 %.o:  %.c
        $(CC) $(LCFLAGS) $(CFLAGS) -c $< -o $@
 
-od_python.c:
+mod_python.c:
        $(CC) $(LCFLAGS) $(CFLAGS) -c  mod_python.c -o mod_python.o
 
 reswig: 
@@ -48,7 +48,6 @@ clean:
        rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
 
 install:
-       # cp -f py_$(PYMOD).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
        cp -f freeswitch.py $(PREFIX)/lib/python2.4/site-packages/
 

diff --git a/src/mod/languages/mod_spidermonkey/Makefile b/src/mod/languages/mod_spidermonkey/Makefile
index 6f638c99f9cac720192df88199811617098c3d4b..0e6741b8150610c96aa5180b5d3df4c1b77d20ec 100644 (file)
--- a/src/mod/languages/mod_spidermonkey/Makefile
+++ b/src/mod/languages/mod_spidermonkey/Makefile
@@ -1,18 +1,23 @@
+CFLAGS += -I$(BASE)/libs/curl/include
+LDFLAGS += $(BASE)/libs/curl/lib/libcurl.la
 include sm.mak
 
 all:   depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
-       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install js/nsprpub --prefix=$(PREFIX) --with-pic
-       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install js --prefix=$(PREFIX) --with-pic --with-nspr=yes
-       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install curl --prefix=$(PREFIX) --without-libidn
+       cd $(BASE)/libs/curl && $(MAKE)
+       cd $(BASE)/libs/js/nsprpub && $(MAKE)
+       cd $(BASE)/libs/js && $(MAKE)
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(MODNAME).h
        $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o 
-       $(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(OBJS) $(LDFLAGS)
+       $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(OBJS) $(LDFLAGS)
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       cd $(BASE)/libs/js/nsprpub && $(MAKE) install
+       cd $(BASE)/libs/js && $(MAKE) install
+       $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(OBJS) $(LDFLAGS)
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

diff --git a/src/mod/languages/mod_spidermonkey/sm.mak b/src/mod/languages/mod_spidermonkey/sm.mak
index 287701cefd24bcb2ecab01fc9b5ecb6834cedcb7..bc22d30933bb5eb111015ef9590372e6f823d6f3 100644 (file)
--- a/src/mod/languages/mod_spidermonkey/sm.mak
+++ b/src/mod/languages/mod_spidermonkey/sm.mak
@@ -1,2 +1,2 @@
-CFLAGS += -I$(PREFIX)/include/js -I$(PREFIX)/include/nspr -DXP_UNIX -I../mod_spidermonkey -DJS_THREADSAFE -DJS_HAS_FILE_OBJECT=1
-LDFLAGS += -lnspr4 -ljs -lcurl
+CFLAGS += -I$(BASE)/libs/js/src -I$(BASE)/libs/js/nsprpub/include -DXP_UNIX -I../mod_spidermonkey  -DJS_THREADSAFE -DJS_HAS_FILE_OBJECT=1
+LDFLAGS += -L$(BASE)/libs/js/nsprpub/pr/src -L$(BASE)/libs/js/nsprpub/dist/lib -lnspr4 $(BASE)/libs/js/libjs.la

diff --git a/src/mod/languages/mod_spidermonkey_core_db/Makefile b/src/mod/languages/mod_spidermonkey_core_db/Makefile
index 749b218e768b2c58c6b3a3a8a7fea9137c799fe2..91a3b2c677867ecd6eeb4ea16557d04d981daa55 100644 (file)
--- a/src/mod/languages/mod_spidermonkey_core_db/Makefile
+++ b/src/mod/languages/mod_spidermonkey_core_db/Makefile
@@ -5,11 +5,11 @@ all:  depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 depends:
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
-       $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-       $(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(OBJS) $(LDFLAGS)
+       $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o 
+       $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(OBJS) $(LDFLAGS)
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

diff --git a/src/mod/languages/mod_spidermonkey_etpan/Makefile b/src/mod/languages/mod_spidermonkey_etpan/Makefile
index 0d2be4a5b66abff1efbdbafe280d2820304dc619..cada03a08b8ac32cff437665f6b86da5f88f9f2a 100644 (file)
--- a/src/mod/languages/mod_spidermonkey_etpan/Makefile
+++ b/src/mod/languages/mod_spidermonkey_etpan/Makefile
@@ -1,8 +1,6 @@
 include ../mod_spidermonkey/sm.mak
 
-OBJS=#$(BASE)/libs/mozilla/js/src/$(OS_CONFIG)_$(VER).OBJ/libjs.a $(BASE)/libs/mozilla/nsprpub/dist/lib/libnspr4.a  -letpan
-LINKER=$(CC)
-
+LDFLAGS+=-letpan
 
 all:   depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
@@ -10,11 +8,11 @@ depends:
        MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libetpan --prefix=$(PREFIX)
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
-       $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-       $(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(OBJS) $(LDFLAGS)
+       $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o 
+       $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o  $(LDFLAGS)
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

diff --git a/src/mod/languages/mod_spidermonkey_odbc/Makefile b/src/mod/languages/mod_spidermonkey_odbc/Makefile
index 1e9d99ecd8b40bddbba65916760c3a1f94a5c607..c8934bf436427c7b012ef25cdbcc1983f67e3690 100644 (file)
--- a/src/mod/languages/mod_spidermonkey_odbc/Makefile
+++ b/src/mod/languages/mod_spidermonkey_odbc/Makefile
@@ -7,11 +7,11 @@ depends:
        MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install unixODBC-2.2.12.tar.gz --prefix=$(PREFIX) --disable-gui --without-x --with-pic
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
-       $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-       $(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(OBJS) $(LDFLAGS)
+       $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o 
+       $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

diff --git a/src/mod/languages/mod_spidermonkey_skel/Makefile b/src/mod/languages/mod_spidermonkey_skel/Makefile
index 2d000943d7ebd04e79c4523d0ef18cedf75fd771..0d1e7b844a851fb94635516f2e2c10896ab8447a 100644 (file)
--- a/src/mod/languages/mod_spidermonkey_skel/Makefile
+++ b/src/mod/languages/mod_spidermonkey_skel/Makefile
@@ -1,19 +1,15 @@
 include ../mod_spidermonkey/sm.mak
 
-OBJS=#$(BASE)/libs/mozilla/js/src/$(OS_CONFIG)_$(VER).OBJ/libjs.a $(BASE)/libs/mozilla/nsprpub/dist/lib/libnspr4.a
-LINKER=$(CC)
-
-
 all:   depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
-       $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-       $(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(OBJS) $(LDFLAGS)
+       $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o 
+       $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o  $(LDFLAGS)
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

diff --git a/src/mod/languages/mod_spidermonkey_teletone/Makefile b/src/mod/languages/mod_spidermonkey_teletone/Makefile
index 86bb0ae62094239c3f5a98eb75ea4234f3aefb84..da921497eab2eb7c34305dc66c0482d8e6d957bd 100644 (file)
--- a/src/mod/languages/mod_spidermonkey_teletone/Makefile
+++ b/src/mod/languages/mod_spidermonkey_teletone/Makefile
@@ -1,16 +1,16 @@
 include ../mod_spidermonkey/sm.mak
-LDFLAGS+=-lteletone
+LDFLAGS+=$(BASE)/libs/libteletone/libteletone.la
 
 all:   depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
-       $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-       $(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(OBJS) $(LDFLAGS)
+       $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o 
+       $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(OBJS) $(LDFLAGS)
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

diff --git a/src/mod/xml_int/mod_xml_curl/Makefile b/src/mod/xml_int/mod_xml_curl/Makefile
index ca5a06db55d9863ce9fac750d1efb74e23190e6b..060cf96ea8ac277ba6212e2d46169acdff13a85e 100644 (file)
--- a/src/mod/xml_int/mod_xml_curl/Makefile
+++ b/src/mod/xml_int/mod_xml_curl/Makefile
@@ -1,18 +1,19 @@
-LDFLAGS += -lcurl
+CFLAGS += -I$(BASE)/libs/curl/include
+LDFLAGS += $(BASE)/libs/curl/lib/libcurl.la
 
 all:   depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
-       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install curl --prefix=$(PREFIX)
+       cd $(BASE)/libs/curl && $(MAKE)
 
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
-       $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-       $(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
+       $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o 
+       $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
 
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

diff --git a/src/mod/xml_int/mod_xml_rpc/Makefile b/src/mod/xml_int/mod_xml_rpc/Makefile
index 75146bab32a0e0f022fb3ed89718b9cf0f91f43b..7de730efaea8250a14a37a36f45e3b6bafa9115e 100644 (file)
--- a/src/mod/xml_int/mod_xml_rpc/Makefile
+++ b/src/mod/xml_int/mod_xml_rpc/Makefile
@@ -1,18 +1,23 @@
-LDFLAGS += -lxmlrpc -lxmlrpc_abyss -lxmlrpc_server -lxmlrpc_server_abyss -lxmlrpc_xmlparse
+#LDFLAGS += -lxmlrpc -lxmlrpc_abyss -lxmlrpc_server -lxmlrpc_server_abyss -lxmlrpc_xmlparse
+LDFLAGS += $(BASE)/libs/xmlrpc-c/src/libxmlrpc.la $(BASE)/libs/xmlrpc-c/src/libxmlrpc_server.la 
+LDFLAGS += $(BASE)/libs/xmlrpc-c/src/libxmlrpc_server_abyss.la $(BASE)/libs/xmlrpc-c/lib/abyss/src/libxmlrpc_abyss.la
+LDFLAGS += $(BASE)/libs/xmlrpc-c/lib/expat/xmlparse/libxmlrpc_xmlparse.la
+
+CFLAGS += -I$(BASE)/libs/xmlrpc-c/include
 
 all:   depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
-       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install xmlrpc-c --prefix=$(PREFIX) --disable-cplusplus --disable-wininet-client --disable-libwww-client
+       cd $(BASE)/libs/xmlrpc-c && $(MAKE)
 
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
-       $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-       $(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
+       $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o 
+       $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
 
 
 clean:
-       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+       rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-       cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+       $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod