diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-21 14:48:45 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-21 14:48:45 +0000 |
| commit | 9d0252b7202164964c7332bd08869c05d096d098 (patch) | |
| tree | d7935ef8c635ad15f9b6bf0084107c4b7b561c38 /main/Makefile | |
| parent | 3721fc1b6fd4138afcf5377f4e19997bd3186c76 (diff) | |
Merged revisions 132390 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r132390 | russell | 2008-07-21 09:47:41 -0500 (Mon, 21 Jul 2008) | 16 lines
Remove libresample from the Asterisk source tree. It is now available in its
own repository, and must be installed like any other library for Asterisk to
use. The two modules that require it are codec_resample and app_jack.
To install libresample:
$ svn co http://svn.digium.com/svn/libresample/trunk libresample
$ cd libresample
$ ./configure
$ make
$ sudo make install
This code is currently in our own repository because the build system did not
include the appropriate targets for building a dynamic library or for installing
the library.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@132391 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/Makefile')
| -rw-r--r-- | main/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/main/Makefile b/main/Makefile index f0edf034c..25e967d98 100644 --- a/main/Makefile +++ b/main/Makefile @@ -17,8 +17,6 @@ all: asterisk include $(ASTTOPDIR)/Makefile.moddir_rules -RESAMPLE_OBJS:=libresample/src/resample.o libresample/src/resamplesubs.o libresample/src/filterkit.o - OBJS= tcptls.o io.o sched.o logger.o frame.o loader.o config.o channel.o \ translate.o file.o pbx.o cli.o md5.o term.o \ ulaw.o alaw.o callerid.o fskmodem.o image.o app.o \ @@ -29,7 +27,7 @@ OBJS= tcptls.o io.o sched.o logger.o frame.o loader.o config.o channel.o \ netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \ cryptostub.o sha1.o http.o fixedjitterbuf.o abstract_jb.o \ strcompat.o threadstorage.o dial.o event.o adsistub.o audiohook.o \ - astobj2.o hashtab.o global_datastores.o $(RESAMPLE_OBJS) version.o \ + astobj2.o hashtab.o global_datastores.o version.o \ features.o # we need to link in the objects statically, not as a library, because |