From: Jonathan Wakely <github@kayari.org>
Date: Thu, 18 Feb 2021 17:06:22 +0000 (+0000)
Subject: Use WxWidgets linker flags for scsi2sd-test
X-Git-Tag: v6.4.2~5
X-Git-Url: http://git.codesrc.com/gitweb.cgi?a=commitdiff_plain;h=0a1e59f5bbc1615511b960dc1461daee1ba2a4c3;p=SCSI2SD-V6.git

Use WxWidgets linker flags for scsi2sd-test

Also add it to the "all" target.
---

diff --git a/src/scsi2sd-util6/Makefile b/src/scsi2sd-util6/Makefile
index 875e2e85..007789d5 100755
--- a/src/scsi2sd-util6/Makefile
+++ b/src/scsi2sd-util6/Makefile
@@ -96,8 +96,6 @@ ifeq ($(TARGET),Linux)
 	BUILD := $(PWD)/build/linux
 	LIBUSB_CONFIG+=--disable-shared
 	LDFLAGS_LIBUSB+= -ludev -lpthread
-#all: $(BUILD)/scsi2sd-test
-
 endif
 ifeq ($(TARGET),Darwin)
 	# Should match OSX
@@ -276,9 +274,10 @@ $(BUILD)/scsi2sd-util6$(EXE): $(OBJ) $(WXOBJ) $(BUILD)/scsi2sd-util.o
 	mkdir -p $(dir $@)
 	$(CXX) $(CXXFLAGS) $^ $(LDFLAGS_WX) $(LDFLAGS) -o $@
 
+all: $(BUILD)/scsi2sd-test$(EXE)
 $(BUILD)/scsi2sd-test$(EXE): $(OBJ) $(BUILD)/scsi2sd-test.o
 	mkdir -p $(dir $@)
-	$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -o $@
+	$(CXX) $(CXXFLAGS) $^ $(LDFLAGS_WX) $(LDFLAGS) -o $@
 
 all: $(BUILD)/dfu-util/buildstamp
 $(BUILD)/dfu-util/buildstamp: $(BUILD)/libusb/buildstamp