aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMatthew Gregan <[email protected]>2012-12-03 13:58:38 +1300
committerMatthew Gregan <[email protected]>2012-12-03 13:58:38 +1300
commit9cd4846d6b7bf274038482e86d566abcef431e85 (patch)
tree90a915ba7422fdaba475882d3403da32028238b1
parentf76c996cae249665c71e4a9272d219f121a75d9e (diff)
downloadcubeb-9cd4846d6b7bf274038482e86d566abcef431e85.tar.gz
cubeb-9cd4846d6b7bf274038482e86d566abcef431e85.zip
build system fixes for make dist.
-rw-r--r--Makefile.am10
-rw-r--r--configure.ac1
2 files changed, 6 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index f3c5f54..930afc8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,7 +34,7 @@ if WAVE
src_libcubeb_la_SOURCES = src/cubeb_winmm.c
endif
if DSOUND
-src_libcubeb_la_SOURCES = src/cubeb_directsound.c
+src_libcubeb_la_SOURCES = src/cubeb_directsound.cpp
endif
if SNDIO
src_libcubeb_la_SOURCES = src/cubeb_sndio.c
@@ -44,10 +44,10 @@ src_libcubeb_la_SOURCES = src/cubeb_opensl.c
endif
EXTRA_src_libcubeb_la_SOURCES = \
- cubeb_alsa.c cubeb_pulse.c \
- cubeb_audiounit.c cubeb_audioqueue.c \
- cubeb_sndio.c cubeb_directsound.c \
- cubeb_winmm.c cubeb_opensl.c
+ src/cubeb_alsa.c src/cubeb_pulse.c \
+ src/cubeb_audiounit.c src/cubeb_audioqueue.c \
+ src/cubeb_sndio.c src/cubeb_directsound.cpp \
+ src/cubeb_winmm.c src/cubeb_opensl.c
src_libcubeb_la_LDFLAGS = -pthread -export-symbols-regex '^cubeb_' $(platform_lib) -no-undefined
diff --git a/configure.ac b/configure.ac
index 5bd0695..0e4b994 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,7 @@ dnl if $CFLAGS is blank
cflags_save="$CFLAGS"
AC_PROG_CC
AC_PROG_CPP
+AC_PROG_CXX
CFLAGS="$cflags_save"
AM_PROG_CC_C_O