don't use shell, that is a gmakeism, instead detect from configure

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@543 a93c3328-9c30-0410-af19-c9cd2b2d52af
This commit is contained in:
Michael Jerris 2008-09-07 00:08:01 +00:00
parent 35e83cc2d3
commit ef3d96dd9c
2 changed files with 13 additions and 5 deletions

View File

@ -37,6 +37,8 @@ CFLAGS=@CFLAGS@ @COMP_VENDOR_CFLAGS@ @DEFS@
LIBS = @LIBS@ LIBS = @LIBS@
DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@ DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@
SOLINK = @SOLINK@ SOLINK = @SOLINK@
OZ_SRCDIR=@oz_srcdir@
oz_builddir=@oz_builddir@
SRC=src SRC=src
top_builddir=@top_builddir@ top_builddir=@top_builddir@
INSTALL=@INSTALL@ INSTALL=@INSTALL@
@ -44,11 +46,10 @@ LIBTOOL=@LIBTOOL@
LTINSTALL=$(LIBTOOL) --mode=install $(INSTALL) LTINSTALL=$(LIBTOOL) --mode=install $(INSTALL)
LTUNINSTALL=$(LIBTOOL) --mode=uninstall rm -f LTUNINSTALL=$(LIBTOOL) --mode=uninstall rm -f
CCLD = $(CC) CCLD = $(CC)
PWD=$(shell pwd) INCS=-I$(OZ_SRCDIR)/$(SRC)/include -I$(OZ_SRCDIR)/$(SRC)/isdn/include -I$(OZ_SRCDIR)/$(SRC)/ozmod/ozmod_ss7_boost
INCS=-I$(PWD)/$(SRC)/include -I$(PWD)/$(SRC)/isdn/include -I$(PWD)/$(SRC)/ozmod/ozmod_ss7_boost
CFLAGS+= $(INCS) $(ZAP_CFLAGS) -DZAP_CONFIG_DIR=\"@prefix@/conf\" -DZAP_MOD_DIR=\"@prefix@/mod\" CFLAGS+= $(INCS) $(ZAP_CFLAGS) -DZAP_CONFIG_DIR=\"@prefix@/conf\" -DZAP_MOD_DIR=\"@prefix@/mod\"
COMPILE = $(CC) $(CFLAGS) $(DEFS) $(INCS) COMPILE = $(CC) $(CFLAGS) $(INCS)
LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(COMPILE) LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(COMPILE)
LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@ LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@
@ -216,7 +217,7 @@ $(SRC)/zap_io.o: $(SRC)/zap_io.c
$(LTCOMPILE) -c $< -o $@ $(LTCOMPILE) -c $< -o $@
dox: dox:
cd docs && doxygen $(PWD)/docs/Doxygen.conf cd docs && doxygen $(OZ_SRCDIR)/docs/Doxygen.conf
mod_openzap/mod_openzap.$(DYNAMIC_LIB_EXTEN): $(MYLIB) mod_openzap/mod_openzap.c mod_openzap/mod_openzap.$(DYNAMIC_LIB_EXTEN): $(MYLIB) mod_openzap/mod_openzap.c
cd mod_openzap && make cd mod_openzap && make

View File

@ -3,7 +3,7 @@
AC_PREREQ(2.59) AC_PREREQ(2.59)
AC_INIT([openzap],[pre-alpha],[bugs@freeswitch.org]) AC_INIT([openzap],[pre-alpha],[bugs@freeswitch.org])
AC_CONFIG_SRCDIR([src/libteletone_detect.c]) AC_CONFIG_SRCDIR([src/zap_io.c])
AC_CONFIG_AUX_DIR(build) AC_CONFIG_AUX_DIR(build)
#AM_INIT_AUTOMAKE(libopenzap,0.1) #AM_INIT_AUTOMAKE(libopenzap,0.1)
@ -14,6 +14,13 @@ AC_PROG_MAKE_SET
AC_PREFIX_DEFAULT(/usr/local/openzap) AC_PREFIX_DEFAULT(/usr/local/openzap)
# Absolute source/build directory
oz_srcdir=`(cd $srcdir && pwd)`
oz_builddir=`pwd`
AC_SUBST(oz_srcdir)
AC_SUBST(oz_builddir)
#override some default libtool behavior and invoke AC_PROG_LIBTOOL (see http://lists.gnu.org/archive/html/libtool/2007-03/msg00000.html) #override some default libtool behavior and invoke AC_PROG_LIBTOOL (see http://lists.gnu.org/archive/html/libtool/2007-03/msg00000.html)
m4_defun([_LT_AC_LANG_F77_CONFIG], [:]) m4_defun([_LT_AC_LANG_F77_CONFIG], [:])
m4_defun([_LT_AC_LANG_GCJ_CONFIG], [:]) m4_defun([_LT_AC_LANG_GCJ_CONFIG], [:])