retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

move pcre into core do a ./configure again 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2211 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2006-07-31 23:46:37 +00:00
parent 272c6c9f4f
commit 3a5caeddae
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -130,7 +130,7 @@ CLEANFILES = src/include/switch_version.h scripts/fsxs
lib_LTLIBRARIES = libfreeswitch.la
libfreeswitch_la_CFLAGS = $(AM_CFLAGS) -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -std=c99
libfreeswitch_la_LDFLAGS = -version-info 1:0:0
libfreeswitch_la_LIBADD = -lteletone -lresample -lsrtp -lsqlite3 -lspeakup
libfreeswitch_la_LIBADD = -lteletone -lresample -lsrtp -lsqlite3 -lspeakup -lpcre
nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h
bin_PROGRAMS = freeswitch
@ -171,6 +171,7 @@ depends:
./build/buildlib.sh . install libteletone --prefix=$(PREFIX)
./build/buildlib.sh . install srtp --prefix=$(PREFIX)
./build/buildlib.sh . install libspeakup --prefix=$(PREFIX)
./build/buildlib.sh . install pcre-6.4.tar.gz --prefix=$(PREFIX)
rm build/freeswitch.env

5
Makefile.in
View File

@ -348,7 +348,7 @@ CLEANFILES = src/include/switch_version.h scripts/fsxs
lib_LTLIBRARIES = libfreeswitch.la
libfreeswitch_la_CFLAGS = $(AM_CFLAGS) -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -std=c99
libfreeswitch_la_LDFLAGS = -version-info 1:0:0
libfreeswitch_la_LIBADD = -lteletone -lresample -lsrtp -lsqlite3 -lspeakup
libfreeswitch_la_LIBADD = -lteletone -lresample -lsrtp -lsqlite3 -lspeakup -lpcre
nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h
bin_SCRIPTS = scripts/fsxs
freeswitch_SOURCES = src/switch.c\
@ -805,7 +805,7 @@ distclean-tags:
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir -p $(distdir)
mkdir $(distdir)
$(mkdir_p) $(distdir)/build/config $(distdir)/src/include
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
@ -1091,6 +1091,7 @@ depends:
./build/buildlib.sh . install libteletone --prefix=$(PREFIX)
./build/buildlib.sh . install srtp --prefix=$(PREFIX)
./build/buildlib.sh . install libspeakup --prefix=$(PREFIX)
./build/buildlib.sh . install pcre-6.4.tar.gz --prefix=$(PREFIX)
rm build/freeswitch.env
modules: $(NAME)

3
src/mod/dialplans/mod_dialplan_xml/Makefile
View File

@ -1,9 +1,8 @@
LDFLAGS += -lpcre -L/usr/local/lib
LDFLAGS += -L/usr/local/lib
all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
depends:
MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install pcre-6.4.tar.gz --prefix=$(PREFIX)
$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o