Rearrange the linker flags/libs code in preparation for better static/shared

support.  Added --static option to wx-config and removed most libs from
--libs output unless it is used.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2001-11-08 11:24:04 +00:00
parent f1687ed8ad
commit 3d63bc3a03
4 changed files with 130 additions and 124 deletions

View File

@@ -12,7 +12,7 @@
####################### GENERAL SETTINGS ############################
# see comment near LDFLAGS at the end of file
EXTRALIBS = @LDFLAGS@ @EXTRA_LIBS@
EXTRALIBS = @LDFLAGS@ @LIBS@ @DMALLOC_LIBS@
OPENGLLIBS = @OPENGL_LIBS@
LDLIBS = ${APPEXTRALIBS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${EXTRALIBS}
@@ -62,8 +62,7 @@ DLLTOOL = @DLLTOOL@
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@
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