made SetDirectory() work, minor code cleanup (much is left to do)

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

diff --git a/src/make.env.in b/src/make.env.in
index b71612367204067082bd194e7c196d822b83c6e3..2cc978aa509b96e50f743acc5b3b86ac1f87a7c1 100644 (file)
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -47,6 +47,7 @@ AROPTIONS   = rcu
 RANLIB      = @RANLIB@
 LD          = @LD@
 MAKEINFO    = @MAKEINFO@
+RM          = rm -f
 
 SHARED_LD   = @SHARED_LD@
 
@@ -57,10 +58,15 @@ DEREZ       = @DEREZ@
 
 DLLTOOL     = @DLLTOOL@
 
+INSTALL         = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA    = @INSTALL_DATA@
+INSTALL_SCRIPT  = @INSTALL@
+
 ########################### Flags #################################
 
 CPPFLAGS = ${APPEXTRACPPFLAGS} @CPPFLAGS@ @TOOLCHAIN_DEFS@@TOOLCHAIN_DLL_DEFS@ @WXDEBUG_DEFINE@
-CFLAGS = ${APPEXTRACFLAGS} ${CPPFLAGS} @CODE_GEN_FLAGS@ @CFLAGS@
+CFLAGS = ${APPEXTRACFLAGS} ${CPPFLAGS}@CODE_GEN_FLAGS@ @CFLAGS@
 CXXFLAGS = ${APPEXTRACXXFLAGS} ${CPPFLAGS}@CODE_GEN_FLAGS@@CODE_GEN_FLAGS_CXX@ @CXXFLAGS@
 PICFLAGS = @PIC_FLAG@
 
@@ -69,3 +75,7 @@ PICFLAGS = @PIC_FLAG@
 # EXTRALIBS instead (see above)
 # LDFLAGS = @LDFLAGS@
 
+# specific linker flags for when building executables since there
+# Mac OS X requires specific linker flags for executables linked
+# against dynamic shared libraries
+LDFLAGS_EXE = @LDFLAGS_EXE@