introduce Makefile.hotplug

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/Makefile.am b/Makefile.am
index 38e6d918249d861eeb4c1c124c567864c158f476..231a2ca60c2bbb4e3ef09240ef92f6a661fb097e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = hdsploader mixartloader pcxhrloader usx2yloader vxloader echoaudio \
          asihpi emu korg1212 maestro3 multisound sb16 wavefront \
          ymfpci aica ca0132 cs46xx
 
-EXTRA_DIST = depcomp Makefile.fw_writer
+EXTRA_DIST = depcomp Makefile.fw_writer Makefile.hotplug
 
 dist-hook:
        -chmod -R a+r $(distdir)

diff --git a/Makefile.fw_writer b/Makefile.fw_writer
index 8eaddfa08770fe8562ddcd54228e633526c12854..93b0d631f457131520f45f6db63142bf2fa5a873 100644 (file)
--- a/Makefile.fw_writer
+++ b/Makefile.fw_writer
@@ -2,14 +2,6 @@
 # Common parts for the firmware generation
 #
 
-if USE_HOTPLUG
-hotplugfwdir = @HOTPLUGFWDIR@/$(firmware_dir)
-hotplugfw_DATA = $(firmware_files)
-else
-hotplugfwdir =
-hotplugfw_DATA =
-endif
-
 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)

diff --git a/Makefile.hotplug b/Makefile.hotplug
new file mode 100644 (file)
index 0000000..bd5c433
--- /dev/null
+++ b/Makefile.hotplug
@@ -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 --git a/aica/Makefile.am b/aica/Makefile.am
index 04bb26794bdd1508777d4a3394354256ca0628d7..d5ffb3fb57e696dcacd3c7697f61c909514ab4b6 100644 (file)
--- a/aica/Makefile.am
+++ b/aica/Makefile.am
@@ -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 --git a/asihpi/Makefile.am b/asihpi/Makefile.am
index 45e2196671d8115ad6b7f7f7a60c57f2d12dcb09..064aba2ea35e608e200d745f8639b4dabe7029ab 100644 (file)
--- a/asihpi/Makefile.am
+++ b/asihpi/Makefile.am
@@ -1,6 +1,7 @@
 MYNAME = asihpi
 
-dsp_files = \
+firmware_dir = asihpi
+firmware_files = \
        dsp5000.bin\
        dsp6200.bin\
        dsp6205.bin\
@@ -9,12 +10,6 @@ dsp_files = \
        dsp8700.bin\
        dsp8900.bin
 
-EXTRA_DIST = $(dsp_files) licence.txt
+EXTRA_DIST = $(firmware_files) licence.txt
 
-if USE_HOTPLUG
-hotplugfwdir = @HOTPLUGFWDIR@/asihpi
-hotplugfw_DATA = $(dsp_files)
-else
-hotplugfwdir =
-hotplugfw_DATA = 
-endif
+include ../Makefile.hotplug

diff --git a/ca0132/Makefile.am b/ca0132/Makefile.am
index f18aef6c3c15e5085845c13892626e4131336571..e4fc48ce5e9265cccb22921a53b92c901f0ca54c 100644 (file)
--- a/ca0132/Makefile.am
+++ b/ca0132/Makefile.am
@@ -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 --git a/cs46xx/Makefile.am b/cs46xx/Makefile.am
index e1c15f722a2f20e460bf515d47136e2c9ecf12f9..b7b68cd20a29a8f75f14fb5384d25197f3dc7768 100644 (file)
--- a/cs46xx/Makefile.am
+++ b/cs46xx/Makefile.am
@@ -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 --git a/echoaudio/Makefile.am b/echoaudio/Makefile.am
index fcd0bc390b95fc54af394a67ebf2370bb4927894..be71604769a3f7339a34d733ae59771eebf30a2c 100644 (file)
--- a/echoaudio/Makefile.am
+++ b/echoaudio/Makefile.am
@@ -68,6 +68,7 @@ EXTRA_DIST =  DSP/LoaderDSP.c \
 
 CLEANFILES = $(firmware_files) fw_writer
 
+include ../Makefile.hotplug
 include ../Makefile.fw_writer
 
 $(firmware_files): fw_writer

diff --git a/emu/Makefile.am b/emu/Makefile.am
index 5d97e11075a642b374a8e9622bc772b3dd78e6b3..e03fdbf7bb514b490dec3aa3b39ef5e0ec716f38 100644 (file)
--- a/emu/Makefile.am
+++ b/emu/Makefile.am
@@ -16,6 +16,7 @@ EXTRA_DIST =  hana_netlist.h \
 
 CLEANFILES = $(firmware_files) fw_writer
 
+include ../Makefile.hotplug
 include ../Makefile.fw_writer
 
 $(firmware_files): fw_writer

diff --git a/hdsploader/Makefile.am b/hdsploader/Makefile.am
index 66f1700a452d06591b5817450a60b8faf196b264..398f7032969b5171ab68a6f9afbf6710c2519cfa 100644 (file)
--- a/hdsploader/Makefile.am
+++ b/hdsploader/Makefile.am
@@ -26,6 +26,7 @@ EXTRA_DIST = $(dsp_hex_files:%.bin=%.dat) \
             tobin.c
 CLEANFILES = $(dsp_hex_files)
 
+include ../Makefile.hotplug
 include ../Makefile.fw_writer
 
 $(firmware_files): fw_writer

diff --git a/korg1212/Makefile.am b/korg1212/Makefile.am
index 3c6221b14df406ce7f0ba1d11d5e46670e54feb0..3d91b63bfed3d46a42ebb240e2e731aa64a1acdf 100644 (file)
--- a/korg1212/Makefile.am
+++ b/korg1212/Makefile.am
@@ -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 --git a/maestro3/Makefile.am b/maestro3/Makefile.am
index 97da0e0217ebd38afb744863e2c679cd1082cfba..ba1374021dd677af850fbb28b86a93d7197c1b14 100644 (file)
--- a/maestro3/Makefile.am
+++ b/maestro3/Makefile.am
@@ -10,6 +10,7 @@ EXTRA_DIST = fw_writer.c maestro3.h
 
 CLEANFILES = $(firmware_files) fw_writer
 
+include ../Makefile.hotplug
 include ../Makefile.fw_writer
 
 $(firmware_files): fw_writer

diff --git a/mixartloader/Makefile.am b/mixartloader/Makefile.am
index 41538d4ce78bc4eba20e66121f19830ee27e5814..dc12edb2399294cde094b53fc50c1f0fe5ceeccd 100644 (file)
--- a/mixartloader/Makefile.am
+++ b/mixartloader/Makefile.am
@@ -1,25 +1,21 @@
 MYNAME = mixartloader
 
+firmware_dir = mixart
+
 cfg_files = miXart.conf
-dsp_files = \
+firmware_files = \
        miXart8AES.xlx \
        miXart8.elf \
        miXart8.xlx
 
-EXTRA_DIST = $(cfg_files) $(dsp_files)
+EXTRA_DIST = $(cfg_files) $(firmware_files)
 
 if USE_LOADER
 firmwaredir = $(datadir)/alsa/firmware/$(MYNAME)
-firmware_DATA = $(cfg_files) $(dsp_files)
+firmware_DATA = $(cfg_files) $(firmware_files)
 else
 firmwaredir = 
 firmware_DATA = 
 endif
 
-if USE_HOTPLUG
-hotplugfwdir = @HOTPLUGFWDIR@/mixart
-hotplugfw_DATA = $(dsp_files)
-else
-hotplugfwdir =
-hotplugfw_DATA = 
-endif
+include ../Makefile.hotplug

diff --git a/multisound/Makefile.am b/multisound/Makefile.am
index 782ce906a2b5e805de2c90e49fc2bcbf1ccb60f2..14df087bb965dd85e6c80762df2f3f1414318f1d 100644 (file)
--- a/multisound/Makefile.am
+++ b/multisound/Makefile.am
@@ -26,4 +26,3 @@ uninstall-hook:
        rm -f $(DESTDIR)$(hotplugfwdir)/pndsperm.bin
 
 endif
-

diff --git a/pcxhrloader/Makefile.am b/pcxhrloader/Makefile.am
index 426f0888c393204ff7b3edcdbfe6ab3ed3b93a2e..ff9fe3ef21f18b83db19e703a671c20da788a241 100644 (file)
--- a/pcxhrloader/Makefile.am
+++ b/pcxhrloader/Makefile.am
@@ -1,5 +1,7 @@
 MYNAME = pcxhrloader
 
+firmware_dir = pcxhr
+
 cfg_files = \
        pcxhr.conf      \
        pcxhr0.conf     \
@@ -8,7 +10,7 @@ cfg_files = \
        pcxhr3.conf     \
        pcxhr4.conf     \
        pcxhr5.conf
-dsp_files = \
+firmware_files = \
        xi_1_882.dat    \
        xc_1_882.dat    \
        e321_512.e56    \
@@ -32,20 +34,14 @@ dsp_files = \
        dspb924.b56     \
        dspd222.d56
 
-EXTRA_DIST = $(cfg_files) $(dsp_files)
+EXTRA_DIST = $(cfg_files) $(firmware_files)
 
 if USE_LOADER
 firmwaredir = $(datadir)/alsa/firmware/$(MYNAME)
-firmware_DATA = $(cfg_files) $(dsp_files)
+firmware_DATA = $(cfg_files) $(firmware_files)
 else
 firmwaredir = 
 firmware_DATA = 
 endif
 
-if USE_HOTPLUG
-hotplugfwdir = @HOTPLUGFWDIR@/pcxhr
-hotplugfw_DATA = $(dsp_files)
-else
-hotplugfwdir =
-hotplugfw_DATA = 
-endif
+include ../Makefile.hotplug

diff --git a/sb16/Makefile.am b/sb16/Makefile.am
index fdccb536d2a3b98a87994475a2d021890a63161c..a69103fa8bf1064373f7b8cd2489bb578720b13c 100644 (file)
--- a/sb16/Makefile.am
+++ b/sb16/Makefile.am
@@ -11,6 +11,7 @@ EXTRA_DIST = fw_writer.c sb16_csp_codecs.h
 
 CLEANFILES = $(firmware_files) fw_writer
 
+include ../Makefile.hotplug
 include ../Makefile.fw_writer
 
 $(firmware_files): fw_writer

diff --git a/vxloader/Makefile.am b/vxloader/Makefile.am
index e67fd53469fba22a34fc394e14686a6fc89523a1..d7867e864ae01507590d3e8706786dbced642f0f 100644 (file)
--- a/vxloader/Makefile.am
+++ b/vxloader/Makefile.am
@@ -21,6 +21,9 @@ rbt_files = \
 
 xlx_files = $(rbt_files:%.rbt=%.xlx)
 
+firmware_dir = vx
+firmware_files = $(dsp_files) $(xlx_files)
+
 noinst_PROGRAMS = toxlx
 toxlx_SOURCES = toxlx.c
 
@@ -35,13 +38,7 @@ firmwaredir =
 firmware_DATA = 
 endif
 
-if USE_HOTPLUG
-hotplugfwdir = @HOTPLUGFWDIR@/vx
-hotplugfw_DATA = $(dsp_files) $(xlx_files)
-else
-hotplugfwdir =
-hotplugfw_DATA = 
-endif
+include ../Makefile.hotplug
 
 LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
 

diff --git a/wavefront/Makefile.am b/wavefront/Makefile.am
index 2643f5bcc204cd81e1f0aac8274d4f7284fbf49a..d60b7ef678ba6ebb8867b2274ab1771b37b41d1c 100644 (file)
--- a/wavefront/Makefile.am
+++ b/wavefront/Makefile.am
@@ -10,6 +10,7 @@ EXTRA_DIST = fw_writer.c yss225.c
 
 CLEANFILES = $(firmware_files) fw_writer
 
+include ../Makefile.hotplug
 include ../Makefile.fw_writer
 
 $(firmware_files): fw_writer

diff --git a/ymfpci/Makefile.am b/ymfpci/Makefile.am
index e8a349e619f4080c6cb29124b694adffffaf67cb..d4fb7ea3c235eaa9346ea92063eaa532c0dbac99 100644 (file)
--- a/ymfpci/Makefile.am
+++ b/ymfpci/Makefile.am
@@ -10,6 +10,7 @@ EXTRA_DIST = fw_writer.c hwmcode.c
 
 CLEANFILES = $(firmware_files) fw_writer
 
+include ../Makefile.hotplug
 include ../Makefile.fw_writer
 
 $(firmware_files): fw_writer