diff options
| author | Mark Michelson <mmichelson@digium.com> | 2012-12-11 21:52:09 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2012-12-11 21:52:09 +0000 |
| commit | f5e9cf5975cf8a58774579f126952be61beb0e54 (patch) | |
| tree | ab1796aeb12a5367d1c7e95332be610ef490a5a5 /main/Makefile | |
| parent | 603bf5301f3a950687e41d40eeb02870044f6d0b (diff) | |
Add automerge property back after conflict.
git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377879 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/Makefile')
| -rw-r--r-- | main/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/Makefile b/main/Makefile index 55ffbf420..2adc500fd 100644 --- a/main/Makefile +++ b/main/Makefile @@ -43,7 +43,7 @@ ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc linux-gnueabi kfre ifneq (x$(CAP_LIB),x) AST_LIBS+=$(CAP_LIB) endif - AST_LIBS+=-lpthread $(EDITLINE_LIB) -lm -lresolv + AST_LIBS+=-lpthread $(EDITLINE_LIB) -lm -lresolv -luuid else AST_LIBS+=$(EDITLINE_LIB) -lm endif |