git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@138 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2005-12-13 21:30:10 +00:00
parent db3992767e
commit e22b8b01af
2 changed files with 4 additions and 3 deletions

View File

@ -6,7 +6,6 @@ NAME=freeswitch
PREFIX=$(prefix)/${NAME} PREFIX=$(prefix)/${NAME}
APR_CONFIG=$(prefix)/bin/apr-1-config APR_CONFIG=$(prefix)/bin/apr-1-config
AM_CFLAGS = $(shell $(APR_CONFIG) --cflags --cppflags --includes) AM_CFLAGS = $(shell $(APR_CONFIG) --cflags --cppflags --includes)
SOLINK=-shared -Xlinker -x
AM_LDFLAGS = $(shell $(APR_CONFIG) --link-ld --libs ) AM_LDFLAGS = $(shell $(APR_CONFIG) --link-ld --libs )
OSARCH=$(shell uname -s) OSARCH=$(shell uname -s)
@ -16,6 +15,8 @@ endif
if ISMAC if ISMAC
SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
else
SOLINK=-shared -Xlinker -x
endif endif

View File

@ -230,11 +230,11 @@ AM_CFLAGS = $(shell $(APR_CONFIG) --cflags --cppflags --includes) \
-DSWITCH_MOD_DIR=\"$(PREFIX)/mod\" \ -DSWITCH_MOD_DIR=\"$(PREFIX)/mod\" \
-DSWITCH_PREFIX_DIR=\"$(PREFIX)\" \ -DSWITCH_PREFIX_DIR=\"$(PREFIX)\" \
-DSWITCH_CONF_DIR=\"$(PREFIX)/conf\" -DSWITCH_CONF_DIR=\"$(PREFIX)/conf\"
@ISMAC_TRUE@SOLINK = -dynamic -bundle -undefined suppress -force_flat_namespace
SOLINK = -shared -Xlinker -x
AM_LDFLAGS = $(shell $(APR_CONFIG) --link-ld --libs ) $(am__append_1) \ AM_LDFLAGS = $(shell $(APR_CONFIG) --link-ld --libs ) $(am__append_1) \
-L$(PREFIX)/lib -L$(PREFIX)/lib
OSARCH = $(shell uname -s) OSARCH = $(shell uname -s)
@ISMAC_FALSE@SOLINK = -shared -Xlinker -x
@ISMAC_TRUE@SOLINK = -dynamic -bundle -undefined suppress -force_flat_namespace
libfreeswitch_la_SOURCES = \ libfreeswitch_la_SOURCES = \
src/include/switch.h \ src/include/switch.h \
src/include/switch_channel.h \ src/include/switch_channel.h \