Add operator << (ostream&, const wxString&)

[wxWidgets.git] / src / make.env.in

diff --git a/src/make.env.in b/src/make.env.in
index 3c5921b7840f1d3f6a7048c26b214109730e2cf1..307066715239838df48fe1b30596c8a6c970d3dc 100644 (file)
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -11,7 +11,7 @@
 ####################### GENERAL SETTINGS ############################
 
 
-EXTRALIBS = @EXTRA_LIBS@
+EXTRA_LIBS = @EXTRA_LIBS@
 LDLIBS = ${top_builddir}/lib/@WX_TARGET_LIBRARY@  $(EXTRA_LIBS)
 
 TOOLKIT = @TOOLKIT@
@@ -26,10 +26,6 @@ WX_MAJOR_VERSION_NUMBER = @WX_MAJOR_VERSION_NUMBER@
 WX_MINOR_VERSION_NUMBER = @WX_MINOR_VERSION_NUMBER@
 WX_RELEASE_NUMBER = @WX_RELEASE_NUMBER@
 
-########################### Misc #################################
-
-SHELL = @SHELL@
-
 ########################### Programs #################################
 
 # C++ compiler
@@ -61,8 +57,8 @@ SHARED_LD   = @SHARED_LD@
 ########################### Flags #################################
 
 CFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CFLAGS@
-CPPFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CXXFLAGS@
+CPPFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@
 PICFLAGS = @PIC_FLAG@
-
+LDFLAGS = @LDFLAGS@