added dependency handling

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

diff --git a/src/make.env.in b/src/make.env.in
index ebc11291262e3641a03d611334cdea3665ec1103..c835ab3fab7fe20871710a69881b8dbef6061697 100644 (file)
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -13,7 +13,7 @@
 # see comment near LDFLAGS at the end of file
 EXTRALIBS = @LDFLAGS@ @EXTRA_LIBS@
 OPENGLLIBS = @OPENGL_LIBS@
-LDLIBS = $(APPEXTRALIBS) ${top_builddir}/lib/@WX_TARGET_LIBRARY@ $(EXTRALIBS)
+LDLIBS = ${APPEXTRALIBS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${EXTRALIBS}
 
 TOOLKIT = @TOOLKIT@
 TOOLKITDIR = @TOOLKIT_DIR@
@@ -21,8 +21,6 @@ TOOLKITDIR = @TOOLKIT_DIR@
 WXLIB = @WX_LIBRARY_NAME_STATIC@
 WXSHLIB = @WX_LIBRARY_NAME_SHARED@
 
-EXTRADEFS="-DwxINSTALL_PREFIX=\"@prefix@\""
-
 ########################### VERSION #################################
 
 WX_MAJOR_VERSION_NUMBER = @WX_MAJOR_VERSION_NUMBER@
@@ -59,19 +57,18 @@ SHARED_LD   = @SHARED_LD@
 
 RESFLAGS    = @RESFLAGS@
 RESCOMP     = @RESCOMP@
+REZ         = @REZ@
+REZFLAGS    = @REZFLAGS@
+DEREZ       = @DEREZ@
+DEREZFLAGS  = @DEREZFLAGS@
 DLLTOOL     = @DLLTOOL@
 
 ########################### Flags #################################
 
-#
-# CPPFLAGS  (gnu standard) is not C++ flags, but flags for the "cpp"
-# preprocessor. Unfortunately whoever wrote this now uses CPPFLAGS for
-# C++ like CFLAGS for C. :-(
-# We *must* include CPPFLAGS in both of these, to make sure that all
-# header files get found.  (KB)
-
-CFLAGS = $(APPEXTRACFLAGS) $(APPEXTRACPPFLAGS) @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CFLAGS@ @CPPFLAGS@ @CODE_GEN_FLAGS@
-CPPFLAGS = $(APPEXTRACXXFLAGS) $(APPEXTRACPPFLAGS) @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@ @CODE_GEN_FLAGS_CXX@
+CPPFLAGS = ${APPEXTRACPPFLAGS} @CPPFLAGS@ @TOOLKIT_DEF@ @WXDEBUG_DEFINE@
+CFLAGS = ${APPEXTRACFLAGS} ${CPPFLAGS} @CODE_GEN_FLAGS@ @CFLAGS@
+CXXFLAGS = ${APPEXTRACXXFLAGS} ${CPPFLAGS} \
+           @CODE_GEN_FLAGS@ @CODE_GEN_FLAGS_CXX@ @CXXFLAGS@
 PICFLAGS = @PIC_FLAG@
 
 # taking into account how SHARED_LD is defined, appending LDFLAGS to it