kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

integrate fs_cli into core build 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11035 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-12-31 19:38:00 +00:00
parent 00b1efed34
commit 42d9888c94
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.am
View File

@ -158,13 +158,18 @@ MOD_LINK = $(BASE)/libfreeswitch.la
CLEANFILES = src/include/switch_version.h src/include/switch_swigable_cpp.h CLEANFILES = src/include/switch_version.h src/include/switch_swigable_cpp.h
BUILT_SOURCES = src/include/switch_version.h src/include/switch_swigable_cpp.h BUILT_SOURCES = src/include/switch_version.h src/include/switch_swigable_cpp.h
bin_PROGRAMS = freeswitch bin_PROGRAMS = freeswitch fs_cli
fs_cli_SOURCES = libs/esl/src/esl.c libs/esl/src/esl_config.c libs/esl/src/esl_event.c libs/esl/src/esl_threadmutex.c libs/esl/fs_cli.c
freeswitch_SOURCES = src/switch.c freeswitch_SOURCES = src/switch.c
nodist_freeswitch_SOURCES = src/include/switch_version.h nodist_freeswitch_SOURCES = src/include/switch_version.h
fs_cli_CFLAGS = $(AM_CFLAGS) -Ilibs/esl/src/include
fs_cli_LDFLAGS = $(AM_LDFLAGS) -lpthread
freeswitch_CFLAGS = $(AM_CFLAGS) $(CORE_CFLAGS) freeswitch_CFLAGS = $(AM_CFLAGS) $(CORE_CFLAGS)
freeswitch_LDFLAGS = $(AM_LDFLAGS) -rpath $(libdir) freeswitch_LDFLAGS = $(AM_LDFLAGS) -rpath $(libdir)
freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la
if ADD_LIBEDIT if ADD_LIBEDIT
fs_cli_CFLAGS += -DHAVE_EDITLINE -Ilibs/libedit/src
fs_cli_LDADD = libs/libedit/src/.libs/libedit.a
freeswitch_CFLAGS += -Ilibs/libedit/src -DSWITCH_HAVE_LIBEDIT freeswitch_CFLAGS += -Ilibs/libedit/src -DSWITCH_HAVE_LIBEDIT
freeswitch_LDADD += libs/libedit/src/.libs/libedit.a freeswitch_LDADD += libs/libedit/src/.libs/libedit.a
endif endif

1
debian/freeswitch.install vendored
View File

@ -1,5 +1,6 @@
opt/freeswitch/htdocs/* opt/freeswitch/htdocs/*
opt/freeswitch/bin/freeswitch opt/freeswitch/bin/freeswitch
opt/freeswitch/bin/fs_cli
opt/freeswitch/bin/scripts/* opt/freeswitch/bin/scripts/*
opt/freeswitch/lib/libfreeswitch*.so* opt/freeswitch/lib/libfreeswitch*.so*
opt/freeswitch/lib/libopenzap*.so* opt/freeswitch/lib/libopenzap*.so*

2
libs/esl/Makefile
View File

@ -2,7 +2,7 @@ INCS=-Isrc/include
LIBEDIT_DIR=../../libs/libedit LIBEDIT_DIR=../../libs/libedit
DEBUG=-g -ggdb DEBUG=-g -ggdb
PICKY=-O2 -ffast-math -Wall -Werror -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes PICKY=-O2 -ffast-math -Wall -Werror -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes
CFLAGS=$(INCS) -D_GNU_SOURCE $(DEBUG) -I$(LIBEDIT_DIR)/src/ $(PICKY) CFLAGS=$(INCS) $(DEBUG) -I$(LIBEDIT_DIR)/src/ $(PICKY)
MYLIB=libesl.a MYLIB=libesl.a
LIBS=-lncurses -lpthread -lesl LIBS=-lncurses -lpthread -lesl
LDFLAGS=-L. LDFLAGS=-L.

7
libs/esl/fs_cli.c
View File

@ -1,3 +1,7 @@
#ifndef _XOPEN_SOURCE
#define _XOPEN_SOURCE 500
#endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <esl.h> #include <esl.h>
@ -11,9 +15,12 @@
#include <io.h> #include <io.h>
#else #else
#include <sys/select.h> #include <sys/select.h>
#include <unistd.h>
#include <histedit.h> #include <histedit.h>
#ifndef HAVE_EDITLINE
#define HAVE_EDITLINE #define HAVE_EDITLINE
#endif #endif
#endif
#include <getopt.h> #include <getopt.h>