From: Jaroslav Kysela Date: Tue, 20 Oct 2020 08:33:54 +0000 (+0200) Subject: autoconf: handle $(EXEEXT) X-Git-Tag: v1.2.4~2 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=f08b6476d0db2f34a256514533f2f86d7a23ef7f;p=alsa-firmware.git autoconf: handle $(EXEEXT) Signed-off-by: Jaroslav Kysela --- diff --git a/Makefile.fw_writer b/Makefile.fw_writer index 93b0d63..1f5205b 100644 --- a/Makefile.fw_writer +++ b/Makefile.fw_writer @@ -2,11 +2,15 @@ # 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: $(fw_writer_OBJECTS) +fw_writer$(EXEEXT): $(fw_writer_OBJECTS) $(LINK_FOR_BUILD) $^ $(LDLIBS_FOR_BUILD) -o $@ diff --git a/echoaudio/Makefile.am b/echoaudio/Makefile.am index be71604..c66b49e 100644 --- a/echoaudio/Makefile.am +++ b/echoaudio/Makefile.am @@ -31,7 +31,7 @@ firmware_files = \ 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 \ @@ -66,38 +66,38 @@ EXTRA_DIST = DSP/LoaderDSP.c \ fw_writer.c \ license.txt -CLEANFILES = $(firmware_files) fw_writer +CLEANFILES = $(firmware_files) 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 --git a/emu/Makefile.am b/emu/Makefile.am index e03fdbf..57154db 100644 --- a/emu/Makefile.am +++ b/emu/Makefile.am @@ -2,7 +2,7 @@ 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 \ @@ -14,10 +14,10 @@ EXTRA_DIST = hana_netlist.h \ emu1010b_netlist.h \ license.txt -CLEANFILES = $(firmware_files) fw_writer +CLEANFILES = $(firmware_files) include ../Makefile.hotplug include ../Makefile.fw_writer -$(firmware_files): fw_writer - ./fw_writer +$(firmware_files): $(fw_writer) + ./$(fw_writer) diff --git a/hdsploader/Makefile.am b/hdsploader/Makefile.am index a84baa6..ab5fb24 100644 --- a/hdsploader/Makefile.am +++ b/hdsploader/Makefile.am @@ -10,17 +10,18 @@ firmware_files = $(dsp_hex_files) $(dsp_bin_files) loader_dir = hdsploader loader_files = $(firmware_files) -noinst_PROGRAMS = fw_writer +noinst_PROGRAMS = fw_writer_SOURCES = tobin.c EXTRA_DIST = $(dsp_hex_files:%.bin=%.dat) \ $(dsp_bin_files) \ tobin.c + CLEANFILES = $(dsp_hex_files) include ../Makefile.loader include ../Makefile.hotplug include ../Makefile.fw_writer -$(firmware_files): fw_writer - ./fw_writer +$(firmware_files): $(fw_writer) + ./$(fw_writer) diff --git a/maestro3/Makefile.am b/maestro3/Makefile.am index ba13740..5d38bc6 100644 --- a/maestro3/Makefile.am +++ b/maestro3/Makefile.am @@ -3,15 +3,15 @@ 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) include ../Makefile.hotplug include ../Makefile.fw_writer -$(firmware_files): fw_writer - ./fw_writer +$(firmware_files): $(fw_writer) + ./$(fw_writer) diff --git a/sb16/Makefile.am b/sb16/Makefile.am index a69103f..e1f4955 100644 --- a/sb16/Makefile.am +++ b/sb16/Makefile.am @@ -4,15 +4,15 @@ 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) include ../Makefile.hotplug include ../Makefile.fw_writer -$(firmware_files): fw_writer - ./fw_writer +$(firmware_files): $(fw_writer) + ./$(fw_writer) diff --git a/vxloader/Makefile.am b/vxloader/Makefile.am index 6851875..052fe3e 100644 --- a/vxloader/Makefile.am +++ b/vxloader/Makefile.am @@ -39,8 +39,10 @@ $(toxlx_OBJECTS) : CC=$(CC_FOR_BUILD) $(toxlx_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) $(toxlx_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -toxlx: $(toxlx_OBJECTS) +toxlx = toxlx$(EXEEXT) + +$(toxlx): $(toxlx_OBJECTS) $(LINK_FOR_BUILD) $^ $(LDLIBS_FOR_BUILD) -o $@ -%.xlx: %.rbt toxlx +%.xlx: %.rbt $(toxlx) ./toxlx < $< > $@ diff --git a/wavefront/Makefile.am b/wavefront/Makefile.am index d60b7ef..575301d 100644 --- a/wavefront/Makefile.am +++ b/wavefront/Makefile.am @@ -8,10 +8,10 @@ fw_writer_SOURCES = fw_writer.c EXTRA_DIST = fw_writer.c yss225.c -CLEANFILES = $(firmware_files) fw_writer +CLEANFILES = $(firmware_files) include ../Makefile.hotplug include ../Makefile.fw_writer -$(firmware_files): fw_writer - ./fw_writer +$(firmware_files): $(fw_writer) + ./$(fw_writer) diff --git a/ymfpci/Makefile.am b/ymfpci/Makefile.am index d4fb7ea..34b37ed 100644 --- a/ymfpci/Makefile.am +++ b/ymfpci/Makefile.am @@ -8,10 +8,10 @@ fw_writer_SOURCES = fw_writer.c EXTRA_DIST = fw_writer.c hwmcode.c -CLEANFILES = $(firmware_files) fw_writer +CLEANFILES = $(firmware_files) include ../Makefile.hotplug include ../Makefile.fw_writer -$(firmware_files): fw_writer - ./fw_writer +$(firmware_files): $(fw_writer) + ./$(fw_writer)