[Gptfdisk-general] [PATCH 08/15] makefile: Fix the 'sgdisk' rule for mingw* builds

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

Currently the sgdisk build rule for mingw* builds is incorrect in
various aspects:

* missing an object file gptcl.o for compiling and linking
* linking to librpcrt4 library is missing too
* libpopt actually has a dependency to libintl, which in turn has
  a dependency to libiconv, and such dependencies have to be passed
  to the linker as we are building a static executable

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

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

diff --git a/Makefile.mingw b/Makefile.mingw
index 68e219c..a3f2a7c 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -15,8 +15,8 @@ all:	gdisk fixparts
 gdisk:	$(LIB_OBJS) gdisk.o gpttext.o
 	$(CXX) $(CXXFLAGS) $(LIB_OBJS) gdisk.o gpttext.o -lrpcrt4 -o gdisk32.exe
 
-sgdisk: $(LIB_OBJS) sgdisk.o
-	$(CXX) $(CXXFLAGS) $(LIB_OBJS) sgdisk.o -lpopt -o sgdisk32.exe
+sgdisk: $(LIB_OBJS) sgdisk.o gptcl.o
+	$(CXX) $(CXXFLAGS) $(LIB_OBJS) sgdisk.o gptcl.o -lrpcrt4 -lpopt -lintl -liconv -o sgdisk32.exe
 
 fixparts: $(MBR_LIB_OBJS) fixparts.o
 	$(CXX) $(CXXFLAGS) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts32.exe
diff --git a/Makefile.mingw64 b/Makefile.mingw64
index 5a8649c..f062daa 100644
--- a/Makefile.mingw64
+++ b/Makefile.mingw64
@@ -15,8 +15,8 @@ all:	gdisk fixparts
 gdisk:	$(LIB_OBJS) gdisk.o gpttext.o
 	$(CXX) $(CXXFLAGS) $(LIB_OBJS) gdisk.o gpttext.o -lrpcrt4 -o gdisk64.exe
 
-sgdisk: $(LIB_OBJS) sgdisk.o
-	$(CXX) $(CXXFLAGS) $(LIB_OBJS) sgdisk.o -lpopt -o sgdisk64.exe
+sgdisk: $(LIB_OBJS) sgdisk.o gptcl.o
+	$(CXX) $(CXXFLAGS) $(LIB_OBJS) sgdisk.o gptcl.o -lrpcrt4 -lpopt -lintl -liconv -o sgdisk64.exe
 
 fixparts: $(MBR_LIB_OBJS) fixparts.o
 	$(CXX) $(CXXFLAGS) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts64.exe
-- 
2.25.1