Changeset 1049:1196fa3d6392 in roaraudio

Timestamp:

12/23/08 23:22:14 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

include plugins/ao on normal install

Files:

• Makefile (modified) (3 diffs)
• configure (modified) (2 diffs)
• plugins/ao/Makefile (modified) (1 diff)

Makefile

@@ -1 +1 @@
 include Makefile.conf
 
-SUBDIRS=libroar libroardsp $(subdir_libroaresd) roard roarclients doc $(subdir_roarfish) $(subdir_libroaryiff) $(subdir_libroarpulse) $(subdir_libroararts)
+SUBDIRS=libroar libroardsp $(subdir_libroaresd) roard roarclients doc $(subdir_roarfish) $(subdir_libroaryiff) $(subdir_libroarpulse) $(subdir_libroararts) $(subdir_plugins_ao)
 
 all:
@@ -23 +23 @@
         sh -c 'for file in include/roar* include/lib*; do cp $(cp_v) -r $$file $(PREFIX_INC)/; done'
         cd doc; make install; cd ..
+        if [ "$(subdir_plugins_ao)" != '' ]; then cd $(subdir_plugins_ao); make install; cd ../..; fi
 semi-install: prep-install-dirs
         sh -c 'for file in lib/roar*;    do ln -fs `pwd`/$$file $(PREFIX_BIN)/; done'
@@ -28 +29 @@
         sh -c 'for file in include/roar* include/lib*; do ln -fs `pwd`/$$file $(PREFIX_INC)/; done'
         cd doc; make semi-install; cd ..
+        if [ "$(subdir_plugins_ao)" != '' ]; then cd $(subdir_plugins_ao); make semi-install; cd ../..; fi

configure

@@ -228 +228 @@
  if test_lib "$name" $LIBS "$@"
  then
+  subdir_var='subdir_'"`echo $subdir | tr / _`"
   echo "#define $def"            >&3
   [ "$subdir" != '' ] && \
-   echo "subdir_$subdir=$subdir" >&4
+   echo "$subdir_var=$subdir" >&4
   echo "lib_$lib=$LIBS" >&4
  else
@@ -343 +344 @@
 #                #define                 subdir       name          -lxxx      -- header
 test_lib_defmake ROAR_HAVE_ESD           libroaresd   EsounD        esd        -- esd.h
-test_lib_defmake ROAR_HAVE_LIBAO         %            libao         ao         -- ao/ao.h ao/plugin.h
+test_lib_defmake ROAR_HAVE_LIBAO         plugins/ao   libao         ao         -- ao/ao.h ao/plugin.h
 test_lib_defmake ROAR_HAVE_LIBVORBIS     %            libvorbis     vorbis     -- vorbis/codec.h
 test_lib_defmake ROAR_HAVE_LIBVORBISFILE %            libvorbisfile vorbisfile -- vorbis/vorbisfile.h

plugins/ao/Makefile

@@ -8 +8 @@
 install: libroar.so
         cp libroar.so ${INSTALL_DIR}
+semi-install: libroar.so
+        ln -s `pwd`/libroar.so ${INSTALL_DIR}
 
 libroar.so: ao_roar.c