Build system updates...

diff --git a/configure.in b/configure.in
index 6a38052145173343881a08d1a3f20db6bd1365f2..176b29e57f194123d2d9dcd5d59fa106553098c3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -133,7 +133,8 @@ arm*)
   ;;
 esac
 
-AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile include/Makefile src/Makefile \
+AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile include/Makefile
+         include/sound/Makefile src/Makefile \
           src/control/Makefile src/mixer/Makefile src/pcm/Makefile \
          src/rawmidi/Makefile src/timer/Makefile \
           src/hwdep/Makefile src/seq/Makefile src/instr/Makefile \

diff --git a/cvscompile b/cvscompile
index 141734e7b2799632e752cfab7796f16ece8b9935..b26caa1a1565107bc8e5888ee43079df1d91bf68 100644 (file)
--- a/cvscompile
+++ b/cvscompile
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+touch ltconfig
 libtoolize --force --copy --automake
 aclocal $ACLOCAL_FLAGS
 autoheader

diff --git a/include/Makefile.am b/include/Makefile.am
index e27542e5c732580e7739e1249a6bc386fd2668a9..16838411fb3909eaaaed857577ecdbacea08f335 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = sound
+
 sysincludedir = ${includedir}/sys
 alsaincludedir = ${includedir}/alsa
 
@@ -8,8 +10,7 @@ alsainclude_HEADERS = asoundlib.h asoundef.h \
                      seq_event.h seq.h seqmid.h seq_midi_event.h \
                      conv.h instr.h iatomic.h
 
-noinst_HEADERS = sys.h search.h list.h aserver.h local.h alsa-symbols.h \
-               sound/asound.h sound/asoundef.h sound/asequencer.h
+noinst_HEADERS = sys.h search.h list.h aserver.h local.h alsa-symbols.h
 
 CLEANFILES = stamp-vh version.h
 

diff --git a/include/sound/Makefile.am b/include/sound/Makefile.am
new file mode 100644 (file)
index 0000000..e6c3eb0
--- /dev/null
+++ b/include/sound/Makefile.am
@@ -0,0 +1,5 @@
+alsasoundincludedir = ${includedir}/alsa/sound
+
+alsasoundinclude_HEADERS = ainstr_fm.h ainstr_gf1.h ainstr_simple.h ainstr_iw.h
+
+noinst_HEADERS = asound.h asoundef.h asequencer.h