File wxhexeditor-0.23-mhash.patch of Package wxhexeditor
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,8 @@
CXX = `$(WXCONFIG) --cxx`
LDFLAGS += -lgomp
#add this ldflags for WinConsole "-Wl,--subsystem,console -mconsole" for win-debug
-WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -Imhash/include -MMD -fopenmp
-WXLDFLAGS = `$(WXCONFIG) --libs` `$(WXCONFIG) --libs aui` `$(WXCONFIG) --libs core`
+WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -MMD -fopenmp
+WXLDFLAGS = `$(WXCONFIG) --libs` `$(WXCONFIG) --libs aui` `$(WXCONFIG) --libs core` $(LDFLAGS) -lmhash
RC = `$(WXCONFIG) --rescomp`
#RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64
RCFLAGS = `$(WXCONFIG) --cxxflags | sed s/' '-m.*//g;`
@@ -25,7 +25,7 @@
src/HexEditorCtrl/wxHexCtrl/Tag.cpp\
src/HexEditorCtrl/HexEditorCtrlGui.cpp\
src/HexEditorFrame.cpp
-LIBS = udis86/libudis86/.libs/libudis86.a mhash/lib/.libs/libmhash.a
+LIBS = udis86/libudis86/.libs/libudis86.a
OBJECTS=$(SOURCES:.cpp=.o)
DEPENDS=$(OBJECTS:.o=.d)
LANGUAGEDIRS=`ls -l ./locale | grep ^d | sed s/.*\ //g;`
@@ -68,10 +68,6 @@
cd udis86;./configure --host=$(HOST) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)"
cd udis86/libudis86; $(MAKE) $(MFLAGS)
-mhash/lib/.libs/libmhash.a:
- cd mhash; ./configure --host=$(HOST) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)"
- cd mhash; $(MAKE) $(MFLAGS)
-
win: $(RESOURCES) $(EXECUTABLE_WIN)
#Stack override required for file comparison function...
@@ -173,7 +169,6 @@
rm -f locale/*/wxHexEditor.mo
distclean: clean
cd udis86;$(MAKE) distclean
- cd mhash;$(MAKE) distclean
# include the auto-generated dependency files
-include $(DEPENDS)