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

Hid the GNUism in Makefile.in from other makes.

Browse Source 
Make -python conflict/replace -dbg-python to make them easier to switch.
Really don't build -dbg-python by default.
Added a warning about the project name change for 2.5 to README.Debian.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@28566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2004-07-31 18:26:05 +00:00
parent b1a14f6748
commit 7c2cbd8316
6 changed files with 611 additions and 576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.in
View File

@@ -1616,8 +1616,10 @@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
rm -rf $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
mv $(DISTDIR) $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
#debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST
debian-native-dist: $(filter-out DEMOS_DIST,@GUIDIST@) MANUAL_DIST PYTHON_DIST
# This is to keep non-gnu make's happy.
@IF_NOT_GNU_MAKE@debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST
@IF_GNU_MAKE@debian-native-dist: $(filter-out DEMOS_DIST,@GUIDIST@) MANUAL_DIST PYTHON_DIST
cp $(SRCDIR)/files.lst $(DISTDIR)/src
debian-msw-dirs:

1143
configure vendored
View File

File diff suppressed because it is too large Load Diff

6
configure.in
View File

@@ -1307,11 +1307,14 @@ AC_CACHE_CHECK([if make is GNU make], wx_cv_prog_makeisgnu,
if test "x$wx_cv_prog_makeisgnu" = "xyes"; then
IF_GNU_MAKE=""
IF_NOT_GNU_MAKE="#"
else
IF_GNU_MAKE="#"
IF_NOT_GNU_MAKE=""
fi
AC_SUBST(IF_GNU_MAKE)
AC_SUBST(IF_NOT_GNU_MAKE)
dnl we don't need to check for VPATH support in GNU make - it does have it
if test "x$wx_cv_prog_makeisgnu" != "xyes"; then
@@ -5585,6 +5588,7 @@ dnl idea could have been to use the cache but this wouldn't work when
dnl configure doesn't use cache at all which is the default with autoconf 2.50)
wx_cv_path_samplesubdirs=$SAMPLES_SUBDIRS
wx_cv_if_gnu_make=$IF_GNU_MAKE
wx_cv_if_not_gnu_make=$IF_NOT_GNU_MAKE
wx_cv_path_ifs=$PATH_IFS
wx_cv_program_ext=$PROGRAM_EXT
wx_cv_target_library=$WX_TARGET_LIBRARY
@@ -5595,7 +5599,7 @@ wx_cv_release=${WX_RELEASE}
wx_cv_current=${WX_CURRENT}
wx_cv_revision=${WX_REVISION}
wx_cv_age=${WX_AGE}
export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \
export wx_cv_path_samplesubdirs wx_cv_if_gnu_make wx_cv_if_not_gnu_make \
wx_cv_path_ifs wx_cv_program_ext \
wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype \
wx_cv_library_basename wx_cv_release wx_cv_current wx_cv_revision wx_cv_age

24
debian/README.Debian vendored
View File

@@ -1,6 +1,30 @@
wxwindows for Debian
----------------------
Note: After some eleven years, the wxWindows project has undergone a
change of name and is now formally known upstream as wxWidgets.
This will not be altered retroactively for the existing Debian
packages of 2.4, since forcing a recompile for every dependent
package just to change this is simply unwarranted. The Debian
packages will adopt the name wxwidgets for use from 2.5 onward.
The name change itself will not cause source incompatibilities,
and the library api will not be altered because of it, however
other maintainers will need to update their build dependencies
to accomodate a name as well as a version change for this one.
wxwindows.org will continue to refer to the existing project
site probably until sometime in 2005. You should update any
references to use wxwidgets.org before then.
Why have we done this?
The new owners of the wxwindows.org domain have requested it.
Why have they done this?
Who can say... I see pat@sf is crowing about a project named
WiX that they just accepted. Perhaps they can tell you more.
The following packages are built from the wxWindows CVS source.
libwxbase wxBase runtime shared libraries

4
debian/control.in vendored
View File

@@ -118,8 +118,8 @@ Architecture: any
Section: python
Depends: =PY, ${shlibs:Depends}
Suggests: wxwin=V-doc, wxwin=V-examples, =PY-xml
Conflicts: libwxgtk-python, python-wxwin, libwxgtk2.2-python-contrib, libwxgtk2.2-python, libwxgtk2.3-python
Replaces: libwxgtk-python, python-wxwin, libwxgtk2.2-python-contrib, libwxgtk2.2-python, libwxgtk2.3-python
Conflicts: libwxgtk-python, libwxgtk=V-dbg-python, python-wxwin, libwxgtk2.2-python-contrib, libwxgtk2.2-python, libwxgtk2.3-python
Replaces: libwxgtk-python, libwxgtk=V-dbg-python, python-wxwin, libwxgtk2.2-python-contrib, libwxgtk2.2-python, libwxgtk2.3-python
Provides: libwxgtk-python
Description: wxWindows Cross-platform C++ GUI toolkit (wxPython binding)
wxWindows is a class library for C++ providing GUI (Graphical User

4
debian/rules vendored
View File

@@ -927,13 +927,13 @@ binary-common:
# building the arch specific package files needed to create them.
binary-indep: build_all install
$(MAKE) -f debian/rules \
DH_OPTIONS="-i -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw) -N$(package_gtk_univ)" \
DH_OPTIONS="-i -N$(package_gtk_dbg_py) -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw) -N$(package_gtk_univ)" \
binary-common
# Build just the architecture-dependent files here.
binary-arch: build_arch install_arch
$(MAKE) -f debian/rules \
DH_OPTIONS="-a -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw) -N$(package_gtk_univ)" \
DH_OPTIONS="-a -N$(package_gtk_dbg_py) -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw) -N$(package_gtk_univ)" \
binary-common
# Build all packages target.