autoconf: handle $(EXEEXT)

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

diff --git a/Makefile.fw_writer b/Makefile.fw_writer
index 93b0d631f457131520f45f6db63142bf2fa5a873..1f5205b78387ee6cb3ba65cfc5d908584465a783 100644 (file)
--- 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 be71604769a3f7339a34d733ae59771eebf30a2c..c66b49edd43f7843412e5d718fedec4efa47cec6 100644 (file)
--- 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 e03fdbf7bb514b490dec3aa3b39ef5e0ec716f38..57154db036eff6b3ddb029cf5154cc68cd180f06 100644 (file)
--- 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 a84baa6d579d44af1ca6f2f8162eeb77c40cab0d..ab5fb24d1a22146673df8079bd9b1583ff4845bc 100644 (file)
--- 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 ba1374021dd677af850fbb28b86a93d7197c1b14..5d38bc670fa43d1108b7f924d67e3b441f1680ea 100644 (file)
--- 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 a69103fa8bf1064373f7b8cd2489bb578720b13c..e1f4955484e7c56151c9bc1c2cd0f68ff6ad86b3 100644 (file)
--- 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 68518754fb5b6b7ad647555ed882c5d43a68e410..052fe3ef47cad98fb6fec23cb7f3bb65be8b503d 100644 (file)
--- 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 d60b7ef678ba6ebb8867b2274ab1771b37b41d1c..575301d1449f56c7742564911a1973652c9a7a48 100644 (file)
--- 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 d4fb7ea3c235eaa9346ea92063eaa532c0dbac99..34b37edea6a554c8a29b38327d5eb08770c31c31 100644 (file)
--- 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)