Revert the previous patch since it's braking compilation

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1636 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 1 insertions, 15 deletions

diff --git a/Makefile b/Makefile
index c4d9ababb..3e97c7ef2 100755
--- a/Makefile
+++ b/Makefile
@@ -98,9 +98,6 @@ CFLAGS=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarati
 CFLAGS+=$(OPTIMIZE)
 CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
 CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
-ifeq (${OSARCH},FreeBSD)
-CFLAGS+=-pthread
-endif
 ifeq (${OSARCH},OpenBSD)
 CFLAGS+=-pthread
 endif
@@ -134,18 +131,7 @@ SUBDIRS=res channels pbx apps codecs formats agi cdr astman
 ifeq (${OSARCH},Linux)
 LIBS=-ldl
 endif
-ifeq (${OSARCH},OpenBSD)
-LIBS=-pthread
-else
-ifeq (${OSARCH},FreeBSD)
-LIBS=-pthread
-else
-endif
-endif
-LIBS+=-lncurses -lm
-ifeq (${OSARCH},Linux)
--lresolv  #-lnjamd
-endif
+LIBS+=-lpthread -lncurses -lm -lresolv  #-lnjamd
 OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
 	translate.o file.o say.o pbx.o cli.o md5.o term.o \
 	ulaw.o alaw.o callerid.o fskmodem.o image.o app.o \