introduce Makefile.loader

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

diff --git a/Makefile.am b/Makefile.am
index 231a2ca60c2bbb4e3ef09240ef92f6a661fb097e..daee273bfb281d098fb1dfb2f3e475d9877bf3a0 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 Makefile.hotplug
+EXTRA_DIST = depcomp Makefile.fw_writer Makefile.hotplug Makefile.loader
 
 dist-hook:
        -chmod -R a+r $(distdir)

diff --git a/Makefile.loader b/Makefile.loader
new file mode 100644 (file)
index 0000000..4e06bae
--- /dev/null
+++ b/Makefile.loader
@@ -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 --git a/hdsploader/Makefile.am b/hdsploader/Makefile.am
index 398f7032969b5171ab68a6f9afbf6710c2519cfa..a84baa6d579d44af1ca6f2f8162eeb77c40cab0d 100644 (file)
--- a/hdsploader/Makefile.am
+++ b/hdsploader/Makefile.am
@@ -1,6 +1,4 @@
 # # Process this file with automake to produce Makefile.in.
-MYNAME = hdsploader
-
 dsp_hex_files = digiface_firmware.bin \
                digiface_firmware_rev11.bin \
                multiface_firmware.bin \
@@ -9,14 +7,8 @@ dsp_bin_files = rpm_firmware.bin
 
 firmware_dir = 
 firmware_files = $(dsp_hex_files) $(dsp_bin_files)
-
-if USE_LOADER
-firmwaredir = $(datadir)/alsa/firmware/$(MYNAME)
-firmware_DATA = $(firmware_files)
-else
-firmwaredir = 
-firmware_DATA = 
-endif
+loader_dir = hdsploader
+loader_files = $(firmware_files)
 
 noinst_PROGRAMS = fw_writer
 fw_writer_SOURCES = tobin.c
@@ -26,6 +18,7 @@ EXTRA_DIST = $(dsp_hex_files:%.bin=%.dat) \
             tobin.c
 CLEANFILES = $(dsp_hex_files)
 
+include ../Makefile.loader
 include ../Makefile.hotplug
 include ../Makefile.fw_writer
 

diff --git a/mixartloader/Makefile.am b/mixartloader/Makefile.am
index dc12edb2399294cde094b53fc50c1f0fe5ceeccd..5ea8ecfc88a1d12cd23cecaeadd0e63c855ada23 100644 (file)
--- a/mixartloader/Makefile.am
+++ b/mixartloader/Makefile.am
@@ -1,5 +1,4 @@
-MYNAME = mixartloader
-
+loader_dir = mixartloader
 firmware_dir = mixart
 
 cfg_files = miXart.conf
@@ -7,15 +6,9 @@ firmware_files = \
        miXart8AES.xlx \
        miXart8.elf \
        miXart8.xlx
+loader_files = $(cfg_files) $(firmware_files)
 
-EXTRA_DIST = $(cfg_files) $(firmware_files)
-
-if USE_LOADER
-firmwaredir = $(datadir)/alsa/firmware/$(MYNAME)
-firmware_DATA = $(cfg_files) $(firmware_files)
-else
-firmwaredir = 
-firmware_DATA = 
-endif
+EXTRA_DIST = $(loader_files)
 
+include ../Makefile.loader
 include ../Makefile.hotplug

diff --git a/pcxhrloader/Makefile.am b/pcxhrloader/Makefile.am
index ff9fe3ef21f18b83db19e703a671c20da788a241..6104af88851a31cf049c41d6ba34dc83f51088b9 100644 (file)
--- a/pcxhrloader/Makefile.am
+++ b/pcxhrloader/Makefile.am
@@ -1,5 +1,4 @@
-MYNAME = pcxhrloader
-
+loader_dir = pcxhrloader
 firmware_dir = pcxhr
 
 cfg_files = \
@@ -33,15 +32,9 @@ firmware_files = \
        dspe924.e56     \
        dspb924.b56     \
        dspd222.d56
+loader_files = $(cfg_files) $(firmware_files)
 
-EXTRA_DIST = $(cfg_files) $(firmware_files)
-
-if USE_LOADER
-firmwaredir = $(datadir)/alsa/firmware/$(MYNAME)
-firmware_DATA = $(cfg_files) $(firmware_files)
-else
-firmwaredir = 
-firmware_DATA = 
-endif
+EXTRA_DIST = $(loader_files)
 
+include ../Makefile.loader
 include ../Makefile.hotplug

diff --git a/vxloader/Makefile.am b/vxloader/Makefile.am
index d7867e864ae01507590d3e8706786dbced642f0f..68518754fb5b6b7ad647555ed882c5d43a68e410 100644 (file)
--- a/vxloader/Makefile.am
+++ b/vxloader/Makefile.am
@@ -1,5 +1,3 @@
-MYNAME = vxloader
-
 cfg_files = vx222.conf vxboard.conf vxpocket.conf vxp440.conf
 
 dsp_files = \
@@ -21,6 +19,8 @@ rbt_files = \
 
 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)
 
@@ -30,14 +30,7 @@ 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
-
+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)