Changed path and moved firmware files to alsa-firmware

diff --git a/mixartloader/Makefile.am b/mixartloader/Makefile.am
index 022194926ddeb078ac3b5785c0aa1c535076f89e..2a0d25f2a509d623e75d04a56cceaa1d528a6a35 100644 (file)
--- a/mixartloader/Makefile.am
+++ b/mixartloader/Makefile.am
@@ -1,9 +1,9 @@
 # # Process this file with automake to produce Makefile.in.
 AUTOMAKE_OPTIONS = 1.3 foreign
 
-AM_CFLAGS = -DDATAPATH=\"$(datadir)/alsa/firmware\"
+MYNAME = mixartloader
 
-SUBDIRS = firmware
+AM_CFLAGS = -DDATAPATH=\"$(datadir)/alsa/firmware/$(MYNAME)\"
 
 bin_PROGRAMS = mixartloader
 
@@ -12,7 +12,7 @@ mixartloader_SOURCES = mixartloader.c
 EXTRA_DIST = depcomp
 
 alsa-dist: distdir
-       @rm -rf ../distdir/mixartloader
-       @mkdir -p ../distdir/mixartloader
-       @cp -RLpv $(distdir)/* ../distdir/mixartloader
+       @rm -rf ../distdir/$(MYNAME)
+       @mkdir -p ../distdir/$(MYNAME)
+       @cp -RLpv $(distdir)/* ../distdir/$(MYNAME)
        @rm -rf $(distdir)

diff --git a/mixartloader/README b/mixartloader/README
index 25715494fd6a1489e8f8afa7d386f1e999596180..50fd209fa069f9b5b10b09be3c3d162d7dffffda 100644 (file)
--- a/mixartloader/README
+++ b/mixartloader/README
@@ -38,9 +38,9 @@ the post-install command.  For example, add the following entry to
 FILES
 =====
 
-The firmware binaries are installed on /usr/share/alsa/firmware
-(or /usr/local/share/alsa/firmware, depending to the prefix option of
-configure).  There will be *.conf files, which define the dsp image
+The firmware binaries are installed on /usr/share/alsa/firmware/mixartloader
+(or /usr/local/share/alsa/firmware/mixartloader, depending to the prefix
+option of configure).  There will be *.conf files, which define the dsp image
 files for each different card type.
 
 

diff --git a/mixartloader/firmware/Makefile.am b/mixartloader/firmware/Makefile.am
deleted file mode 100644 (file)
index c1a25ea..0000000
--- a/mixartloader/firmware/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-cfg_files = miXart.conf \
-       miXart8AES.xlx \
-       miXart8.elf \
-       miXart8.xlx
-
-EXTRA_DIST = $(cfg_files)
-
-firmwaredir = $(datadir)/alsa/firmware
-firmware_DATA = $(cfg_files)
-

diff --git a/mixartloader/firmware/miXart.conf b/mixartloader/firmware/miXart.conf
deleted file mode 100644 (file)
index e3ec38a..0000000
--- a/mixartloader/firmware/miXart.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# boot firmwares for digigram miXart cards
-
-dsp0   miXart8.xlx
-dsp1   miXart8.elf
-dsp2   miXart8AES.xlx
-

diff --git a/mixartloader/firmware/miXart8.elf b/mixartloader/firmware/miXart8.elf
deleted file mode 100644 (file)
index ca5515c..0000000
Binary files a/mixartloader/firmware/miXart8.elf and /dev/null differ

diff --git a/mixartloader/firmware/miXart8.xlx b/mixartloader/firmware/miXart8.xlx
deleted file mode 100644 (file)
index 95dee08..0000000
Binary files a/mixartloader/firmware/miXart8.xlx and /dev/null differ

diff --git a/mixartloader/firmware/miXart8AES.xlx b/mixartloader/firmware/miXart8AES.xlx
deleted file mode 100644 (file)
index b233438..0000000
Binary files a/mixartloader/firmware/miXart8AES.xlx and /dev/null differ