contrib libs now build with an soname when you --enable-burnt_name

added -Wall to CFLAGS
added Makefile.in's for ogl samples
more spring cleaning of contrib makefiles
contrib libs now go in $(top_builddir)/lib
removed duplicate $(APPEXTRADEFS) from compile flags
fixed makelib.env install target to install headers too
More changes to Debian packaging:
  using system libs now
  added runtime and -dev packages for contrib libs
  split headers to a separate package to make Base independant of gui libs


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@6981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

contrib/configure

@@ -819,6 +819,9 @@ trap 'rm -fr `echo "
             src/stc/Makefile
             samples/Makefile
             samples/mmedia/Makefile
+            samples/ogl/Makefile
+            samples/ogl/ogledit/Makefile
+            samples/ogl/studio/Makefile
             samples/stc/Makefile
          " | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
@@ -905,6 +908,9 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             src/stc/Makefile
             samples/Makefile
             samples/mmedia/Makefile
+            samples/ogl/Makefile
+            samples/ogl/ogledit/Makefile
+            samples/ogl/studio/Makefile
             samples/stc/Makefile
          "}
 EOF

contrib/configure.in

@@ -44,5 +44,8 @@ AC_OUTPUT([
             src/stc/Makefile
             samples/Makefile
             samples/mmedia/Makefile
+            samples/ogl/Makefile
+            samples/ogl/ogledit/Makefile
+            samples/ogl/studio/Makefile
             samples/stc/Makefile
          ])

contrib/samples/Makefile.in

@@ -1,12 +1,10 @@
-#
+# $Id$
-# Makefile : Builds wxWindows utils for Unix.
+
-#
+CONTRIB_SAMPLES=mmedia ogl stc
 
 all:
-	cd mmedia; make
+	@for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE)); done
-	cd stc; make
 
 clean:
-	cd mmedia; make clean
+	@for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE) clean); done
-	cd stc; make clean
 

contrib/samples/mmedia/Makefile.in

@@ -1,13 +1,5 @@
-#
+# Makefile for mmedia sample.
-# File:		makefile.unx
+# $Id$
-# Author:	Julian Smart
-# Created:	1998
-# Updated:	
-# Copyright:	(c) 1998 Julian Smart
-#
-# "%W% %G%"
-#
-# Makefile for minimal example (UNIX).
 
 top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
@@ -17,25 +9,8 @@ PROGRAM=mmboard
 
 OBJECTS=mmboard.o mmbman.o
 
-EXTRA_LIBS= $(top_builddir)/contrib/src/mmedia/libmmedia.@WX_TARGET_LIBRARY_TYPE@ @ESD_LINK@
+APPEXTRALIBS=$(top_builddir)/lib/libmmedia.@WX_TARGET_LIBRARY_TYPE@ @ESD_LINK@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include
 
-# the comment at the end of the next line is needed because otherwise autoconf
+include $(top_builddir)/src/makeprog.env
-# would remove this line completely - it contains a built-in hack to remove
-# any VPATH assignment not containing ':'
-VPATH = @PATH_IFS@$(top_srcdir)/contrib/samples/mmedia # ':' for autoconf
 
-include ../../../src/make.env
-
-.SUFFIXES: .o .cpp .c
-
-.cpp.o:
-	$(CC) -c $(CPPFLAGS) $(EXTRA_CPPFLAGS) -o $@ $<
-
-all: $(PROGRAM)
-
-clean:
-	rm -f *.o $(PROGRAM)
-
-mmboard: $(OBJECTS)
-	$(CC) $(LDFLAGS) -o mmboard $(OBJECTS) $(EXTRA_LIBS) $(LDLIBS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@

contrib/samples/ogl/Makefile.in

@@ -0,0 +1,12 @@
+#
+# Makefile : Builds wxWindows utils for Unix.
+#
+
+OGL_SAMPLES=ogledit studio
+
+all:
+	@for d in $(OGL_SAMPLES); do (cd $$d && $(MAKE)); done
+
+clean:
+	@for d in $(OGL_SAMPLES); do (cd $$d && $(MAKE) clean); done
+

contrib/samples/ogl/ogledit/Makefile

@@ -1,39 +0,0 @@
-#
-# File:		Makefile
-# Author:	Julian Smart
-# Created:	1999
-# Updated:	
-# Copyright:	(c) 2000 Julian Smart
-#
-# Makefile for OGL demo (GTK version)
-#
-# This makefile requires wxWindows/GTK to be 
-# installed (possibly using "make install")
-# on your system.
-#
-
-CPP = gcc -g
-CC = gcc
-WXCONFIG=../../../../wx-config
-WXINCLUDE=-I../../../../include -I../../../include
-WXLIB=-L../../../../lib -L../../../src/ogl
-
-OBJECTS=ogledit.o palette.o doc.o view.o
-
-ogledit: $(OBJECTS)
-	$(CPP) -o ogledit $(OBJECTS) `$(WXCONFIG) --libs` $(WXLIB) -logl
-
-ogledit.o: ogledit.cpp
-	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c ogledit.cpp
-
-palette.o: palette.cpp
-	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c palette.cpp
-
-doc.o: doc.cpp
-	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c doc.cpp
-
-view.o: view.cpp
-	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c view.cpp
-
-clean: 
-	rm -f *.o ogledit

contrib/samples/ogl/ogledit/Makefile.in

@@ -0,0 +1,16 @@
+# Makefile for OGLEdit example.
+# $Id$
+
+top_srcdir = @top_srcdir@/..
+top_builddir = ../../../..
+program_dir = contrib/samples/ogl/ogledit
+
+PROGRAM=ogledit
+
+OBJECTS=$(PROGRAM).o doc.o view.o palette.o
+
+APPEXTRALIBS=$(top_builddir)/lib/libogl.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRADEFS=-I$(top_srcdir)/contrib/include
+
+include $(top_builddir)/src/makeprog.env
+

contrib/samples/ogl/ogledit/makefile.unx

@@ -1,20 +1,39 @@
 #
-# File:		makefile.unx
+# File:		Makefile
 # Author:	Julian Smart
-# Created:	1998
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1998 Julian Smart
+# Copyright:	(c) 2000 Julian Smart
 #
-# "%W% %G%"
+# Makefile for OGL demo (GTK version)
+#
+# This makefile requires wxWindows/GTK to be 
+# installed (possibly using "make install")
+# on your system.
 #
-# Makefile for OGLEdit example (UNIX).
 
-PROGRAM=ogledit
+CPP = gcc -g
+CC = gcc
+WXCONFIG=../../../../wx-config
+WXINCLUDE=-I../../../../include -I../../../include
+WXLIB=-L../../../../lib -L../../../src/ogl
 
-OBJECTS=$(PROGRAM).o doc.o view.o palette.o
+OBJECTS=ogledit.o palette.o doc.o view.o
 
-# EXTRACPPFLAGS=-I$(WXDIR)/contrib/include
+ogledit: $(OBJECTS)
-EXTRALDLIBS=-logl$(GUISUFFIX)
+	$(CPP) -o ogledit $(OBJECTS) `$(WXCONFIG) --libs` $(WXLIB) -logl
 
-include ../../../../src/makeprog.env
+ogledit.o: ogledit.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c ogledit.cpp
 
+palette.o: palette.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c palette.cpp
+
+doc.o: doc.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c doc.cpp
+
+view.o: view.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c view.cpp
+
+clean: 
+	rm -f *.o ogledit

contrib/samples/ogl/studio/Makefile

@@ -1,57 +0,0 @@
-#
-# File:		Makefile
-# Author:	Julian Smart
-# Created:	1999
-# Updated:	
-# Copyright:	(c) 2000 Julian Smart
-#
-# Makefile for OGL demo (GTK version)
-#
-# This makefile requires wxWindows/GTK to be 
-# installed (possibly using "make install")
-# on your system.
-#
-
-CPP = gcc -g
-CC = gcc
-WXCONFIG=../../../../wx-config
-WXINCLUDE=-I../../../../include -I../../../include
-WXLIB=-L../../../../lib -L../../../src/ogl
-
-OBJECTS=studio.o cspalette.o csprint.o dialogs.o doc.o mainfrm.o project.o shapes.o symbols.o view.o
-
-studio: $(OBJECTS)
-	$(CPP) -o studio $(OBJECTS) `$(WXCONFIG) --libs` $(WXLIB) -logl
-
-studio.o: studio.cpp
-	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c studio.cpp
-
-cspalette.o: cspalette.cpp
-	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c cspalette.cpp
-
-doc.o: doc.cpp
-	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c doc.cpp
-
-view.o: view.cpp
-	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c view.cpp
-
-dialogs.o: dialogs.cpp
-	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c dialogs.cpp
-
-mainfrm.o: mainfrm.cpp
-	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c mainfrm.cpp
-
-project.o: project.cpp
-	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c project.cpp
-
-shapes.o: shapes.cpp
-	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c shapes.cpp
-
-symbols.o: symbols.cpp
-	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c symbols.cpp
-
-csprint.o: csprint.cpp
-	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c csprint.cpp
-
-clean: 
-	rm -f *.o studio

contrib/samples/ogl/studio/Makefile.in

@@ -0,0 +1,19 @@
+# Makefile for OGL Studio.
+# $Id$
+
+top_srcdir = @top_srcdir@/..
+top_builddir = ../../../..
+program_dir = contrib/samples/ogl/studio
+
+PROGRAM=studio
+
+DATAFILES=studio_resources.wxr
+
+OBJECTS=$(PROGRAM).o doc.o shapes.o symbols.o view.o cspalette.o\
+  mainfrm.o project.o dialogs.o csprint.o
+
+APPEXTRALIBS=$(top_builddir)/lib/libogl.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRADEFS=-I$(top_srcdir)/contrib/include -I$(top_srcdir)/$(program_dir)/bitmaps
+
+include $(top_builddir)/src/makeprog.env
+

contrib/samples/ogl/studio/makefile.unx

@@ -1,39 +1,57 @@
 #
-# File:		makefile.unx
+# File:		Makefile
 # Author:	Julian Smart
-# Created:	1998
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1998 Julian Smart
+# Copyright:	(c) 2000 Julian Smart
 #
-# "%W% %G%"
+# Makefile for OGL demo (GTK version)
+#
+# This makefile requires wxWindows/GTK to be 
+# installed (possibly using "make install")
+# on your system.
 #
-# Makefile for OGL Studio (UNIX).
 
-PROGRAM=studio
+CPP = gcc -g
+CC = gcc
+WXCONFIG=../../../../wx-config
+WXINCLUDE=-I../../../../include -I../../../include
+WXLIB=-L../../../../lib -L../../../src/ogl
 
-OBJECTS=$(PROGRAM).o doc.o shapes.o symbols.o view.o cspalette.o\
+OBJECTS=studio.o cspalette.o csprint.o dialogs.o doc.o mainfrm.o project.o shapes.o symbols.o view.o
-  mainfrm.o project.o dialogs.o csprint.o
 
-EXTRACPPFLAGS=-I$(WXDIR)/utils/ogl/src -I./bitmaps
+studio: $(OBJECTS)
-EXTRALDLIBS=-logl$(GUISUFFIX)
+	$(CPP) -o studio $(OBJECTS) `$(WXCONFIG) --libs` $(WXLIB) -logl
 
-#WXDIR=/home/jacs/wx2
+studio.o: studio.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c studio.cpp
 
-include $(WXDIR)/src/makeprog.env
+cspalette.o: cspalette.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c cspalette.cpp
 
-cleanogl:
+doc.o: doc.cpp
-	cd $(WXDIR)/utils/ogl/src; make -f makefile.unx cleanmotif
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c doc.cpp
 
-ogl:
+view.o: view.cpp
-	cd $(WXDIR)/utils/ogl/src; make -f makefile.unx motif
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c view.cpp
 
-wx:
+dialogs.o: dialogs.cpp
-	cd $(WXDIR)/src/motif; make -f makefile.unx motif
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c dialogs.cpp
 
-cleanwx:
+mainfrm.o: mainfrm.cpp
-	cd $(WXDIR)/src/motif; make -f makefile.unx cleanmotif
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c mainfrm.cpp
 
-cleanall: cleanmotif cleanogl cleanwx
+project.o: project.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c project.cpp
 
-makeall: wx ogl motif
+shapes.o: shapes.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c shapes.cpp
 
+symbols.o: symbols.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c symbols.cpp
+
+csprint.o: csprint.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c csprint.cpp
+
+clean: 
+	rm -f *.o studio

contrib/samples/stc/Makefile.in

@@ -13,9 +13,9 @@ PROGRAM=stctest
 
 OBJECTS=$(PROGRAM).o
 
-APPEXTRALIBS=$(top_builddir)/contrib/src/stc/libstc.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/libstc.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include
 
 DATAFILES=stctest.cpp
 
-include ../../../src/makeprog.env
+include $(top_builddir)/src/makeprog.env

contrib/src/Makefile.in

@@ -1,6 +1,4 @@
-#
+# $Id$
-# Makefile : Builds wxWindows contrib src for Unix.
-#
 
 CONTRIB_SUBDIRS=ogl mmedia stc
 

contrib/src/mmedia/Makefile.in

@@ -1,7 +1,8 @@
-#
+# $Id$
 
-top_srcdir = @top_srcdir@
+top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
+libsrc_dir = contrib/src/mmedia
 
 TARGET_LIBNAME=libmmedia
 
@@ -9,17 +10,20 @@ LIBVERSION_CURRENT=1
 LIBVERSION_REVISION=0
 LIBVERSION_AGE=0
 
+HEADER_PATH=$(top_srcdir)/contrib/include/wx
+HEADER_SUBDIR=mmedia
+
+HEADERS=cdbase.h cdunix.h cdwin.h sndaiff.h sndbase.h sndcodec.h \
+	sndcpcm.h sndesd.h sndfile.h sndg72x.h sndmsad.h sndoss.h \
+	sndpcm.h sndulaw.h sndwav.h sndwin.h vidbase.h vidwin.h \
+	vidxanm.h
+
 OBJECTS=cdbase.o cdwin.o g711.o g721.o g723_24.o \
   g723_40.o g72x.o sndaiff.o sndbase.o sndcodec.o \
   sndcpcm.o sndfile.o sndg72x.o sndpcm.o sndulaw.o \
   sndwav.o sndwin.o vidbase.o vidwin.o vidxanm.o sndoss.o sndesd.o
 
-# the comment at the end of the next line is needed because otherwise autoconf
+APPEXTRADEFS=-I$(top_srcdir)/contrib/include
-# would remove this line completely - it contains a built-in hack to remove
-# any VPATH assignment not containing ':'
-VPATH = :$(top_srcdir)/src/mmedia # ':' for autoconf
-
-APPEXTRADEFS=-I$(top_srcdir)/include
 
 include $(top_builddir)/src/makelib.env
 

contrib/src/ogl/Makefile.in

@@ -1,7 +1,8 @@
-#
+# $Id$
 
-top_srcdir = @top_srcdir@
+top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
+libsrc_dir = contrib/src/ogl
 
 TARGET_LIBNAME=libogl
 
@@ -9,14 +10,17 @@ LIBVERSION_CURRENT=1
 LIBVERSION_REVISION=0
 LIBVERSION_AGE=0
 
-OBJECTS=basic.o   bmpshape.o  composit.o  divided.o  lines.o    misc.o \
+HEADER_PATH=$(top_srcdir)/contrib/include/wx
-        basic2.o  canvas.o    constrnt.o  drawn.o    mfutils.o  ogldiag.o
+HEADER_SUBDIR=ogl
 
-# the comment at the end of the next line is needed because otherwise autoconf
+HEADERS=basic.h basicp.h bmpshape.h canvas.h composit.h constrnt.h \
-# would remove this line completely - it contains a built-in hack to remove
+	divided.h drawn.h drawnp.h lines.h linesp.h mfutils.h misc.h \
-# any VPATH assignment not containing ':'
+	ogl.h ogldiag.h
-VPATH = :$(top_srcdir)/src/ogl # ':' for autoconf
 
-APPEXTRADEFS=-I$(top_srcdir)/include
+OBJECTS=basic.o bmpshape.o composit.o divided.o lines.o misc.o \
+        basic2.o canvas.o constrnt.o drawn.o mfutils.o ogldiag.o
+
+APPEXTRADEFS=-I$(top_srcdir)/contrib/include
 
 include $(top_builddir)/src/makelib.env
+

contrib/src/stc/Makefile.in

@@ -5,12 +5,11 @@
 # Version: $Id$
 ###############################################################################
 
-top_srcdir = @top_srcdir@
+top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 
-this_dir = $(top_srcdir)/src/stc
+scintilla_dir = $(top_srcdir)/contrib/src/stc/scintilla
-scintilla_dir=$(this_dir)/scintilla
+libsrc_dir = contrib/src/stc@PATH_IFS@$(scintilla_dir)/src
-VPATH=$(this_dir)@PATH_IFS@$(scintilla_dir)/src # ':' for autoconf
 
 TARGET_LIBNAME=libstc
 
@@ -18,6 +17,11 @@ LIBVERSION_CURRENT=1
 LIBVERSION_REVISION=0
 LIBVERSION_AGE=0
 
+HEADER_PATH=$(top_srcdir)/contrib/include/wx
+HEADER_SUBDIR=stc
+
+HEADERS=stc.h
+
 OBJECTS=PlatWX.o ScintillaWX.o stc.o \
         Accessor.o	        \
         AutoComplete.o	    \
@@ -35,6 +39,6 @@ OBJECTS=PlatWX.o ScintillaWX.o stc.o \
         Style.o		        \
         ViewStyle.o
         
-APPEXTRADEFS=-D__WX__ -DSCI_LEXER -I$(scintilla_dir)/src -I$(scintilla_dir)/include -I$(top_srcdir)/include
+APPEXTRADEFS=-D__WX__ -DSCI_LEXER -I$(scintilla_dir)/src -I$(scintilla_dir)/include -I$(top_srcdir)/contrib/include
 
 include $(top_builddir)/src/makelib.env

debian/changelog

@@ -1,4 +1,4 @@
-wxwindows2.1 (2.1.14) unstable; urgency=low
+wxwindows2.1 (2.1.15) unstable; urgency=low
 
   * Repackaged to build from cvs.
 

debian/control.in

@@ -1,7 +1,7 @@
 Source: wxwindows=V
 Section: libs
 Priority: optional
-Build-Depends: debhelper, libgtk1.2-dev, python-dev (>=1.5), flex, bison
+Build-Depends: debhelper, flex, bison, libgtk1.2-dev, python-dev (>=1.5), zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, mesag-dev
 Maintainer: Ron Lee <ron@debian.org>
 Standards-Version: 3.1.1
 
@@ -25,7 +25,7 @@ Description: wxBase library (runtime) - non-GUI support classes of wxWindows too
 Package: libwxbase=V-dev
 Architecture: any
 Section: devel
-Depends: libwxbase=V (= ${Source-Version}), libwxgtk=V-dev (= ${Source-Version}), libc6-dev
+Depends: wxwin=V-headers (= ${Source-Version}), libwxbase=V (= ${Source-Version}), libc6-dev
 Suggests: wxwin=V-doc, gettext
 Conflicts: libwxbase-dev
 Replaces: libwxbase-dev
@@ -58,7 +58,7 @@ Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ runtime)
 Package: libwxgtk=V-dev
 Architecture: any
 Section: devel
-Depends: libwxgtk=V (= ${Source-Version}), libc6-dev
+Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libc6-dev
 Suggests: wxwin=V-doc, libstdc++-dev, gettext
 Conflicts: libwxgtk-dev
 Replaces: libwxgtk-dev
@@ -83,6 +83,49 @@ Description: wxWindows Cross-platform C++ GUI toolkit (Python binding)
  .
  This package provides a Python binding to the wxGTK library.
 
+Package: wxwin=V-contrib
+Architecture: any
+Section: libs
+Depends: libwxgtk=V (= ${Source-Version}), ${shlibs:Depends}
+Suggests: mesag3
+Description: wxWindows Cross-platform C++ GUI toolkit (runtime contrib libs)
+ wxWindows is a class library for C++ providing GUI (Graphical User
+ Interface) and other facilities on more than one platform.  Version 2.1
+ currently supports subsets of GTK+, Motif, and MS Windows.
+ .
+ This package provides the contrib libs of the wxWindows source tree
+ (mmedia, ogl, stc, glcanvas)
+
+Package: wxwin=V-contrib-dev
+Architecture: any
+Section: devel
+Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V-dev (= ${Source-Version}), libc6-dev
+Suggests: mesag-dev
+Conflicts: wxwin-contrib-dev
+Replaces: wxwin-contrib-dev
+Provides: wxwin-contrib-dev
+Description: wxWindows Cross-platform C++ GUI toolkit (development contrib libs)
+ wxWindows is a class library for C++ providing GUI (Graphical User
+ Interface) and other facilities on more than one platform.  Version 2.1
+ currently supports subsets of GTK+, Motif, and MS Windows.
+ .
+ Install this package if you wish to compile applications that use the
+ contrib libs from the wxWindows source tree (mmedia, ogl, stc, glcanvas)
+
+Package: wxwin=V-headers
+Architecture: any
+Section: devel
+Conflicts: wxwin-headers
+Replaces: wxwin-headers
+Provides: wxwin-headers
+Description: wxWindows Cross-platform C++ GUI toolkit (header files)
+ wxWindows is a class library for C++ providing GUI (Graphical User
+ Interface) and other facilities on more than one platform.  Version 2.1
+ currently supports subsets of GTK+, Motif, and MS Windows.
+ .
+ This common package provides the header files required to build applications
+ using the wxWindows toolkit.
+
 Package: wxwin=V-doc
 Architecture: all
 Section: doc

debian/libwxgtk-dev.dirs

@@ -1,4 +1,3 @@
 usr/bin
 usr/lib/wx/include/wx/gtk/
-usr/include/wx
 usr/share/man/man1

debian/libwxgtk-dev.files

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

debian/libwxgtk.files

@@ -1,2 +1,2 @@
-usr/lib/libwx_gtk*.so.*
+usr/lib/libwx_gtk-*.so.*
 usr/share/wx

debian/rules

@@ -18,6 +18,9 @@ package_wxbase_dev=libwxbase$(release)-dev
 package_gtk_lib=libwxgtk$(release)
 package_gtk_dev=libwxgtk$(release)-dev
 package_gtk_py=libwxgtk$(release)-python
+package_contrib=wxwin$(release)-contrib
+package_contrib_dev=wxwin$(release)-contrib-dev
+package_headers=wxwin$(release)-headers
 package_doc=wxwin$(release)-doc
 package_examples=wxwin$(release)-examples
 
@@ -34,6 +37,7 @@ objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_gtk_shared) \
 
 build_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \
              build-gtk-shared-stamp build-gtk-static-stamp \
+             build-contrib-shared-stamp build-contrib-static-stamp \
              build-gtk-python-stamp build-examples-stamp build-doc-stamp
 
 wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \
@@ -55,7 +59,10 @@ build-wxbase-shared-stamp:
 	dh_testdir
 	mkdir $(objdir_wxbase_shared)
 	cd $(objdir_wxbase_shared) \
-		&& ../configure --prefix=/usr --disable-gui --enable-burnt_name \
+		&& ../configure --prefix=/usr \
+				--disable-gui \
+				--enable-burnt_name \
+				--with-zlib=sys \
 		&& $(MAKE)
 	touch $@
 
@@ -63,7 +70,10 @@ build-wxbase-static-stamp:
 	dh_testdir
 	mkdir $(objdir_wxbase_static)
 	cd $(objdir_wxbase_static) \
-		&& ../configure --prefix=/usr --disable-gui --disable-shared \
+		&& ../configure --prefix=/usr \
+				--disable-gui \
+				--disable-shared \
+				--with-zlib=sys \
 		&& $(MAKE)
 	touch $@
 
@@ -71,7 +81,15 @@ build-gtk-shared-stamp:
 	dh_testdir
 	mkdir $(objdir_gtk_shared)
 	cd $(objdir_gtk_shared) \
-		&& ../configure --prefix=/usr --with-gtk --enable-burnt_name --disable-newgrid \
+		&& ../configure --prefix=/usr \
+				--with-gtk \
+				--with-opengl \
+				--enable-burnt_name \
+				--disable-newgrid \
+				--with-zlib=sys \
+				--with-libjpeg=sys \
+				--with-libpng=sys \
+				--with-libtiff=sys \
 		&& $(MAKE)
 	touch $@
 
@@ -79,10 +97,28 @@ build-gtk-static-stamp:
 	dh_testdir
 	mkdir $(objdir_gtk_static)
 	cd $(objdir_gtk_static) \
-		&& ../configure --prefix=/usr --with-gtk --disable-shared \
+		&& ../configure --prefix=/usr \
+				--with-gtk \
+				--with-opengl \
+				--disable-shared \
+				--disable-newgrid \
+				--with-zlib=sys \
+				--with-libjpeg=sys \
+				--with-libpng=sys \
+				--with-libtiff=sys \
 		&& $(MAKE)
 	touch $@
 
+build-contrib-shared-stamp: build-gtk-shared-stamp
+	dh_testdir
+	cd $(objdir_gtk_shared)/contrib/src && $(MAKE)
+	touch $@
+
+build-contrib-static-stamp: build-gtk-static-stamp
+	dh_testdir
+	cd $(objdir_gtk_static)/contrib/src && $(MAKE)
+	touch $@
+
 build-gtk-python-stamp: build-gtk-shared-stamp
 	dh_testdir
 	cd utils/wxPython/src \
@@ -142,6 +178,9 @@ clean: debian/control
 	rm -f debian/$(package_gtk_lib).*
 	rm -f debian/$(package_gtk_dev).*
 	rm -f debian/$(package_gtk_py).*
+	rm -f debian/$(package_contrib).*
+	rm -f debian/$(package_contrib_dev).*
+	rm -f debian/$(package_headers).*
 	rm -f debian/$(package_doc).*
 	rm -f debian/$(package_examples).*
 
@@ -168,6 +207,18 @@ install: build
 		echo "generating control file $(package_gtk_py).$$f"; \
 		cp debian/libwxgtk-python.$$f debian/$(package_gtk_py).$$f; \
 	done;
+	@for f in dirs docs files postinst; do \
+		echo "generating control file $(package_contrib).$$f"; \
+		cp debian/wxwin-contrib.$$f debian/$(package_contrib).$$f; \
+	done;
+	@for f in dirs docs files; do \
+		echo "generating control file $(package_contrib_dev).$$f"; \
+		cp debian/wxwin-contrib-dev.$$f debian/$(package_contrib_dev).$$f; \
+	done;
+	@for f in dirs docs files; do \
+		echo "generating control file $(package_headers).$$f"; \
+		cp debian/wxwin-headers.$$f debian/$(package_headers).$$f; \
+	done;
 	@for f in dirs docs doc-base; do \
 		echo "generating control file $(package_doc).$$f"; \
 		cp debian/wxwin-doc.$$f debian/$(package_doc).$$f; \
@@ -181,6 +232,8 @@ install: build
 	cd $(objdir_gtk_shared) \
 		&& $(MAKE) install prefix=`pwd`/../debian/tmp/usr
 	rm -f debian/tmp/usr/bin/wx-config
+	cd $(objdir_gtk_shared)/contrib/src \
+		&& $(MAKE) install prefix=`pwd`/../../../debian/tmp/usr
 	cp $(objdir_gtk_static)/lib/*.a debian/tmp/usr/lib
 	cp -a $(objdir_wxbase_shared)/lib/* debian/tmp/usr/lib
 	cp $(objdir_wxbase_shared)/wxbase-config debian/tmp/usr/bin/
@@ -213,7 +266,7 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installdocs
-	dh_installmanpages -p$(package_gtk_dev) \
+	dh_installmanpages -p$(package_headers) \
 		ansi2knr.1 \
 		jpegtran.1 \
 		libpng.3 \

debian/wxwin-contrib-dev.dirs

@@ -0,0 +1,2 @@
+usr/lib/
+

debian/wxwin-contrib-dev.docs

@@ -0,0 +1,2 @@
+docs/licence.txt
+

debian/wxwin-contrib-dev.files

@@ -0,0 +1,9 @@
+usr/lib/libmmedia.a
+usr/lib/libmmedia.so
+usr/lib/libogl.a
+usr/lib/libogl.so
+usr/lib/libstc.a
+usr/lib/libstc.so
+usr/lib/libwx_gtk_gl.a
+usr/lib/libwx_gtk_gl*.so
+

debian/wxwin-contrib.dirs

@@ -0,0 +1,2 @@
+usr/lib/
+

debian/wxwin-contrib.docs

@@ -0,0 +1,2 @@
+docs/licence.txt
+

debian/wxwin-contrib.files

@@ -0,0 +1,5 @@
+usr/lib/libmmedia.so.*
+usr/lib/libogl.so.*
+usr/lib/libstc.so.*
+usr/lib/libwx_gtk_gl*.so.*
+

debian/wxwin-contrib.postinst

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+	ldconfig
+fi
+
+#DEBHELPER#
+

debian/wxwin-headers.dirs

@@ -0,0 +1,3 @@
+usr/include/wx
+usr/share/man/man1
+

debian/wxwin-headers.docs

@@ -0,0 +1,2 @@
+docs/licence.txt
+

debian/wxwin-headers.files

@@ -0,0 +1 @@
+usr/include/wx/

demos/dbbrowse/de/mo.cmd

@@ -1,2 +1,3 @@
+#! /bin/sh
 msgfmt -o dbbrowse.mo dbbrowse.po
 msgfmt -o help.mo help.po

demos/dbbrowse/de/mo_de.cmd

@@ -1 +1,2 @@
+#! /bin/sh
 msgfmt -o wxStd.mo de.po

demos/dbbrowse/de/xget.cmd

@@ -1 +1,2 @@
-   xgettext -C -i -s -j -a -d PgmText -f xget.cfg
+#! /bin/sh
+xgettext -C -i -s -j -a -d PgmText -f xget.cfg

samples/stc/Makefile.in

@@ -13,9 +13,9 @@ PROGRAM=stctest
 
 OBJECTS=$(PROGRAM).o
 
-APPEXTRALIBS=$(top_builddir)/contrib/src/stc/libstc.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRALIBS=$(top_builddir)/lib/libstc.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include
 
 DATAFILES=stctest.cpp
 
-include ../../../src/makeprog.env
+include $(top_builddir)/src/makeprog.env

src/make.env.in

@@ -20,7 +20,7 @@ TOOLKITDIR = @TOOLKIT_DIR@
 WXLIB = @WX_LIBRARY_NAME_STATIC@
 WXSHLIB = @WX_LIBRARY_NAME_SHARED@
 
-EXTRADEFS="-DwxINSTALL_PREFIX=\"@prefix@\"" $(APPEXTRADEFS)
+EXTRADEFS="-DwxINSTALL_PREFIX=\"@prefix@\""
 
 ########################### VERSION #################################
 

src/makelib.env.in

@@ -3,13 +3,23 @@
 #
 # Author:   Ron Lee <ron@debian.org>
 # Created:  19/3/2000
+# $Id$
 #
-# To use, set the following vars before including it.
+# To use, set the following vars before including it:
+#
+# top_srcdir
+# top_builddir
+# libsrc_dir
 #
 # TARGET_LIBNAME
 # LIBVERSION_CURRENT
 # LIBVERSION_REVISION
 # LIBVERSION_AGE
+# HEADER_PATH
+# HEADER_SUBDIR
+#
+# HEADERS
+# OBJECTS
 #
 # either a shared or static lib will be built according to the
 # option given to configure.
@@ -17,15 +27,19 @@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+includedir = @includedir@
 libdir = @libdir@
 
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 
-TARGETLIB_STATIC=$(TARGET_LIBNAME).a
+TARGETLIB_STATIC = $(TARGET_LIBNAME).a
-TARGETLIB_SHARED=$(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE)
+TARGETLIB_SHARED = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE)
-TARGETLIB_LINK1=$(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT)
+TARGETLIB_LINK1 = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT)
-TARGETLIB_LINK2=$(TARGET_LIBNAME).so
+TARGETLIB_LINK2 = $(TARGET_LIBNAME).so
+
+TARGETLIB_SONAME = @WX_TARGET_LIBRARY_SONAME@
 
 # Clears all default suffixes
 .SUFFIXES:	.o .cpp .c .cxx
@@ -39,10 +53,15 @@ TARGETLIB_LINK2=$(TARGET_LIBNAME).so
 .cxx.o :
 	$(CC) -c $(CPPFLAGS) $(PICFLAGS) -o $@ $<
 
+# the comment at the end of the next line is needed because otherwise autoconf
+# would remove this line completely - it contains a built-in hack to remove
+# any VPATH assignment not containing ':'
+VPATH = @PATH_IFS@$(top_srcdir)/$(libsrc_dir) # ':' for autoconf
+
 include $(top_builddir)/src/make.env
 
 
-all:    libtype_@WX_TARGET_LIBRARY_TYPE@
+all: libtype_@WX_TARGET_LIBRARY_TYPE@
 
 libtype_so: CREATE_LINKS
 
@@ -50,38 +69,58 @@ libtype_a: $(TARGETLIB_STATIC)
 
 
 $(TARGETLIB_SHARED): $(OBJECTS)
-	$(SHARED_LD) $@ $(OBJECTS)
+	@$(INSTALL) -d $(top_builddir)/lib
+	$(SHARED_LD) $(top_builddir)/lib/$@ $(TARGETLIB_SONAME) $(OBJECTS)
 
 CREATE_LINKS: $(TARGETLIB_SHARED)
-	@$(RM) $(TARGETLIB_LINK1) $(TARGETLIB_LINK2)
+	cd $(top_builddir)/lib \
-	$(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1)
+		&& $(RM) $(TARGETLIB_LINK1) $(TARGETLIB_LINK2) \
-	$(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2)
+		&& $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \
+		&& $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2)
 
 $(TARGETLIB_STATIC): $(OBJECTS)
-	ar $(AROPTIONS) $@ $(OBJECTS)
+	@$(INSTALL) -d $(top_builddir)/lib
-	$(RANLIB) $@
+	ar $(AROPTIONS) $(top_builddir)/lib/$@ $(OBJECTS)
+	$(RANLIB) $(top_builddir)/lib/$@
 
-install: install_@WX_TARGET_LIBRARY_TYPE@
+install: install_@WX_TARGET_LIBRARY_TYPE@ install_headers
 
 install_so:
-	$(INSTALL_PROGRAM) $(TARGETLIB_SHARED) $(libdir)/$(TARGETLIB_SHARED)
+	$(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_SHARED) $(libdir)/$(TARGETLIB_SHARED)
 	@$(RM) $(libdir)/$(TARGETLIB_LINK1) $(libdir)/$(TARGETLIB_LINK2)
 	cd $(libdir) \
 		&& $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \
 		&& $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2)
 
 install_a:
-	$(INSTALL_PROGRAM) $(TARGETLIB_STATIC) $(libdir)/$(TARGETLIB_STATIC)
+	$(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_STATIC) $(libdir)/$(TARGETLIB_STATIC)
+
+install_headers:
+	$(INSTALL) -d $(includedir)/wx/$(HEADER_SUBDIR)
+	@for h in $(HEADERS); do \
+	  $(INSTALL_DATA) $(HEADER_PATH)/$(HEADER_SUBDIR)/$$h $(includedir)/wx/$(HEADER_SUBDIR)/$$h; \
+	  echo "installing $(includedir)/wx/$(HEADER_SUBDIR)/$$h"; \
+	done
 
 uninstall:
 	$(RM) $(libdir)/$(TARGETLIB_STATIC)
 	$(RM) $(libdir)/$(TARGETLIB_SHARED)
 	$(RM) $(libdir)/$(TARGETLIB_LINK1)
 	$(RM) $(libdir)/$(TARGETLIB_LINK2)
+	@echo "removing headers"
+	@for h in $(HEADERS); do \
+	  $(RM) $(includedir)/wx/$(HEADER_SUBDIR)/$$h; \
+	done
+	@if test -d $(includedir)/wx/$(HEADER_SUBDIR); then \
+	  rmdir $(includedir)/wx/$(HEADER_SUBDIR); \
+	fi
+	@-rmdir $(includedir)/wx
 
 clean:
-	$(RM) $(OBJECTS) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \
+	$(RM) $(OBJECTS) $(top_builddir)/lib/$(TARGETLIB_SHARED) \
-	      $(TARGETLIB_LINK2) $(TARGETLIB_STATIC) core
+	      $(top_builddir)/lib/$(TARGETLIB_LINK1) \
+	      $(top_builddir)/lib/$(TARGETLIB_LINK2) \
+	      $(top_builddir)/lib/$(TARGETLIB_STATIC) core
 
 .PHONY: all shared static clean install install_static install_shared uninstall
 

src/stc/Makefile.in

@@ -5,12 +5,11 @@
 # Version: $Id$
 ###############################################################################
 
-top_srcdir = @top_srcdir@
+top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 
-this_dir = $(top_srcdir)/src/stc
+scintilla_dir = $(top_srcdir)/contrib/src/stc/scintilla
-scintilla_dir=$(this_dir)/scintilla
+libsrc_dir = contrib/src/stc@PATH_IFS@$(scintilla_dir)/src
-VPATH=$(this_dir)@PATH_IFS@$(scintilla_dir)/src # ':' for autoconf
 
 TARGET_LIBNAME=libstc
 
@@ -18,6 +17,11 @@ LIBVERSION_CURRENT=1
 LIBVERSION_REVISION=0
 LIBVERSION_AGE=0
 
+HEADER_PATH=$(top_srcdir)/contrib/include/wx
+HEADER_SUBDIR=stc
+
+HEADERS=stc.h
+
 OBJECTS=PlatWX.o ScintillaWX.o stc.o \
         Accessor.o	        \
         AutoComplete.o	    \
@@ -35,6 +39,6 @@ OBJECTS=PlatWX.o ScintillaWX.o stc.o \
         Style.o		        \
         ViewStyle.o
         
-APPEXTRADEFS=-D__WX__ -DSCI_LEXER -I$(scintilla_dir)/src -I$(scintilla_dir)/include -I$(top_srcdir)/include
+APPEXTRADEFS=-D__WX__ -DSCI_LEXER -I$(scintilla_dir)/src -I$(scintilla_dir)/include -I$(top_srcdir)/contrib/include
 
 include $(top_builddir)/src/makelib.env