added missing -univ package control files.

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

diff --git a/src/make.env.in b/src/make.env.in
index ebc11291262e3641a03d611334cdea3665ec1103..f085a09f1d62d9e66c798c6ee2bb3946dae15278 100644 (file)
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -1,11 +1,12 @@
 #
 # File:     make.env
 #
 # File:     make.env

-# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
+# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin, Ron Lee

 # Created:  1993
 # Created:  1993

-# Updated:  1999
+# Updated:  2001

 # Copyright:(c) 1993, AIAI, University of Edinburgh,
 # Copyright:(c) 1999, Vadim Zeitlin
 # Copyright:(c) 1999, Robert Roebling
 # Copyright:(c) 1993, AIAI, University of Edinburgh,
 # Copyright:(c) 1999, Vadim Zeitlin
 # Copyright:(c) 1999, Robert Roebling

+# Copyright:(c) 2001, Ron Lee

 #
 
 ####################### GENERAL SETTINGS ############################
 #
 
 ####################### GENERAL SETTINGS ############################


@@ -13,7 +14,7 @@
 # see comment near LDFLAGS at the end of file
 EXTRALIBS = @LDFLAGS@ @EXTRA_LIBS@
 OPENGLLIBS = @OPENGL_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)
+LDLIBS = ${APPEXTRALIBS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${EXTRALIBS}

 
 TOOLKIT = @TOOLKIT@
 TOOLKITDIR = @TOOLKIT_DIR@
 
 TOOLKIT = @TOOLKIT@
 TOOLKITDIR = @TOOLKIT_DIR@


@@ -21,8 +22,6 @@ TOOLKITDIR = @TOOLKIT_DIR@
 WXLIB = @WX_LIBRARY_NAME_STATIC@
 WXSHLIB = @WX_LIBRARY_NAME_SHARED@
 
 WXLIB = @WX_LIBRARY_NAME_STATIC@
 WXSHLIB = @WX_LIBRARY_NAME_SHARED@
 

-EXTRADEFS="-DwxINSTALL_PREFIX=\"@prefix@\""
-

 ########################### VERSION #################################
 
 WX_MAJOR_VERSION_NUMBER = @WX_MAJOR_VERSION_NUMBER@
 ########################### VERSION #################################
 
 WX_MAJOR_VERSION_NUMBER = @WX_MAJOR_VERSION_NUMBER@


@@ -31,13 +30,8 @@ WX_RELEASE_NUMBER = @WX_RELEASE_NUMBER@
 
 ########################### Programs #################################
 
 
 ########################### Programs #################################
 

-# C++ compiler
-CC          = @CXX@
-CCPP        = @CXXCPP@
-
-# C compiler
-CCC         = @CC@
-CCCPP       = @CPP@
+CXX         = @CXX@
+CC          = @CC@

 
 # Compiler for lex/yacc .c programs
 CCLEX       = @CC@
 
 # Compiler for lex/yacc .c programs
 CCLEX       = @CC@


@@ -59,19 +53,17 @@ SHARED_LD   = @SHARED_LD@
 
 RESFLAGS    = @RESFLAGS@
 RESCOMP     = @RESCOMP@
 
 RESFLAGS    = @RESFLAGS@
 RESCOMP     = @RESCOMP@

+
+DEREZ       = @DEREZ@
+

 DLLTOOL     = @DLLTOOL@
 
 ########################### Flags #################################
 
 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@ @TOOLCHAIN_DEFS@ @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
 PICFLAGS = @PIC_FLAG@
 
 # taking into account how SHARED_LD is defined, appending LDFLAGS to it