25 lines
1.2 KiB
Diff
25 lines
1.2 KiB
Diff
make LDFLAGS=... discarded internal LDFLAGS see
|
|
https://github.com/pwsafe/pwsafe/issues/42
|
|
|
|
diff -ru pwsafe-0.97BETA/src/ui/wxWidgets/Makefile pwsafe-n/src/ui/wxWidgets/Makefile
|
|
--- src/ui/wxWidgets/Makefile 2015-10-09 09:35:00.000000000 +0100
|
|
+++ src/ui/wxWidgets/Makefile 2015-11-23 11:10:08.509509481 +0000
|
|
@@ -139,7 +139,7 @@
|
|
XERCESCPPFLAGS=-DUSE_XML_LIBRARY=XERCES -DWCHAR_INCOMPATIBLE_XMLCH
|
|
XERCESLIBFLAGS=-lxerces-c
|
|
GCCFLAGS=-fPIC
|
|
-LDFLAGS:=$(LIBS) -L$(LIBPATH) $(LINKERFLAGS) $(LDFLAGS)
|
|
+override LDFLAGS:=$(LIBS) -L$(LIBPATH) $(LINKERFLAGS) $(LDFLAGS)
|
|
RESPATH=--include-dir "$(WXWIN)/include" --include-dir "$(WXWIN)/contrib/include" --include-dir "$(WXWIN)/GCCBuildReleaseGTK2Unicode/lib/wx/include/gtk2-unicode-release-static-2.6"
|
|
MACPACKAGEINFO=
|
|
endif
|
|
@@ -155,7 +155,7 @@
|
|
YBPERS_LIBPATH_FLAGS=-L$(YBPERS_LIBPATH)
|
|
endif
|
|
|
|
-LDFLAGS:=$(LIBS) -L$(LIBPATH) $(LINKERFLAGS) $(XERCESLIBFLAGS) $(YBPERS_LIBPATH_FLAGS) $(LDFLAGS)
|
|
+override LDFLAGS:=$(LIBS) -L$(LIBPATH) $(LINKERFLAGS) $(XERCESLIBFLAGS) $(YBPERS_LIBPATH_FLAGS) $(LDFLAGS)
|
|
CPPFLAGS:=$(CXXFLAGS) $(CPPINC) $(GCCFLAGS) $(DEBUGFLAGS) $(OPTFLAGS) $(WARNINGFLAGS) $(XERCESCPPFLAGS) $(YUBIFLAGS) $(CPPFLAGS)
|
|
|
|
SOURCES= passwordsafeframe.cpp \
|