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

configure changes, for wxBase and wx-config

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee 2000-02-24 12:20:22 +00:00
parent b0c8fc357c
commit 07eb77a690
15 changed files with 339 additions and 272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Makefile.in
View File

@ -302,17 +302,19 @@ CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
@$(RM) ./lib/@WX_LIBRARY_LINK1@
@$(RM) ./lib/@WX_LIBRARY_LINK2@
@$(RM) ./lib/@WX_LIBRARY_LINK3@
$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK1@
$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@
$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@
cd lib \
&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \
&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ \
&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK3@
CREATE_INSTALLED_LINKS: preinstall
$(RM) $(libdir)/@WX_LIBRARY_LINK1@
$(RM) $(libdir)/@WX_LIBRARY_LINK2@
$(RM) $(libdir)/@WX_LIBRARY_LINK3@
$(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK1@
$(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK2@
$(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK3@
cd $(libdir) \
&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \
&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ \
&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK3@
$(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
@ -349,7 +351,7 @@ afminstall: preinstall
# this is the real install target: copies the library, wx-config and the
# headers to the installation directory
preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_DIR@-config
@echo " "
@echo " Installing wxWindows..."
@echo " "
@ -358,7 +360,8 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
$(INSTALL) -d $(bindir)
$(INSTALL) -d $(libdir)
$(INSTALL_SCRIPT) $(top_builddir)/wx-config $(bindir)/wx-config
$(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLKIT_DIR@-config $(bindir)/wx@TOOLKIT_DIR@-config
cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLKIT_DIR@-config wx-config
$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
$(INSTALL) -d $(libdir)/wx
@ -403,11 +406,13 @@ uninstall:
@echo " Removing helper files..."
@$(RM) $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
@$(RM) $(bindir)/wx-config
@$(RM) $(bindir)/wx@TOOLKIT_DIR@-config
@$(RM) $(datadir)/wx/afm/*
@$(RM) $(datadir)/wx/gs_afm/*
@rmdir $(datadir)/wx/gs_afm
@rmdir $(datadir)/wx/afm
@rmdir $(datadir)/wx
# FIXME: wxBase doesnt install these next 3 dirs.
@-rmdir $(datadir)/wx/gs_afm
@-rmdir $(datadir)/wx/afm
@-rmdir $(datadir)/wx
@echo " Removing headers..."
@list='$(HEADERS)'; for p in $$list; do \
$(RM) $(includedir)/wx/$$p; \

467
configure vendored
View File

File diff suppressed because it is too large Load Diff

12
configure.in
View File

@ -1868,10 +1868,11 @@ fi
GUIDIST="${GUIDIST} SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST"
DISTDIR="wx\$(TOOLKIT)"
else
dnl leave all TOOLKIT_XXX vars empty
USE_GUI=0
TOOLKIT_DIR="base"
TOOLKIT_DEF="-D__WXBASE__"
dnl the sources, their dependenices and the headers
ALL_OBJECTS="\$(BASE_OBJS) \${BASE_UNIX_OBJS}"
ALL_DEPFILES="\${BASE_DEPS} \${BASE_UNIX_DEPS}"
@ -3537,6 +3538,8 @@ AC_OUTPUT([
],
[
chmod +x wx-config
mv wx-config wx${TOOLKIT_DIR}-config
${LN_S} wx${TOOLKIT_DIR}-config wx-config
dnl the debian installer wants setup.h to be in the lib subdir
dnl so we *copy* it there
@ -3559,9 +3562,9 @@ AC_OUTPUT([
if test -f setup.h; then
cp -f setup.h lib/wx/include/wx/${TOOLKIT_DIR}/setup.h
fi
dnl *move* setup.h to its final place
if test ! -d include; then
mkdir include
fi
@ -3578,6 +3581,7 @@ AC_OUTPUT([
],
[
TOOLKIT_DIR="${TOOLKIT_DIR}"
LN_S="${LN_S}"
]
)

2
debian/libwxbase-dev.files vendored
View File

@ -1,4 +1,4 @@
usr/bin/wxbase-config
usr/lib/wx/include/wx/setup.h
usr/lib/wx/include/wx/base/setup.h
usr/lib/libwxbase*.so
usr/lib/libwxbase*.a

7
debian/libwxbase-dev.postinst vendored Normal file
View File

@ -0,0 +1,7 @@
#! /bin/sh
set -e
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbase-config 50
#DEBHELPER#

7
debian/libwxbase-dev.prerm vendored Normal file
View File

@ -0,0 +1,7 @@
#! /bin/sh
set -e
update-alternatives --remove wx-config /usr/bin/wxbase-config
#DEBHELPER#

2
debian/libwxgtk-dev.files vendored
View File

@ -1,4 +1,4 @@
usr/bin/wx-config
usr/bin/wxgtk-config
usr/include/wx/
usr/lib/wx/include/wx/gtk/setup.h
usr/lib/libwx_gtk*.so

1
debian/libwxgtk-dev.links vendored Normal file
View File

@ -0,0 +1 @@
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtk-config.1.gz

7
debian/libwxgtk-dev.postinst vendored Normal file
View File

@ -0,0 +1,7 @@
#! /bin/sh
set -e
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtk-config 50
#DEBHELPER#

7
debian/libwxgtk-dev.prerm vendored Normal file
View File

@ -0,0 +1,7 @@
#! /bin/sh
set -e
update-alternatives --remove wx-config /usr/bin/wxgtk-config
#DEBHELPER#

7
debian/rules vendored
View File

@ -152,7 +152,7 @@ install: build
echo "generating control file $(package_wxbase_lib).$$f"; \
cp debian/libwxbase.$$f debian/$(package_wxbase_lib).$$f; \
done;
@for f in dirs docs files links; do \
@for f in dirs docs files links postinst prerm; do \
echo "generating control file $(package_wxbase_dev).$$f"; \
cp debian/libwxbase-dev.$$f debian/$(package_wxbase_dev).$$f; \
done;
@ -160,7 +160,7 @@ install: build
echo "generating control file $(package_gtk_lib).$$f"; \
cp debian/libwxgtk.$$f debian/$(package_gtk_lib).$$f; \
done;
@for f in dirs docs files; do \
@for f in dirs docs files links postinst prerm; do \
echo "generating control file $(package_gtk_dev).$$f"; \
cp debian/libwxgtk-dev.$$f debian/$(package_gtk_dev).$$f; \
done;
@ -180,9 +180,10 @@ install: build
dh_installdirs
cd $(objdir_gtk_shared) \
&& $(MAKE) install prefix=`pwd`/../debian/tmp/usr
rm -f debian/tmp/usr/bin/wx-config
cp $(objdir_gtk_static)/lib/*.a debian/tmp/usr/lib
cp -a $(objdir_wxbase_shared)/lib/* debian/tmp/usr/lib
cp $(objdir_wxbase_shared)/wx-config debian/tmp/usr/bin/wxbase-config
cp $(objdir_wxbase_shared)/wxbase-config debian/tmp/usr/bin/
cp $(objdir_wxbase_static)/lib/*.a debian/tmp/usr/lib
cd utils/wxPython/src \
&& ../distrib/build.py -i \

52
debian/wx-config.1 vendored
View File

@ -1,31 +1,44 @@
.TH wxWindows 1 "15 Feb 2000" "wxGTK 2.2"
.TH wx-config 1 "15 Feb 2000" "Debian GNU/Linux" "wxWindows 2.2"
.SH NAME
wx-config - script to get information about the installed version of wxGTK
wx-config - generate compile time info for wxWindows
.SH SYNOPSIS
.nh
.B wxbase-config
.br
.B wxgtk-config
.HP
.B wx-config
[\-\-version] [\-\-libs] [\-\-cflags] [\-\-cc] [\-\-cxx] [\-\-ld]
[\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP]
.hy
.SH DESCRIPTION
\fIwx-config\fP is a tool to determine the compiler and linker
flags required for applications using the \fIwxWindows\fP toolkit(s).
.PP
\fIwx-config\fP is a tool used to determine the compiler and
linker flags that should be used to compile and link programs
that use \fIwxGTK\fP.
.
\fIwx-config\fP is normally a symlink to one of the port-specific
versions like \fIwxbase-config\fP or \fIwxgtk-config\fP which
designates the default port to compile applications with.
You can override this default either by using one of the specific
versions directly, or by changing which version the symlink points to.
On Debian systems this can be done using the
.BR update-alternatives (8)
mechanism.
.hy
.SH OPTIONS
.l
\fIwx-config\fP accepts the following options:
.TP 8
.B \-\-version
Report the currently installed version of \fIwxGTK\fP.
What to
.B ALWAYS
include in a bug report.
.br
( But of course you already knew that ... )
.TP 8
.B \-\-libs
Output the linker flags necessary to link a \fIwxGTK\fP program.
Generate linker flags for a \fIwxWindows\fP program.
.TP 8
.B \-\-cflags
Output the compiler flags necessary to compile a \fIwxGTK\fP program.
Generate compiler flags for the same.
.TP 8
.B \-\-cc
Output the name of the C compiler \fB$(CC)\fP.
@ -37,27 +50,34 @@ Output the name of the C++ compiler \fB$(CXX)\fP.
Output the Linker command \fB$(LD)\fP.
.TP 8
.B \-\-prefix=PREFIX
If specified, use PREFIX instead of the installation prefix that \fIwxGTK\fP
If specified, use PREFIX instead of the installation prefix that \fIwxWindows\fP
was built with when computing the output for the \-\-cflags and
\-\-libs options. This option is also used for the exec prefix
if \-\-exec\-prefix was not specified. This option must be specified
before any \-\-libs or \-\-cflags options.
.br
(Translation: this is the root path to the \fIwxGTK\fP headers -- [Ron])
.nh
.HP
(Translation: this is the root path to the \fIwxWindows\fP headers -- [Ron])
.hy
.TP 8
.B \-\-exec\-prefix=PREFIX
If specified, use PREFIX instead of the installation exec prefix that
\fIwxGTK\fP was built with when computing the output for the \-\-cflags
\fIwxWindows\fP was built with when computing the output for the \-\-cflags
and \-\-libs options. This option must be specified before any
\-\-libs or \-\-cflags options.
.br
(Translation: this is the root path to the \fIwxGTK\fP library -- [Ron])
.nh
.HP
(Translation: this is the root path to the \fIwxWindows\fP library -- [Ron])
.hy
.SH SEE ALSO
.BR gtk-config (1)
.BR gtk-config (1),
.BR update-alternatives (8)
.SH COPYRIGHT
This manpage was copied whole-heartedly from the \fBgtk-config\fP(1) manpage
by Brian Bassett <brianb@debian.org> for the Debian GNU/Linux distribution of
wxGTK. It was then updated to include new options and otherwise kicked about
wxGTK. It was then updated to include new options and otherwise bastardised
generally by Ron Lee <ron@debian.org>
The original gtk-config manpage copyright:

2
distrib/msw/tmake/filelist.txt
View File

@ -676,7 +676,7 @@ scrolbar.h W
scrolwin.h W
serbase.h W B
settings.h W
setup.h W
setup.h W B
sizer.h W
slider.h W
socket.h W

8
include/wx/setup.h
View File

@ -11,11 +11,13 @@
/* compatibility code, to be removed asap: */
#if !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXQT__) && !defined(__WXSTUBS__) && !defined(__WXMAC__) && !defined(__WXPM__)
#error No __WXxxx__ define set! Please define one of __WXGTK__,__WXMSW__,__WXMOTIF__,__WXMAC__,__WXQT__,__WXPM__,__WXSTUBS__
#if !defined(__WXBASE__) && !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXQT__) && !defined(__WXSTUBS__) && !defined(__WXMAC__) && !defined(__WXPM__)
#error No __WXxxx__ define set! Please define one of __WXBASE__,__WXGTK__,__WXMSW__,__WXMOTIF__,__WXMAC__,__WXQT__,__WXPM__,__WXSTUBS__
#endif
#ifdef __VMS
#ifdef __WXBASE__
#include "wx/base/setup.h"
#elif defined(__VMS)
#include "wx_root:[wxwindows]setup.h"
#elif defined(__WXMSW__)
#include "wx/msw/setup.h"

3
src/files.lst
View File

@ -1,4 +1,4 @@
# This file was automatically generated by tmake at 19:27, 2000/01/28
# This file was automatically generated by tmake at 15:02, 2000/02/24
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BASE.T!
ALL_SOURCES = \
common/init.cpp \
@ -80,6 +80,7 @@ ALL_HEADERS = \
objstrm.h \
process.h \
serbase.h \
setup.h \
strconv.h \
stream.h \
string.h \