From 677ebfff2b76c9edb1b7e9cd1bd09153eb8432e5 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Thu, 29 Mar 2007 14:47:31 +0000 Subject: [PATCH] fix bsd make compile of mod_cdr git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4792 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/event_handlers/mod_cdr/Makefile.am | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/src/mod/event_handlers/mod_cdr/Makefile.am b/src/mod/event_handlers/mod_cdr/Makefile.am index 4d708aeb84..007db69f33 100644 --- a/src/mod/event_handlers/mod_cdr/Makefile.am +++ b/src/mod/event_handlers/mod_cdr/Makefile.am @@ -1,22 +1,9 @@ #we should set all these vars from configure, no reason to have these in each Makefile.am -#LIBTOOL = compile=`echo $<|grep .c`;link=`echo $@|grep .la;echo $@|grep .so;echo $@|grep .dll`; if test -n "$$compile"; then echo Compiling $<;fi; if test -n "$$link"; then echo Creating $@;fi; `if test -z "$(VERBOSE)" ; then echo $(SHELL) $(switch_builddir)/quiet_libtool ;else echo $(switch_builddir)/libtool; fi;` -#LIBTOOL=`if test -z "$(VERBOSE)" ; then echo $(SHELL) $(switch_builddir)/quiet_libtool ;else echo $(switch_builddir)/libtool; fi;` -LIBTOOL = link=`echo $@|grep .la;echo $@|grep .so;echo $@|grep .dll`; \ - if test -n "$$link"; then echo Creating $@;fi; \ - `if test -z "$(VERBOSE)" ; \ - then echo $(SHELL) $(switch_builddir)/quiet_libtool ;\ - else echo $(switch_builddir)/libtool; fi;` - +LIBTOOL = echo "`link=\`echo $@|grep .la;echo $@|grep .so;echo $@|grep .dll\`;if test -n "$$link"; then echo Creating $@;fi`";`if test -z "$(VERBOSE)" ; \ +then echo $(SHELL) $(switch_builddir)/quiet_libtool ;else echo $(SHELL) $(switch_builddir)/libtool; fi` AM_MAKEFLAGS=`test -n "$(VERBOSE)" || echo -s` - # Dirty trick to override the link output -LIBS+=> $(MODNAME).log || error="yes" ; \ - if test -n "$(VERBOSE)" -o "$$error" = "yes"; then \ - cat $(MODNAME).log ; \ - fi ;\ - if test "$$error" = "yes"; then \ - exit 1 ;\ - fi +LIBS+=> $(MODNAME).log || error="yes";if test -n "$(VERBOSE)" -o "$$error" = "yes";then cat $(MODNAME).log;fi;if test "$$error" = "yes";then exit 1;fi moddir=$(prefix)/mod