diff options
| author | Russell Bryant <russell@russellbryant.com> | 2007-04-06 21:16:38 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2007-04-06 21:16:38 +0000 |
| commit | 0a9750ef9f61a12070797f3475f8f5b6b07f21b4 (patch) | |
| tree | d1a8725b9d1a7d8508205ad650f4a6ed1de11339 /main/Makefile | |
| parent | e3192c77f2e1afacef8ce5a20ee14ef70c1aba9e (diff) | |
Merged revisions 60603 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r60603 | russell | 2007-04-06 15:58:43 -0500 (Fri, 06 Apr 2007) | 13 lines
To be able to achieve the things that we would like to achieve with the
Asterisk GUI project, we need a fully functional HTTP interface with access
to the Asterisk manager interface. One of the things that was intended to be
a part of this system, but was never actually implemented, was the ability for
the GUI to be able to upload files to Asterisk. So, this commit adds this in
the most minimally invasive way that we could come up with.
A lot of work on minimime was done by Steve Murphy. He fixed a lot of bugs in
the parser, and updated it to be thread-safe. The ability to check
permissions of active manager sessions was added by Dwayne Hubbard. Then,
hacking this all together and do doing the modifications necessary to the HTTP
interface was done by me.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60604 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/Makefile')
| -rw-r--r-- | main/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/main/Makefile b/main/Makefile index 9e0f6f235..f552fabda 100644 --- a/main/Makefile +++ b/main/Makefile @@ -133,7 +133,10 @@ else H323LDLIBS= endif -asterisk: $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) +minimime/libmmime.a: + @cd minimime && $(MAKE) libmmime.a + +asterisk: $(OBJS) editline/libedit.a db1-ast/libdb1.a minimime/libmmime.a $(AST_EMBED_LDSCRIPTS) @$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c $(ECHO_PREFIX) echo " [LD] $^ -> $@" $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) @@ -145,3 +148,6 @@ clean:: @if [ -f editline/Makefile ]; then $(MAKE) -C editline distclean ; fi @$(MAKE) -C db1-ast clean @$(MAKE) -C stdtime clean + @$(MAKE) -C minimime clean + +.PHONY: minimime/libmmime.a |