[Gptfdisk-general] [PATCH 13/15] makefile: Switch to building shared executables for mingw* builds

[Bin M. <bme...@gm...>]

Other platform builds generate shared executables except mingw* builds.
Switch to building shared executables for mingw* builds for consistency.
For sgdisk, we can list only '-lpopt' as the additional dependency as
the shared library itself can express its dependencies (-lintl -liconv)
very well.

With such change, $(CXXFLAGS) is no longer needed in the build rule too.

Signed-off-by: Bin Meng <bme...@gm...>
---

 Makefile.mingw   | 8 ++++----
 Makefile.mingw64 | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile.mingw b/Makefile.mingw
index 7425d89..7492598 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -1,6 +1,6 @@
 CXX=/usr/bin/i686-w64-mingw32-g++
 STRIP=/usr/bin/i686-w64-mingw32-strip
-CXXFLAGS=-O2 -Wall -static -static-libgcc -static-libstdc++ -D_FILE_OFFSET_BITS=64
+CXXFLAGS=-O2 -Wall -D_FILE_OFFSET_BITS=64
 #CXXFLAGS=-O2 -Wall -D_FILE_OFFSET_BITS=64 -I /usr/local/include -I/opt/local/include
 LDFLAGS+=
 LDLIBS+=-lrpcrt4
@@ -15,13 +15,13 @@ DEPEND= makedepend $(CFLAGS)
 all:	gdisk sgdisk fixparts
 
 gdisk:	$(LIB_OBJS) gdisk.o gpttext.o
-	$(CXX) $(CXXFLAGS) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) $(LDLIBS) -o gdisk32.exe
+	$(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) $(LDLIBS) -o gdisk32.exe
 
 sgdisk: $(LIB_OBJS) sgdisk.o gptcl.o
-	$(CXX) $(CXXFLAGS) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) $(LDLIBS) -lpopt -lintl -liconv -o sgdisk32.exe
+	$(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) $(LDLIBS) -lpopt -o sgdisk32.exe
 
 fixparts: $(MBR_LIB_OBJS) fixparts.o
-	$(CXX) $(CXXFLAGS) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts32.exe
+	$(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts32.exe
 
 lint:	#no pre-reqs
 	lint $(SRCS)
diff --git a/Makefile.mingw64 b/Makefile.mingw64
index f76acab..202690e 100644
--- a/Makefile.mingw64
+++ b/Makefile.mingw64
@@ -1,6 +1,6 @@
 CXX=/usr/bin/x86_64-w64-mingw32-g++
 STRIP=/usr/bin/x86_64-w64-mingw32-strip
-CXXFLAGS=-O2 -Wall -static -static-libgcc -static-libstdc++ -D_FILE_OFFSET_BITS=64
+CXXFLAGS=-O2 -Wall -D_FILE_OFFSET_BITS=64
 #CXXFLAGS=-O2 -Wall -D_FILE_OFFSET_BITS=64 -I /usr/local/include -I/opt/local/include
 LDFLAGS+=
 LDLIBS+=-lrpcrt4
@@ -15,13 +15,13 @@ DEPEND= makedepend $(CFLAGS)
 all:	gdisk sgdisk fixparts
 
 gdisk:	$(LIB_OBJS) gdisk.o gpttext.o
-	$(CXX) $(CXXFLAGS) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) $(LDLIBS) -o gdisk64.exe
+	$(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) $(LDLIBS) -o gdisk64.exe
 
 sgdisk: $(LIB_OBJS) sgdisk.o gptcl.o
-	$(CXX) $(CXXFLAGS) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) $(LDLIBS) -lpopt -lintl -liconv -o sgdisk64.exe
+	$(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) $(LDLIBS) -lpopt -o sgdisk64.exe
 
 fixparts: $(MBR_LIB_OBJS) fixparts.o
-	$(CXX) $(CXXFLAGS) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts64.exe
+	$(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts64.exe
 
 lint:	#no pre-reqs
 	lint $(SRCS)
-- 
2.25.1