Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added configtool to configure and Makefile.in

Browse Source 
Added -lsupc++ to end of LDLIBS to avoid link errors


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-06-14 16:18:39 +00:00
parent 02ae000a99
commit 8cb4919bd4
4 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/Makefile.in
View File

@@ -2,7 +2,7 @@
# Makefile : Builds wxWindows utils for Unix. # Makefile : Builds wxWindows utils for Unix.
# #
UTILS_SUBDIRS=tex2rtf hhp2cached makegen HelpGen dialoged helpview UTILS_SUBDIRS=tex2rtf hhp2cached makegen HelpGen dialoged helpview configtool
all: all:
@for d in $(UTILS_SUBDIRS); do (cd $$d && $(MAKE)); done @for d in $(UTILS_SUBDIRS); do (cd $$d && $(MAKE)); done

5
utils/configtool/src/Makefile
View File

@@ -127,6 +127,11 @@ else
include $(top_builddir)/src/makeprog.env include $(top_builddir)/src/makeprog.env
endif endif
# Need to place -lsupc++ at end of libs or we get
# link errors. Note the := syntax to prevent a
# recursive variable error.
LDLIBS:=${LDLIBS} -lsupc++
# Only omit C++ libs for economy of size on Unix # Only omit C++ libs for economy of size on Unix
ifeq "$(WXTOOLKIT)" "msw" ifeq "$(WXTOOLKIT)" "msw"
CC=c++ CC=c++

4
utils/configure vendored
View File

@@ -660,6 +660,8 @@ trap 'rm -fr `echo "
emulator/src/Makefile emulator/src/Makefile
helpview/Makefile helpview/Makefile
helpview/src/Makefile helpview/src/Makefile
wxconfigtool/Makefile
wxconfigtool/src/Makefile
" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 " | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF EOF
cat >> $CONFIG_STATUS <<EOF cat >> $CONFIG_STATUS <<EOF
@@ -749,6 +751,8 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
emulator/src/Makefile emulator/src/Makefile
helpview/Makefile helpview/Makefile
helpview/src/Makefile helpview/src/Makefile
configtool/Makefile
configtool/src/Makefile
"} "}
EOF EOF
cat >> $CONFIG_STATUS <<\EOF cat >> $CONFIG_STATUS <<\EOF

2
utils/configure.in
View File

@@ -30,4 +30,6 @@ AC_OUTPUT([
emulator/src/Makefile emulator/src/Makefile
helpview/Makefile helpview/Makefile
helpview/src/Makefile helpview/src/Makefile
wxconfigtool/Makefile
wxconfigtool/src/Makefile
]) ])