Committing in .

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

diff --git a/src/make.env.in b/src/make.env.in
index 97cfd5d948b811d22cedf15178695a121a4599ad..bff33e5385fc3614048a23ddf7295dfa17ce69d1 100644 (file)
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -8,13 +8,20 @@
 # Copyright:(c) 1999, Robert Roebling
 #
 
-########################### VERSION #################################
+####################### GENERAL SETTINGS ############################
 
-LDLIBS = @LD_LIBS@
+# 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)
 
 TOOLKIT = @TOOLKIT@
+TOOLKITDIR = @TOOLKIT_DIR@
+
+WXLIB = @WX_LIBRARY_NAME_STATIC@
+WXSHLIB = @WX_LIBRARY_NAME_SHARED@
 
-WXLIB = lib@WX_LIBRARY@.a
+EXTRADEFS="-DwxINSTALL_PREFIX=\"@prefix@\""
 
 ########################### VERSION #################################
 
@@ -22,10 +29,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
@@ -52,21 +55,27 @@ RANLIB      = @RANLIB@
 LD          = @LD@
 MAKEINFO    = @MAKEINFO@
 
-########################### Flags #################################
-
-CFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CFLAGS@
-CPPFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CXXFLAGS@
+SHARED_LD   = @SHARED_LD@
 
-########################### Rules #################################
-
-# Clears all default suffixes
-.SUFFIXES:     .o .cpp .c
-
-.c.o :
-       $(CCC) -c $(CFLAGS) -o $@ $<
-
-.cpp.o :
-       $(CC) -c $(CPPFLAGS) -o $@ $<
+RESFLAGS    = @RESFLAGS@
+RESCOMP     = @RESCOMP@
+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@
+CPPFLAGS = $(APPEXTRACXXFLAGS) $(APPEXTRACPPFLAGS) @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@
+PICFLAGS = @PIC_FLAG@
+
+# taking into account how SHARED_LD is defined, appending LDFLAGS to it
+# doesn't work, so we put them in the end of the linker command line in
+# EXTRALIBS instead (see above)
+# LDFLAGS = @LDFLAGS@