Changeset 426:a032dfca46cf in roaraudio

Timestamp:

08/11/08 14:17:12 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

build only subdirs we know we can build

Files:

• Makefile (modified) (1 diff)
• configure (modified) (3 diffs)

Makefile

@@ -1 @@
-SUBDIRS=libroar libroaresd roard roarclients roarfish libroaryiff
+include Makefile.conf
+
+SUBDIRS=libroar $(subdir_libroaresd) roard roarclients $(subdir_roarfish) $(subdir_libroaryiff) $(subdir_libroarpulse)
 
 all:

configure

@@ -47 +47 @@
 }
 
-exec 3> config.h
+test_lib_defmake () {
+ def="$1"
+ subdir="$2"
+ shift
+ shift
+
+ if test_lib $@
+ then
+  echo "#define $def"            >&3
+  [ "$subdir" != '' ] && \
+   echo "subdir_$subdir=$subdir" >&4
+ else
+  [ "$subdir" != '' ] && \
+   echo "subdir_$subdir=" >&4
+ fi
+}
+
+exec 3> config.h 4> Makefile.conf
 
 cat >&3 << EOF
@@ -74 +91 @@
 echo >&3
 
-test_lib EsounD         esd        -- esd.h                              && echo '#define ROAR_HAVE_ESD' >&3
+test_lib_defmake ROAR_HAVE_ESD          libroaresd   EsounD         esd        -- esd.h
 test_lib libao          ao         -- ao/ao.h ao/plugin.h                && echo '#define ROAR_HAVE_LIBAO' >&3
 test_lib libvorbis      vorbis     -- vorbis/codec.h                     && echo '#define ROAR_HAVE_LIBVORBIS' >&3
@@ -81 +98 @@
 test_lib libcelt        celt       -- celt/celt.h celt/celt_header.h     && echo '#define ROAR_HAVE_LIBCELT' >&3
 test_lib liboggz        oggz       -- oggz/oggz.h                        && echo '#define ROAR_HAVE_LIBOGGZ' >&3
-test_lib libfishsound   fishsound  -- fishsound/fishsound.h              && echo '#define ROAR_HAVE_LIBFISHSOUND' >&3
 test_lib libsndfile     sndfile    -- sndfile.h                          && echo '#define ROAR_HAVE_LIBSNDFILE' >&3
-test_lib libpulse       pulse      -- pulse/pulseaudio.h pulse/simple.h  && echo '#define ROAR_HAVE_LIBPULSE' >&3
+test_lib_defmake ROAR_HAVE_LIBFISHSOUND roarfish     libfishsound   fishsound  -- fishsound/fishsound.h
+test_lib_defmake ROAR_HAVE_LIBPULSE     libroarpulse libpulse       pulse      -- pulse/pulseaudio.h pulse/simple.h
+test_lib_defmake ROAR_HAVE_LIBY2        libroaryiff  libyiff        Y2         -- Y2/Y.h Y2/Ylib.h
 
 # add a better test here