Hello community,

here is the log from the commit of package alsa-firmware for openSUSE:Factory 
checked in at 2020-10-24 15:15:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/alsa-firmware (Old)
 and      /work/SRC/openSUSE:Factory/.alsa-firmware.new.3463 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "alsa-firmware"

Sat Oct 24 15:15:56 2020 rev:43 rq:843207 version:1.2.4

Changes:
--------
--- /work/SRC/openSUSE:Factory/alsa-firmware/alsa-firmware.changes      
2020-01-14 21:09:09.786815078 +0100
+++ /work/SRC/openSUSE:Factory/.alsa-firmware.new.3463/alsa-firmware.changes    
2020-10-24 15:16:06.804150996 +0200
@@ -1,0 +2,8 @@
+Wed Oct 21 13:04:20 CEST 2020 - ti...@suse.de
+
+- Update to alsa-firmware 1.2.4:
+  rework in auto-tools and Makefiles
+  See details in
+    https://alsa-project.org/wiki/Changes_v1.2.3.2_v1.2.4
+
+-------------------------------------------------------------------

Old:
----
  alsa-firmware-1.2.1.tar.bz2

New:
----
  alsa-firmware-1.2.4.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ alsa-firmware.spec ++++++
--- /var/tmp/diff_new_pack.1dpXuQ/_old  2020-10-24 15:16:07.996152483 +0200
+++ /var/tmp/diff_new_pack.1dpXuQ/_new  2020-10-24 15:16:08.000152488 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package alsa-firmware
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           alsa-firmware
-Url:            http://www.alsa-project.org/
+URL:            http://www.alsa-project.org/
 Summary:        Firmware Data Files for ALSA
 # BuildRequires:  automake
 License:        GPL-2.0-or-later
@@ -27,7 +27,7 @@
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(udev)
 %endif
-Version:        1.2.1
+Version:        1.2.4
 Release:        0
 Source:         
ftp://ftp.alsa-project.org/pub/firmware/alsa-firmware-%{version}.tar.bz2
 Source1:        usx2yaudio.rules

++++++ alsa-firmware-1.2.1.tar.bz2 -> alsa-firmware-1.2.4.tar.bz2 ++++++
++++ 8034 lines of diff (skipped)
++++    retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/alsa-firmware-1.2.1/Makefile.am new/alsa-firmware-1.2.4/Makefile.am
--- old/alsa-firmware-1.2.1/Makefile.am 2019-11-13 12:06:34.000000000 +0100
+++ new/alsa-firmware-1.2.4/Makefile.am 2020-10-20 13:28:42.000000000 +0200
@@ -4,7 +4,7 @@
          asihpi emu korg1212 maestro3 multisound sb16 wavefront \
          ymfpci aica ca0132 cs46xx
 
-EXTRA_DIST = depcomp
+EXTRA_DIST = depcomp Makefile.fw_writer Makefile.hotplug Makefile.loader
 
 dist-hook:
        -chmod -R a+r $(distdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/alsa-firmware-1.2.1/Makefile.fw_writer 
new/alsa-firmware-1.2.4/Makefile.fw_writer
--- old/alsa-firmware-1.2.1/Makefile.fw_writer  1970-01-01 01:00:00.000000000 
+0100
+++ new/alsa-firmware-1.2.4/Makefile.fw_writer  2020-10-20 13:28:42.000000000 
+0200
@@ -0,0 +1,16 @@
+#
+# Common parts for the firmware generation
+#
+
+noinst_PROGRAMS += fw_writer
+
+fw_writer = fw_writer$(EXEEXT)
+
+LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) 
$(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
+
+$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD)
+$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
+$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+
+fw_writer$(EXEEXT): $(fw_writer_OBJECTS)
+       $(LINK_FOR_BUILD) $^ $(LDLIBS_FOR_BUILD) -o $@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/alsa-firmware-1.2.1/Makefile.hotplug 
new/alsa-firmware-1.2.4/Makefile.hotplug
--- old/alsa-firmware-1.2.1/Makefile.hotplug    1970-01-01 01:00:00.000000000 
+0100
+++ new/alsa-firmware-1.2.4/Makefile.hotplug    2020-10-20 13:28:42.000000000 
+0200
@@ -0,0 +1,11 @@
+#
+# Common parts for the firmware generation
+#
+
+if USE_HOTPLUG
+hotplugfwdir = @HOTPLUGFWDIR@/$(firmware_dir)
+hotplugfw_DATA = $(firmware_files)
+else
+hotplugfwdir =
+hotplugfw_DATA =
+endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/alsa-firmware-1.2.1/Makefile.loader new/alsa-firmware-1.2.4/Makefile.loader
--- old/alsa-firmware-1.2.1/Makefile.loader     1970-01-01 01:00:00.000000000 
+0100
+++ new/alsa-firmware-1.2.4/Makefile.loader     2020-10-20 13:28:42.000000000 
+0200
@@ -0,0 +1,11 @@
+#
+# Common parts for the firmware generation
+#
+
+if USE_LOADER
+firmwaredir = $(datadir)/alsa/firmware/$(loader_dir)
+firmware_DATA = $(loader_files)
+else
+firmwaredir = 
+firmware_DATA = 
+endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/alsa-firmware-1.2.1/aica/Makefile.am 
new/alsa-firmware-1.2.4/aica/Makefile.am
--- old/alsa-firmware-1.2.1/aica/Makefile.am    2019-11-13 12:06:34.000000000 
+0100
+++ new/alsa-firmware-1.2.4/aica/Makefile.am    2020-10-20 13:28:42.000000000 
+0200
@@ -1,11 +1,6 @@
+firmware_dir =
 firmware_files = aica_firmware.bin
 
-if USE_HOTPLUG
-hotplugfwdir = @HOTPLUGFWDIR@
-hotplugfw_DATA = $(firmware_files)
-else
-hotplugfwdir =
-hotplugfw_DATA = 
-endif
-
 EXTRA_DIST = $(firmware_files) Dreamcast_sound.txt license.txt
+
+include ../Makefile.hotplug
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/alsa-firmware-1.2.1/asihpi/Makefile.am 
new/alsa-firmware-1.2.4/asihpi/Makefile.am
--- old/alsa-firmware-1.2.1/asihpi/Makefile.am  2019-11-13 12:06:34.000000000 
+0100
+++ new/alsa-firmware-1.2.4/asihpi/Makefile.am  2020-10-20 13:28:42.000000000 
+0200
@@ -1,6 +1,7 @@
 MYNAME = asihpi
 
-dsp_files = \
+firmware_dir = asihpi
+firmware_files = \
        dsp5000.bin\
        dsp6200.bin\
        dsp6205.bin\
@@ -8,13 +9,7 @@
        dsp6600.bin\
        dsp8700.bin\
        dsp8900.bin
-       
-EXTRA_DIST = $(dsp_files)
 
-if USE_HOTPLUG
-hotplugfwdir = @HOTPLUGFWDIR@/asihpi
-hotplugfw_DATA = $(dsp_files)
-else
-hotplugfwdir =
-hotplugfw_DATA = 
-endif
+EXTRA_DIST = $(firmware_files) licence.txt
+
+include ../Makefile.hotplug
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/alsa-firmware-1.2.1/asihpi/licence.txt 
new/alsa-firmware-1.2.4/asihpi/licence.txt
--- old/alsa-firmware-1.2.1/asihpi/licence.txt  1970-01-01 01:00:00.000000000 
+0100
+++ new/alsa-firmware-1.2.4/asihpi/licence.txt  2020-10-20 13:28:42.000000000 
+0200
@@ -0,0 +1,20 @@
+GENERAL
+=======
+
+This directory contains the firmware data files for use with asihpi driver. 
+These files should be installed for use by hotplug firmware loader.
+
+
+DEFINITION OF FIRMWARE
+======================
+
+Verbatim copying and distribution of the firmware are permitted
+worldwide, without royalty, in any medium, provided this notice is
+preserved.
+
+
+COPYRIGHT
+=========
+
+Copyright (c) 2005 Audioscience <supp...@audioscience.com>
+Distributable under GPL.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/alsa-firmware-1.2.1/ca0132/Makefile.am 
new/alsa-firmware-1.2.4/ca0132/Makefile.am
--- old/alsa-firmware-1.2.1/ca0132/Makefile.am  2019-11-13 12:06:34.000000000 
+0100
+++ new/alsa-firmware-1.2.4/ca0132/Makefile.am  2020-10-20 13:28:42.000000000 
+0200
@@ -1,13 +1,6 @@
+firmware_dir =
 firmware_files = ctefx.bin ctspeq.bin ctefx-desktop.bin ctefx-r3di.bin
 
-if USE_HOTPLUG
-hotplugfwdir = @HOTPLUGFWDIR@
-hotplugfw_DATA = $(firmware_files)
-else
-hotplugfwdir =
-hotplugfw_DATA = 
-endif
-
 EXTRA_DIST = $(firmware_files) creative.txt
 
-
+include ../Makefile.hotplug
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/alsa-firmware-1.2.1/configure.ac new/alsa-firmware-1.2.4/configure.ac
--- old/alsa-firmware-1.2.1/configure.ac        2019-11-13 12:06:34.000000000 
+0100
+++ new/alsa-firmware-1.2.4/configure.ac        2020-10-20 13:28:42.000000000 
+0200
@@ -1,6 +1,8 @@
 AC_PREREQ(2.59)
-AC_INIT(alsa-firmware, 1.2.1)
+AC_INIT(alsa-firmware, 1.2.4)
+AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_CC
+AC_PROG_CC_FOR_BUILD
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_HEADER_STDC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/alsa-firmware-1.2.1/cs46xx/Makefile.am 
new/alsa-firmware-1.2.4/cs46xx/Makefile.am
--- old/alsa-firmware-1.2.1/cs46xx/Makefile.am  2019-11-13 12:06:34.000000000 
+0100
+++ new/alsa-firmware-1.2.4/cs46xx/Makefile.am  2020-10-20 13:28:42.000000000 
+0200
@@ -1,12 +1,7 @@
+firmware_dir = cs46xx
 firmware_files = ba1 cwc4630 cwcasync cwcbinhack cwcdma cwcsnoop
 
-if USE_HOTPLUG
-hotplugfwdir = @HOTPLUGFWDIR@/cs46xx
-hotplugfw_DATA = $(firmware_files)
-else
-hotplugfwdir =
-hotplugfw_DATA = 
-endif
-
 EXTRA_DIST = $(firmware_files) cs46xx-fw.c cs46xx_image.h \
        cwc4630.h cwcasync.h cwcbinhack.h cwcdma.h cwcsnoop.h
+
+include ../Makefile.hotplug
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/alsa-firmware-1.2.1/echoaudio/Makefile.am 
new/alsa-firmware-1.2.4/echoaudio/Makefile.am
--- old/alsa-firmware-1.2.1/echoaudio/Makefile.am       2019-11-13 
12:06:34.000000000 +0100
+++ new/alsa-firmware-1.2.4/echoaudio/Makefile.am       2020-10-20 
13:28:42.000000000 +0200
@@ -1,4 +1,5 @@
 # # Process this file with automake to produce Makefile.in.
+firmware_dir = ea
 firmware_files =       \
                loader_dsp.fw \
                darla20_dsp.fw \
@@ -30,7 +31,7 @@
                indigo_dj_dsp.fw \
                indigo_djx_dsp.fw
 
-noinst_PROGRAMS = fw_writer
+noinst_PROGRAMS =
 fw_writer_SOURCES = fw_writer.c
 
 EXTRA_DIST =   DSP/LoaderDSP.c \
@@ -62,45 +63,41 @@
                DSP/IndigoIOxDSP.c \
                DSP/IndigoDJDSP.c \
                DSP/IndigoDJxDSP.c \
-               fw_writer.c
+               fw_writer.c \
+               license.txt
 
-CLEANFILES = $(firmware_files) fw_writer
+CLEANFILES = $(firmware_files)
 
-if USE_HOTPLUG
-hotplugfwdir = @HOTPLUGFWDIR@/ea
-hotplugfw_DATA = $(firmware_files)
-else
-hotplugfwdir =
-hotplugfw_DATA = 
-endif
+include ../Makefile.hotplug
+include ../Makefile.fw_writer
 
-$(firmware_files): fw_writer
-       ./fw_writer DSP/LoaderDSP.c loader_dsp.fw
-       ./fw_writer DSP/Darla20DSP.c darla20_dsp.fw
-       ./fw_writer DSP/Gina20DSP.c gina20_dsp.fw
-       ./fw_writer DSP/Layla20DSP.c layla20_dsp.fw
-       ./fw_writer ASIC/LaylaASIC.c layla20_asic.fw
-       ./fw_writer DSP/Darla24DSP.c darla24_dsp.fw
-       ./fw_writer DSP/Gina24DSP.c gina24_301_dsp.fw
-       ./fw_writer ASIC/Gina24ASIC.c gina24_301_asic.fw
-       ./fw_writer DSP/Gina24_361DSP.c gina24_361_dsp.fw
-       ./fw_writer ASIC/Gina24ASIC_361.c gina24_361_asic.fw
-       ./fw_writer DSP/Layla24DSP.c layla24_dsp.fw
-       ./fw_writer ASIC/Layla24_1ASIC.c layla24_1_asic.fw
-       ./fw_writer ASIC/Layla24_2A_ASIC.c layla24_2A_asic.fw
-       ./fw_writer ASIC/Layla24_2S_ASIC.c layla24_2S_asic.fw
-       ./fw_writer DSP/MonaDSP.c mona_301_dsp.fw
-       ./fw_writer ASIC/Mona1ASIC48.c mona_301_1_asic_48.fw
-       ./fw_writer ASIC/Mona1ASIC96.c mona_301_1_asic_96.fw
-       ./fw_writer DSP/Mona361DSP.c mona_361_dsp.fw
-       ./fw_writer ASIC/Mona1ASIC48_361.c mona_361_1_asic_48.fw
-       ./fw_writer ASIC/Mona1ASIC96_361.c mona_361_1_asic_96.fw
-       ./fw_writer ASIC/Mona2ASIC.c mona_2_asic.fw
-       ./fw_writer DSP/MiaDSP.c mia_dsp.fw
-       ./fw_writer DSP/Echo3gDSP.c echo3g_dsp.fw
-       ./fw_writer ASIC/3G_ASIC.c 3g_asic.fw
-       ./fw_writer DSP/IndigoDSP.c indigo_dsp.fw
-       ./fw_writer DSP/IndigoIODSP.c indigo_io_dsp.fw
-       ./fw_writer DSP/IndigoIOxDSP.c indigo_iox_dsp.fw
-       ./fw_writer DSP/IndigoDJDSP.c indigo_dj_dsp.fw
-       ./fw_writer DSP/IndigoDJxDSP.c indigo_djx_dsp.fw
+$(firmware_files): $(fw_writer)
+       ./$(fw_writer) DSP/LoaderDSP.c loader_dsp.fw
+       ./$(fw_writer) DSP/Darla20DSP.c darla20_dsp.fw
+       ./$(fw_writer) DSP/Gina20DSP.c gina20_dsp.fw
+       ./$(fw_writer) DSP/Layla20DSP.c layla20_dsp.fw
+       ./$(fw_writer) ASIC/LaylaASIC.c layla20_asic.fw
+       ./$(fw_writer) DSP/Darla24DSP.c darla24_dsp.fw
+       ./$(fw_writer) DSP/Gina24DSP.c gina24_301_dsp.fw
+       ./$(fw_writer) ASIC/Gina24ASIC.c gina24_301_asic.fw
+       ./$(fw_writer) DSP/Gina24_361DSP.c gina24_361_dsp.fw
+       ./$(fw_writer) ASIC/Gina24ASIC_361.c gina24_361_asic.fw
+       ./$(fw_writer) DSP/Layla24DSP.c layla24_dsp.fw
+       ./$(fw_writer) ASIC/Layla24_1ASIC.c layla24_1_asic.fw
+       ./$(fw_writer) ASIC/Layla24_2A_ASIC.c layla24_2A_asic.fw
+       ./$(fw_writer) ASIC/Layla24_2S_ASIC.c layla24_2S_asic.fw
+       ./$(fw_writer) DSP/MonaDSP.c mona_301_dsp.fw
+       ./$(fw_writer) ASIC/Mona1ASIC48.c mona_301_1_asic_48.fw
+       ./$(fw_writer) ASIC/Mona1ASIC96.c mona_301_1_asic_96.fw
+       ./$(fw_writer) DSP/Mona361DSP.c mona_361_dsp.fw
+       ./$(fw_writer) ASIC/Mona1ASIC48_361.c mona_361_1_asic_48.fw
+       ./$(fw_writer) ASIC/Mona1ASIC96_361.c mona_361_1_asic_96.fw
+       ./$(fw_writer) ASIC/Mona2ASIC.c mona_2_asic.fw
+       ./$(fw_writer) DSP/MiaDSP.c mia_dsp.fw
+       ./$(fw_writer) DSP/Echo3gDSP.c echo3g_dsp.fw
+       ./$(fw_writer) ASIC/3G_ASIC.c 3g_asic.fw
+       ./$(fw_writer) DSP/IndigoDSP.c indigo_dsp.fw
+       ./$(fw_writer) DSP/IndigoIODSP.c indigo_io_dsp.fw
+       ./$(fw_writer) DSP/IndigoIOxDSP.c indigo_iox_dsp.fw
+       ./$(fw_writer) DSP/IndigoDJDSP.c indigo_dj_dsp.fw
+       ./$(fw_writer) DSP/IndigoDJxDSP.c indigo_djx_dsp.fw
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/alsa-firmware-1.2.1/echoaudio/license.txt 
new/alsa-firmware-1.2.4/echoaudio/license.txt
--- old/alsa-firmware-1.2.1/echoaudio/license.txt       1970-01-01 
01:00:00.000000000 +0100
+++ new/alsa-firmware-1.2.4/echoaudio/license.txt       2020-10-20 
13:28:42.000000000 +0200
@@ -0,0 +1,16 @@
+Copyright (c) 2004 Echo Digital Audio
+All rights reserved.
+www.echoaudio.com
+
+
+
+  This software may be distributed under the terms of the
+GNU General Public License ("GPL") version 2 as published by the Free
+Software Foundation (see below).
+
+
+  Echo Digital Audio does not disclose the source code from which these 
firmware 
+images are derived. Permission is hereby granted for the distribution of these 
+firmware images as part of the Linux kernel or other GPL project in text or 
binary 
+form as required.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/alsa-firmware-1.2.1/emu/Makefile.am new/alsa-firmware-1.2.4/emu/Makefile.am
--- old/alsa-firmware-1.2.1/emu/Makefile.am     2019-11-13 12:06:34.000000000 
+0100
+++ new/alsa-firmware-1.2.4/emu/Makefile.am     2020-10-20 13:28:42.000000000 
+0200
@@ -1,7 +1,8 @@
 # # Process this file with automake to produce Makefile.in.
-firmware_files =       hana.fw audio_dock.fw emu0404.fw micro_dock.fw 
emu1010_notebook.fw emu1010b.fw
+firmware_dir = emu
+firmware_files = hana.fw audio_dock.fw emu0404.fw micro_dock.fw 
emu1010_notebook.fw emu1010b.fw
 
-noinst_PROGRAMS = fw_writer
+noinst_PROGRAMS =
 fw_writer_SOURCES = fw_writer.c
 
 EXTRA_DIST =   hana_netlist.h \
@@ -10,17 +11,13 @@
                emu0404_netlist.h \
                micro_dock_netlist.h \
                emu1010_notebook_netlist.h \
-               emu1010b_netlist.h
+               emu1010b_netlist.h \
+               license.txt
 
-CLEANFILES = $(firmware_files) fw_writer
+CLEANFILES = $(firmware_files)
 
-if USE_HOTPLUG
-hotplugfwdir = @HOTPLUGFWDIR@/emu
-hotplugfw_DATA = $(firmware_files)
-else
-hotplugfwdir =
-hotplugfw_DATA = 
-endif
+include ../Makefile.hotplug
+include ../Makefile.fw_writer
 
-$(firmware_files): fw_writer
-       ./fw_writer
+$(firmware_files): $(fw_writer)
+       ./$(fw_writer)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/alsa-firmware-1.2.1/emu/license.txt new/alsa-firmware-1.2.4/emu/license.txt
--- old/alsa-firmware-1.2.1/emu/license.txt     1970-01-01 01:00:00.000000000 
+0100
+++ new/alsa-firmware-1.2.4/emu/license.txt     2020-10-20 13:28:42.000000000 
+0200
@@ -0,0 +1,22 @@
+GENERAL
+=======
+
+This directory contains the firmware data files for the
+EMU 1212m, 1820 and 1820m sound cards. Install this with the
+same prefix option as you used for alsa-tools.
+
+
+DEFINITION OF FIRMWARE
+======================
+
+Verbatim copying and distribution of the firmware are permitted
+worldwide, without royalty, in any medium, provided this notice is
+preserved.
+
+
+COPYRIGHT
+=========
+
+Copyright (c) 2003 by E-MU Systems, Inc. All rights reserved.
+Distributable under GPL.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/alsa-firmware-1.2.1/hdsploader/Makefile.am 
new/alsa-firmware-1.2.4/hdsploader/Makefile.am
--- old/alsa-firmware-1.2.1/hdsploader/Makefile.am      2019-11-13 
12:06:34.000000000 +0100
+++ new/alsa-firmware-1.2.4/hdsploader/Makefile.am      2020-10-20 
13:28:42.000000000 +0200
@@ -1,36 +1,27 @@
 # # Process this file with automake to produce Makefile.in.
-MYNAME = hdsploader
-
 dsp_hex_files = digiface_firmware.bin \
                digiface_firmware_rev11.bin \
                multiface_firmware.bin \
                multiface_firmware_rev11.bin
 dsp_bin_files = rpm_firmware.bin
-dsp_files = $(dsp_hex_files) $(dsp_bin_files)
 
-if USE_LOADER
-firmwaredir = $(datadir)/alsa/firmware/$(MYNAME)
-firmware_DATA = $(dsp_files)
-else
-firmwaredir = 
-firmware_DATA = 
-endif
-
-if USE_HOTPLUG
-hotplugfwdir = @HOTPLUGFWDIR@
-hotplugfw_DATA = $(dsp_files)
-else
-hotplugfwdir =
-hotplugfw_DATA = 
-endif
+firmware_dir = 
+firmware_files = $(dsp_hex_files) $(dsp_bin_files)
+loader_dir = hdsploader
+loader_files = $(firmware_files)
 
-noinst_PROGRAMS = tobin
-tobin_SOURCES = tobin.c
+noinst_PROGRAMS =
+fw_writer_SOURCES = tobin.c
 
 EXTRA_DIST = $(dsp_hex_files:%.bin=%.dat) \
             $(dsp_bin_files) \
             tobin.c
+
 CLEANFILES = $(dsp_hex_files)
 
-$(dsp_hex_files): tobin
-       ./tobin
+include ../Makefile.loader
+include ../Makefile.hotplug
+include ../Makefile.fw_writer
+
+$(firmware_files): $(fw_writer)
+       ./$(fw_writer)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/alsa-firmware-1.2.1/korg1212/Makefile.am 
new/alsa-firmware-1.2.4/korg1212/Makefile.am
--- old/alsa-firmware-1.2.1/korg1212/Makefile.am        2019-11-13 
12:06:34.000000000 +0100
+++ new/alsa-firmware-1.2.4/korg1212/Makefile.am        2020-10-20 
13:28:42.000000000 +0200
@@ -1,13 +1,8 @@
 # # Process this file with automake to produce Makefile.in.
 
-dsp_files = k1212.dsp
+firmware_dir = korg
+firmware_files = k1212.dsp
 
-EXTRA_DIST = $(dsp_files)
+EXTRA_DIST = $(firmware_files)
 
-if USE_HOTPLUG
-hotplugfwdir = @HOTPLUGFWDIR@/korg
-hotplugfw_DATA = $(dsp_files)
-else
-hotplugfwdir =
-hotplugfw_DATA =
-endif
+include ../Makefile.hotplug
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/alsa-firmware-1.2.1/m4/ax_prog_cc_for_build.m4 
new/alsa-firmware-1.2.4/m4/ax_prog_cc_for_build.m4
--- old/alsa-firmware-1.2.1/m4/ax_prog_cc_for_build.m4  1970-01-01 
01:00:00.000000000 +0100
+++ new/alsa-firmware-1.2.4/m4/ax_prog_cc_for_build.m4  2020-10-20 
13:28:42.000000000 +0200
@@ -0,0 +1,156 @@
+# ===========================================================================
+#   https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PROG_CC_FOR_BUILD
+#
+# DESCRIPTION
+#
+#   This macro searches for a C compiler that generates native executables,
+#   that is a C compiler that surely is not a cross-compiler. This can be
+#   useful if you have to generate source code at compile-time like for
+#   example GCC does.
+#
+#   The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything
+#   needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD).
+#   The value of these variables can be overridden by the user by specifying
+#   a compiler with an environment variable (like you do for standard CC).
+#
+#   It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object
+#   file extensions for the build platform, and GCC_FOR_BUILD to `yes' if
+#   the compiler we found is GCC. All these variables but GCC_FOR_BUILD are
+#   substituted in the Makefile.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Paolo Bonzini <bonz...@gnu.org>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 18
+
+
+# _AC_LANG_COMPILER_GNU
+# ---------------------
+# This is hacked version to bypass the cache. --jk
+m4_define([_AC_LANG_COMPILER_GNU],
+[AC_MSG_CHECKING([whether we are using the GNU _AC_LANG compiler])
+ _AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[#ifndef __GNUC__
+       choke me
+#endif
+]])],
+               [ac_compiler_gnu=yes],
+               [ac_compiler_gnu=no])
+ac_cv_[]_AC_LANG_ABBREV[]_compiler_gnu=$ac_compiler_gnu
+AC_MSG_RESULT([$ac_compiler_gnu])
+])# _AC_LANG_COMPILER_GNU
+
+
+AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD])
+AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_CPP])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+
+dnl Use the standard macros, but make them use other variable names
+dnl
+pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl
+pushdef([ac_cv_prog_cc_c89], ac_cv_build_prog_cc_c89)dnl
+pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl
+pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl
+pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl
+pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl
+pushdef([ac_cv_c_compiler_gnu], ac_cv_build_c_compiler_gnu)dnl
+pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl
+pushdef([ac_cv_objext], ac_cv_build_objext)dnl
+pushdef([ac_exeext], ac_build_exeext)dnl
+pushdef([ac_objext], ac_build_objext)dnl
+pushdef([CC], CC_FOR_BUILD)dnl
+pushdef([CPP], CPP_FOR_BUILD)dnl
+pushdef([GCC], GCC_FOR_BUILD)dnl
+pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl
+pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl
+pushdef([EXEEXT], BUILD_EXEEXT)dnl
+pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl
+pushdef([OBJEXT], BUILD_OBJEXT)dnl
+pushdef([host], build)dnl
+pushdef([host_alias], build_alias)dnl
+pushdef([host_cpu], build_cpu)dnl
+pushdef([host_vendor], build_vendor)dnl
+pushdef([host_os], build_os)dnl
+pushdef([ac_cv_host], ac_cv_build)dnl
+pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl
+pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl
+pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl
+pushdef([ac_cv_host_os], ac_cv_build_os)dnl
+pushdef([ac_tool_prefix], ac_build_tool_prefix)dnl
+pushdef([am_cv_CC_dependencies_compiler_type], 
am_cv_build_CC_dependencies_compiler_type)dnl
+pushdef([am_cv_prog_cc_c_o], am_cv_build_prog_cc_c_o)dnl
+pushdef([cross_compiling], cross_compiling_build)dnl
+
+cross_compiling_build=no
+
+ac_build_tool_prefix=
+AS_IF([test -n "$build"],      [ac_build_tool_prefix="$build-"],
+      [test -n "$build_alias"],[ac_build_tool_prefix="$build_alias-"])
+
+AC_LANG_PUSH([C])
+AC_PROG_CC
+_AC_COMPILER_EXEEXT
+_AC_COMPILER_OBJEXT
+AC_PROG_CPP
+
+dnl Restore the old definitions
+dnl
+popdef([cross_compiling])dnl
+popdef([am_cv_prog_cc_c_o])dnl
+popdef([am_cv_CC_dependencies_compiler_type])dnl
+popdef([ac_tool_prefix])dnl
+popdef([ac_cv_host_os])dnl
+popdef([ac_cv_host_vendor])dnl
+popdef([ac_cv_host_cpu])dnl
+popdef([ac_cv_host_alias])dnl
+popdef([ac_cv_host])dnl
+popdef([host_os])dnl
+popdef([host_vendor])dnl
+popdef([host_cpu])dnl
+popdef([host_alias])dnl
+popdef([host])dnl
+popdef([OBJEXT])dnl
+popdef([LDFLAGS])dnl
+popdef([EXEEXT])dnl
+popdef([CPPFLAGS])dnl
+popdef([CFLAGS])dnl
+popdef([GCC])dnl
+popdef([CPP])dnl
+popdef([CC])dnl
+popdef([ac_objext])dnl
+popdef([ac_exeext])dnl
+popdef([ac_cv_objext])dnl
+popdef([ac_cv_exeext])dnl
+popdef([ac_cv_c_compiler_gnu])dnl
+popdef([ac_cv_prog_cc_g])dnl
+popdef([ac_cv_prog_cc_cross])dnl
+popdef([ac_cv_prog_cc_works])dnl
+popdef([ac_cv_prog_cc_c89])dnl
+popdef([ac_cv_prog_gcc])dnl
+popdef([ac_cv_prog_CPP])dnl
+
+dnl restore global variables ac_ext, ac_cpp, ac_compile,
+dnl ac_link, ac_compiler_gnu (dependant on the current
+dnl language after popping):
+AC_LANG_POP([C])
+
+dnl Finally, set Makefile variables
+dnl
+AC_SUBST(BUILD_EXEEXT)dnl
+AC_SUBST(BUILD_OBJEXT)dnl
+AC_SUBST([CFLAGS_FOR_BUILD])dnl
+AC_SUBST([CPPFLAGS_FOR_BUILD])dnl
+AC_SUBST([LDFLAGS_FOR_BUILD])dnl
+])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/alsa-firmware-1.2.1/maestro3/Makefile.am 
new/alsa-firmware-1.2.4/maestro3/Makefile.am
--- old/alsa-firmware-1.2.1/maestro3/Makefile.am        2019-11-13 
12:06:34.000000000 +0100
+++ new/alsa-firmware-1.2.4/maestro3/Makefile.am        2020-10-20 
13:28:42.000000000 +0200
@@ -1,21 +1,17 @@
 # # Process this file with automake to produce Makefile.in.
 
+firmware_dir = ess
 firmware_files = maestro3_assp_kernel.fw maestro3_assp_minisrc.fw
 
-noinst_PROGRAMS = fw_writer
+noinst_PROGRAMS =
 fw_writer_SOURCES = fw_writer.c
 
 EXTRA_DIST = fw_writer.c maestro3.h
 
-CLEANFILES = $(firmware_files) fw_writer
+CLEANFILES = $(firmware_files)
 
-if USE_HOTPLUG
-hotplugfwdir = @HOTPLUGFWDIR@/ess
-hotplugfw_DATA = $(firmware_files)
-else
-hotplugfwdir =
-hotplugfw_DATA =
-endif
+include ../Makefile.hotplug
+include ../Makefile.fw_writer
 
-$(firmware_files): fw_writer
-       ./fw_writer
+$(firmware_files): $(fw_writer)
+       ./$(fw_writer)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/alsa-firmware-1.2.1/mixartloader/Makefile.am 
new/alsa-firmware-1.2.4/mixartloader/Makefile.am
--- old/alsa-firmware-1.2.1/mixartloader/Makefile.am    2019-11-13 
12:06:34.000000000 +0100
+++ new/alsa-firmware-1.2.4/mixartloader/Makefile.am    2020-10-20 
13:28:42.000000000 +0200
@@ -1,25 +1,14 @@
-MYNAME = mixartloader
+loader_dir = mixartloader
+firmware_dir = mixart
 
 cfg_files = miXart.conf
-dsp_files = \
+firmware_files = \
        miXart8AES.xlx \
        miXart8.elf \
        miXart8.xlx
+loader_files = $(cfg_files) $(firmware_files)
 
-EXTRA_DIST = $(cfg_files) $(dsp_files)
+EXTRA_DIST = $(loader_files)
 
-if USE_LOADER
-firmwaredir = $(datadir)/alsa/firmware/$(MYNAME)
-firmware_DATA = $(cfg_files) $(dsp_files)
-else
-firmwaredir = 
-firmware_DATA = 
-endif
-
-if USE_HOTPLUG
-hotplugfwdir = @HOTPLUGFWDIR@/mixart
-hotplugfw_DATA = $(dsp_files)
-else
-hotplugfwdir =
-hotplugfw_DATA = 
-endif
+include ../Makefile.loader
+include ../Makefile.hotplug
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/alsa-firmware-1.2.1/multisound/Makefile.am 
new/alsa-firmware-1.2.4/multisound/Makefile.am
--- old/alsa-firmware-1.2.1/multisound/Makefile.am      2019-11-13 
12:06:34.000000000 +0100
+++ new/alsa-firmware-1.2.4/multisound/Makefile.am      2020-10-20 
13:28:42.000000000 +0200
@@ -26,4 +26,3 @@
        rm -f $(DESTDIR)$(hotplugfwdir)/pndsperm.bin
 
 endif
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/alsa-firmware-1.2.1/pcxhrloader/Makefile.am 
new/alsa-firmware-1.2.4/pcxhrloader/Makefile.am
--- old/alsa-firmware-1.2.1/pcxhrloader/Makefile.am     2019-11-13 
12:06:34.000000000 +0100
+++ new/alsa-firmware-1.2.4/pcxhrloader/Makefile.am     2020-10-20 
13:28:42.000000000 +0200
@@ -1,4 +1,5 @@
-MYNAME = pcxhrloader
+loader_dir = pcxhrloader
+firmware_dir = pcxhr
 
 cfg_files = \
        pcxhr.conf      \
@@ -8,7 +9,7 @@
        pcxhr3.conf     \
        pcxhr4.conf     \
        pcxhr5.conf
-dsp_files = \
+firmware_files = \
        xi_1_882.dat    \
        xc_1_882.dat    \
        e321_512.e56    \
@@ -31,21 +32,9 @@
        dspe924.e56     \
        dspb924.b56     \
        dspd222.d56
+loader_files = $(cfg_files) $(firmware_files)
 
-EXTRA_DIST = $(cfg_files) $(dsp_files)
+EXTRA_DIST = $(loader_files)
 
-if USE_LOADER
-firmwaredir = $(datadir)/alsa/firmware/$(MYNAME)
-firmware_DATA = $(cfg_files) $(dsp_files)
-else
-firmwaredir = 
-firmware_DATA = 
-endif
-
-if USE_HOTPLUG
-hotplugfwdir = @HOTPLUGFWDIR@/pcxhr
-hotplugfw_DATA = $(dsp_files)
-else
-hotplugfwdir =
-hotplugfw_DATA = 
-endif
+include ../Makefile.loader
+include ../Makefile.hotplug
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/alsa-firmware-1.2.1/sb16/Makefile.am 
new/alsa-firmware-1.2.4/sb16/Makefile.am
--- old/alsa-firmware-1.2.1/sb16/Makefile.am    2019-11-13 12:06:34.000000000 
+0100
+++ new/alsa-firmware-1.2.4/sb16/Makefile.am    2020-10-20 13:28:42.000000000 
+0200
@@ -1,22 +1,18 @@
 # # Process this file with automake to produce Makefile.in.
 
+firmware_dir = sb16
 firmware_files = mulaw_main.csp alaw_main.csp \
                 ima_adpcm_init.csp ima_adpcm_playback.csp ima_adpcm_capture.csp
 
-noinst_PROGRAMS = fw_writer
+noinst_PROGRAMS =
 fw_writer_SOURCES = fw_writer.c
 
 EXTRA_DIST = fw_writer.c sb16_csp_codecs.h
 
-CLEANFILES = $(firmware_files) fw_writer
+CLEANFILES = $(firmware_files)
 
-if USE_HOTPLUG
-hotplugfwdir = @HOTPLUGFWDIR@/sb16
-hotplugfw_DATA = $(firmware_files)
-else
-hotplugfwdir =
-hotplugfw_DATA =
-endif
+include ../Makefile.hotplug
+include ../Makefile.fw_writer
 
-$(firmware_files): fw_writer
-       ./fw_writer
+$(firmware_files): $(fw_writer)
+       ./$(fw_writer)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/alsa-firmware-1.2.1/vxloader/Makefile.am 
new/alsa-firmware-1.2.4/vxloader/Makefile.am
--- old/alsa-firmware-1.2.1/vxloader/Makefile.am        2019-11-13 
12:06:34.000000000 +0100
+++ new/alsa-firmware-1.2.4/vxloader/Makefile.am        2020-10-20 
13:28:42.000000000 +0200
@@ -1,5 +1,3 @@
-MYNAME = vxloader
-
 cfg_files = vx222.conf vxboard.conf vxpocket.conf vxp440.conf
 
 dsp_files = \
@@ -21,27 +19,30 @@
 
 xlx_files = $(rbt_files:%.rbt=%.xlx)
 
+loader_dir = vxloader
+loader_files = $(cfg_files) $(dsp_files) $(rbt_files)
+firmware_dir = vx
+firmware_files = $(dsp_files) $(xlx_files)
+
 noinst_PROGRAMS = toxlx
 toxlx_SOURCES = toxlx.c
 
 EXTRA_DIST = $(cfg_files) $(dsp_files) $(rbt_files) toxlx.c
 CLEANFILES = $(xlx_files)
 
-if USE_LOADER
-firmwaredir = $(datadir)/alsa/firmware/$(MYNAME)
-firmware_DATA = $(cfg_files) $(dsp_files) $(rbt_files)
-else
-firmwaredir = 
-firmware_DATA = 
-endif
-
-if USE_HOTPLUG
-hotplugfwdir = @HOTPLUGFWDIR@/vx
-hotplugfw_DATA = $(dsp_files) $(xlx_files)
-else
-hotplugfwdir =
-hotplugfw_DATA = 
-endif
+include ../Makefile.loader
+include ../Makefile.hotplug
+
+LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) 
$(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
+
+$(toxlx_OBJECTS) : CC=$(CC_FOR_BUILD)
+$(toxlx_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
+$(toxlx_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+
+toxlx = toxlx$(EXEEXT)
+
+$(toxlx): $(toxlx_OBJECTS)
+       $(LINK_FOR_BUILD) $^ $(LDLIBS_FOR_BUILD) -o $@
 
-%.xlx: %.rbt toxlx
+%.xlx: %.rbt $(toxlx)
        ./toxlx < $< > $@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/alsa-firmware-1.2.1/wavefront/Makefile.am 
new/alsa-firmware-1.2.4/wavefront/Makefile.am
--- old/alsa-firmware-1.2.1/wavefront/Makefile.am       2019-11-13 
12:06:34.000000000 +0100
+++ new/alsa-firmware-1.2.4/wavefront/Makefile.am       2020-10-20 
13:28:42.000000000 +0200
@@ -1,5 +1,6 @@
 # # Process this file with automake to produce Makefile.in.
 
+firmware_dir = yamaha
 firmware_files = yss225_registers.bin
 
 noinst_PROGRAMS = fw_writer
@@ -7,15 +8,10 @@
 
 EXTRA_DIST = fw_writer.c yss225.c
 
-CLEANFILES = $(firmware_files) fw_writer
+CLEANFILES = $(firmware_files)
 
-if USE_HOTPLUG
-hotplugfwdir = @HOTPLUGFWDIR@/yamaha
-hotplugfw_DATA = $(firmware_files)
-else
-hotplugfwdir =
-hotplugfw_DATA =
-endif
+include ../Makefile.hotplug
+include ../Makefile.fw_writer
 
-$(firmware_files): fw_writer
-       ./fw_writer
+$(firmware_files): $(fw_writer)
+       ./$(fw_writer)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/alsa-firmware-1.2.1/ymfpci/Makefile.am 
new/alsa-firmware-1.2.4/ymfpci/Makefile.am
--- old/alsa-firmware-1.2.1/ymfpci/Makefile.am  2019-11-13 12:06:34.000000000 
+0100
+++ new/alsa-firmware-1.2.4/ymfpci/Makefile.am  2020-10-20 13:28:42.000000000 
+0200
@@ -1,5 +1,6 @@
 # # Process this file with automake to produce Makefile.in.
 
+firmware_dir = yamaha
 firmware_files = ds1_dsp.fw ds1_ctrl.fw ds1e_ctrl.fw
 
 noinst_PROGRAMS = fw_writer
@@ -7,15 +8,10 @@
 
 EXTRA_DIST = fw_writer.c hwmcode.c
 
-CLEANFILES = $(firmware_files) fw_writer
+CLEANFILES = $(firmware_files)
 
-if USE_HOTPLUG
-hotplugfwdir = @HOTPLUGFWDIR@/yamaha
-hotplugfw_DATA = $(firmware_files)
-else
-hotplugfwdir =
-hotplugfw_DATA =
-endif
+include ../Makefile.hotplug
+include ../Makefile.fw_writer
 
-$(firmware_files): fw_writer
-       ./fw_writer
+$(firmware_files): $(fw_writer)
+       ./$(fw_writer)


Reply via email to