Changeset 3550

Show
Ignore:
Timestamp:
04/06/01 11:26:43 (13 years ago)
Author:
ucacoxh
Message:

- Add "rat" shell script generation.
- Fix common lib dependency that broke with bsd mod.

Location:
rat/trunk
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • rat/trunk/MODS

    r3546 r3550  
    15491549        - Fixed all MSVC warnings about implicit type conversions. 
    15501550        - Update MSVC project files to reflect new paths in common library. 
     1551        - Update configure to remove need for patching in FreeBSD ports  
     1552          collection. 
     1553        - Add shell script target "rat" as target in Makefile.  Again to 
     1554          make FreeBSD ports work less, well zero :-D. 
    15511555 
    15521556TODO -- They're features not bugs dammit! 
  • rat/trunk/Makefile.in

    r3547 r3550  
    8383INSTALL_OBJS = ui_installer.o installer.o binaries.o 
    8484 
    85 all: version.h sdr2.plugin.S02.audio.rtp.-.$(RATVER) $(RATVER).spec $(RATVER) $(RATVER)-ui $(RATVER)-media Makefile 
     85all: version.h sdr2.plugin.S02.audio.rtp.-.$(RATVER) $(RATVER).spec $(RATVER) $(RATVER)-ui $(RATVER)-media rat Makefile 
    8686 
    8787libuclaudio.a: $(AUDIO_OBJS) 
     
    138138        @${ECHO} "# DO NOT EDIT THIS FILE"                 >> $@ 
    139139        @cat rat.spec | sed s/VERSION/$(VERSION)/g       >> $@ 
     140 
     141rat: VERSION Makefile 
     142        @${ECHO} "Generating rat shell script" 
     143        @${ECHO} "#/bin/sh" > $@ 
     144        @${ECHO} "# Generated automatically from RAT Makefile.  Edit there." >>@ 
     145        @${ECHO} "exec ./rat-$(VERSION)" >> $@ 
     146        @chmod a+x rat 
    140147 
    141148clean: 
     
    145152        -rm -f tcl2c/tcl2c sdr2.plugin.S02.audio.rtp.-.$(RATVER) $(RATVER).spec 
    146153        -rm -f bin2c bin2c.o binaries.c $(INSTALL_OBJS) $(RATVER)-installer 
    147         -rm -f $(RATVER)-media $(RATVER)-ui $(RATVER) 
     154        -rm -f rat $(RATVER)-media $(RATVER)-ui $(RATVER) 
    148155 
    149156distclean: clean 
     
    152159 
    153160install: all 
     161        ./install-sh -m 555 -c rat             $(bindir) 
    154162        ./install-sh -m 555 -c $(RATVER)       $(bindir) 
    155163        ./install-sh -m 555 -c $(RATVER)-media $(bindir) 
     
    184192        cvs tag release-`cat VERSION | sed "s/\./-/g"` 
    185193 
    186 $(RATVER)-$(OSTYPE).tar.gz: $(RATVER) $(RATVER)-ui $(RATVER)-media 
    187         tar cf $(RATVER)-$(OSTYPE).tar README.* MODS COPYRIGHT INSTALL.TXT VERSION $(RATVER) $(RATVER)-ui $(RATVER)-media sdr2.plugin.S02.audio.rtp.-.rat-$(VERSION) 
     194$(RATVER)-$(OSTYPE).tar.gz: $(RATVER) $(RATVER)-ui $(RATVER)-media rat 
     195        tar cf $(RATVER)-$(OSTYPE).tar README.* MODS COPYRIGHT INSTALL.TXT VERSION $(RATVER) $(RATVER)-ui $(RATVER)-media sdr2.plugin.S02.audio.rtp.-.rat-$(VERSION) rat 
    188196        rm -f $(RATVER)-$(OSTYPE).tar.gz 
    189197        gzip -9 $(RATVER)-$(OSTYPE).tar 
  • rat/trunk/configure

    r3549 r3550  
    38913891fi 
    38923892 
    3893  
     3893COMMON_DEP="${COMMON_LIB}/libuclmmbase.a" 
    38943894echo $ac_n "checking for mbus_init in -luclmmbase""... $ac_c" 1>&6 
    38953895echo "configure:3896: checking for mbus_init in -luclmmbase" >&5 
     
    39413941fi 
    39423942 
    3943 EXTERNAL_DEP="${EXTERNAL_DEP} ${COMMON_LIB}/libuclmmbase.a" 
     3943 
     3944EXTERNAL_DEP="${EXTERNAL_DEP} ${COMMON_DEP}" 
    39443945 
    39453946 
     
    39533954#----------------------------------------------------------------------------- 
    39543955echo $ac_n "checking signed arithmetic shift right""... $ac_c" 1>&6 
    3955 echo "configure:3956: checking signed arithmetic shift right" >&5 
     3956echo "configure:3957: checking signed arithmetic shift right" >&5 
    39563957if eval "test \"`echo '$''{'gsm_cv_sasr'+set}'`\" = set"; then 
    39573958  echo $ac_n "(cached) $ac_c" 1>&6 
     
    39613962else 
    39623963  cat > conftest.$ac_ext <<EOF 
    3963 #line 3964 "configure" 
     3964#line 3965 "configure" 
    39643965#include "confdefs.h" 
    39653966int main() { return (-1 >> 1) != -1;} 
    39663967EOF 
    3967 if { (eval echo configure:3968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 
     3968if { (eval echo configure:3969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 
    39683969then 
    39693970  gsm_cv_sasr=yes 
     
    40084009 
    40094010echo $ac_n "checking for g728_encoder_init in -lg728""... $ac_c" 1>&6 
    4010 echo "configure:4011: checking for g728_encoder_init in -lg728" >&5 
     4011echo "configure:4012: checking for g728_encoder_init in -lg728" >&5 
    40114012ac_lib_var=`echo g728'_'g728_encoder_init | sed 'y%./+-%__p_%'` 
    40124013if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 
     
    40164017LIBS="-lg728 -L${G728_LIB} -lm $LIBS" 
    40174018cat > conftest.$ac_ext <<EOF 
    4018 #line 4019 "configure" 
     4019#line 4020 "configure" 
    40194020#include "confdefs.h" 
    40204021/* Override any gcc2 internal prototype to avoid an error.  */ 
     
    40274028; return 0; } 
    40284029EOF 
    4029 if { (eval echo configure:4030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     4030if { (eval echo configure:4031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    40304031  rm -rf conftest* 
    40314032  eval "ac_cv_lib_$ac_lib_var=yes" 
  • rat/trunk/configure.in

    r3549 r3550  
    488488fi 
    489489 
    490  
     490COMMON_DEP="${COMMON_LIB}/libuclmmbase.a" 
    491491AC_CHECK_LIB(uclmmbase, 
    492492        mbus_init, 
     
    502502        ], 
    503503        -L${COMMON_LIB}) 
    504 EXTERNAL_DEP="${EXTERNAL_DEP} ${COMMON_LIB}/libuclmmbase.a" 
     504 
     505EXTERNAL_DEP="${EXTERNAL_DEP} ${COMMON_DEP}" 
    505506 
    506507AC_SUBST(COMMON_INC)