Changeset 1607:a400220f1564 in roaraudio


Ignore:
Timestamp:
04/20/09 19:41:57 (15 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

don't write useless lib_c= lions, don't build libroarsndio on OpenBSD for the moment, added some empty lions to Makefile.conf to make it a bit better readable, use new xmms's --pkg-config

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    r1557 r1607  
    11include Makefile.conf 
    22 
    3 SUBDIRS=libroar libroardsp $(subdir_libroaresd) roard roarclients doc libroarsndio $(subdir_roarfish) $(subdir_libroaryiff) $(subdir_libroarpulse) $(subdir_libroararts) $(subdir_plugins_ao) 
     3SUBDIRS=libroar libroardsp $(subdir_libroaresd) roard roarclients doc $(subdir_libroarsndio) $(subdir_roarfish) $(subdir_libroaryiff) $(subdir_libroarpulse) $(subdir_libroararts) $(subdir_plugins_ao) 
    44 
    55all: 
  • configure

    r1589 r1607  
    4646AO_INST_DIR='' 
    4747XMMS_INST_DIR='' 
     48 
     49SNDIO_EMUL=true 
    4850 
    4951LIBAO=true 
     
    428430  [ "$subdir" != '' ] && \ 
    429431   echo "$subdir_var=$subdir" >&4 
    430   echo "lib_$lib=$LIBS" >&4 
     432  [ "$lib" != 'c' ] && \ 
     433   echo "lib_$lib=$LIBS" >&4 
    431434 else 
    432435  [ "$subdir" != '' ] && \ 
    433436   echo "subdir_$subdir=" >&4 
    434   echo "lib_$lib=" >&4 
     437  [ "$lib" != 'c' ] && \ 
     438   echo "lib_$lib=" >&4 
    435439 fi 
    436440} 
     
    482486 LDPATH="$LDPATH -L/usr/local/lib/" 
    483487 INCPATH="$INCPATH -I/usr/local/include/" 
     488 echo "Adding $SYSNAME build arguments..." 
     489 SNDIO_EMUL=false 
    484490elif [ "$SYSNAME" = 'FreeBSD' ] 
    485491then 
     
    515521 echo "SHARED_CF=$SHARED_CF" 
    516522 $fPIC && echo 'fPIC=-fPIC' 
     523 echo 
    517524 echo "CC=$CC" 
    518525 echo "LDPATH=$LDPATH" 
    519526 echo "INCPATH=$INCPATH" 
     527 echo 
    520528 echo "PREFIX=$PREFIX" 
    521529 echo "PREFIX_BIN=$PREFIX_BIN" 
     
    523531 echo "PREFIX_INC=$PREFIX_INC" 
    524532 echo "PREFIX_MAN=$PREFIX_MAN" 
     533 echo 
     534 $SNDIO_EMUL && echo "subdir_libroarsndio=libroarsndio" 
    525535} >&4 
    526536 
     
    12851295 if [ "$XMMS_INST_DIR" = '' ] 
    12861296 then 
    1287   ./configure --force-have-roar 
     1297  ./configure --force-have-roar --pkg-config "$PKG_CONFIG" 
    12881298 else 
    1289   ./configure --force-have-roar --inst-dir "$XMMS_INST_DIR" 
     1299  ./configure --force-have-roar --pkg-config "$PKG_CONFIG" --inst-dir "$XMMS_INST_DIR" 
    12901300 fi 
    12911301 cd .. 
Note: See TracChangeset for help on using the changeset viewer.