From 724b68472932ac877cc8cd4d74c9177d1b360225 Mon Sep 17 00:00:00 2001 From: Ron Lee Date: Wed, 29 Mar 2000 15:32:47 +0000 Subject: [PATCH] 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 | 6 ++ contrib/configure.in | 3 + contrib/samples/Makefile.in | 12 ++-- contrib/samples/mmedia/Makefile.in | 33 ++--------- contrib/samples/ogl/Makefile.in | 12 ++++ contrib/samples/ogl/ogledit/Makefile | 39 ------------- contrib/samples/ogl/ogledit/Makefile.in | 16 ++++++ contrib/samples/ogl/ogledit/makefile.unx | 39 +++++++++---- contrib/samples/ogl/studio/Makefile | 57 ------------------ contrib/samples/ogl/studio/Makefile.in | 19 ++++++ contrib/samples/ogl/studio/makefile.unx | 62 +++++++++++++------- contrib/samples/stc/Makefile.in | 4 +- contrib/src/Makefile.in | 4 +- contrib/src/mmedia/Makefile.in | 20 ++++--- contrib/src/ogl/Makefile.in | 22 ++++--- contrib/src/stc/Makefile.in | 14 +++-- debian/changelog | 2 +- debian/control.in | 49 +++++++++++++++- debian/libwxgtk-dev.dirs | 1 - debian/libwxgtk-dev.files | 6 +- debian/libwxgtk.files | 2 +- debian/rules | 63 ++++++++++++++++++-- debian/wxwin-contrib-dev.dirs | 2 + debian/wxwin-contrib-dev.docs | 2 + debian/wxwin-contrib-dev.files | 9 +++ debian/wxwin-contrib.dirs | 2 + debian/wxwin-contrib.docs | 2 + debian/wxwin-contrib.files | 5 ++ debian/wxwin-contrib.postinst | 10 ++++ debian/wxwin-headers.dirs | 3 + debian/wxwin-headers.docs | 2 + debian/wxwin-headers.files | 1 + demos/dbbrowse/de/mo.cmd | 1 + demos/dbbrowse/de/mo_de.cmd | 1 + demos/dbbrowse/de/xget.cmd | 3 +- samples/stc/Makefile.in | 4 +- src/make.env.in | 2 +- src/makelib.env.in | 73 ++++++++++++++++++------ src/stc/Makefile.in | 14 +++-- 39 files changed, 390 insertions(+), 231 deletions(-) create mode 100644 contrib/samples/ogl/Makefile.in delete mode 100644 contrib/samples/ogl/ogledit/Makefile create mode 100644 contrib/samples/ogl/ogledit/Makefile.in delete mode 100644 contrib/samples/ogl/studio/Makefile create mode 100644 contrib/samples/ogl/studio/Makefile.in create mode 100644 debian/wxwin-contrib-dev.dirs create mode 100644 debian/wxwin-contrib-dev.docs create mode 100644 debian/wxwin-contrib-dev.files create mode 100644 debian/wxwin-contrib.dirs create mode 100644 debian/wxwin-contrib.docs create mode 100644 debian/wxwin-contrib.files create mode 100644 debian/wxwin-contrib.postinst create mode 100644 debian/wxwin-headers.dirs create mode 100644 debian/wxwin-headers.docs create mode 100644 debian/wxwin-headers.files diff --git a/contrib/configure b/contrib/configure index e5e4981399..1e0f10b3cb 100755 --- a/contrib/configure +++ b/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 diff --git a/contrib/configure.in b/contrib/configure.in index fb7fc13b83..d4b6e3aa27 100644 --- a/contrib/configure.in +++ b/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 ]) diff --git a/contrib/samples/Makefile.in b/contrib/samples/Makefile.in index 2ec692ed42..c054aa6453 100644 --- a/contrib/samples/Makefile.in +++ b/contrib/samples/Makefile.in @@ -1,12 +1,10 @@ -# -# Makefile : Builds wxWindows utils for Unix. -# +# $Id$ + +CONTRIB_SAMPLES=mmedia ogl stc all: - cd mmedia; make - cd stc; make + @for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE)); done clean: - cd mmedia; make clean - cd stc; make clean + @for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE) clean); done diff --git a/contrib/samples/mmedia/Makefile.in b/contrib/samples/mmedia/Makefile.in index 04b776a093..7c4c5cbbba 100644 --- a/contrib/samples/mmedia/Makefile.in +++ b/contrib/samples/mmedia/Makefile.in @@ -1,13 +1,5 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for minimal example (UNIX). +# Makefile for mmedia sample. +# $Id$ 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 -# 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 $(top_builddir)/src/makeprog.env -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@ diff --git a/contrib/samples/ogl/Makefile.in b/contrib/samples/ogl/Makefile.in new file mode 100644 index 0000000000..e53c85784e --- /dev/null +++ b/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 + diff --git a/contrib/samples/ogl/ogledit/Makefile b/contrib/samples/ogl/ogledit/Makefile deleted file mode 100644 index 76d11a5ebb..0000000000 --- a/contrib/samples/ogl/ogledit/Makefile +++ /dev/null @@ -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 diff --git a/contrib/samples/ogl/ogledit/Makefile.in b/contrib/samples/ogl/ogledit/Makefile.in new file mode 100644 index 0000000000..055739c441 --- /dev/null +++ b/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 + diff --git a/contrib/samples/ogl/ogledit/makefile.unx b/contrib/samples/ogl/ogledit/makefile.unx index 31b223db53..76d11a5ebb 100644 --- a/contrib/samples/ogl/ogledit/makefile.unx +++ b/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 -EXTRALDLIBS=-logl$(GUISUFFIX) +ogledit: $(OBJECTS) + $(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 diff --git a/contrib/samples/ogl/studio/Makefile b/contrib/samples/ogl/studio/Makefile deleted file mode 100644 index 2070bc3b13..0000000000 --- a/contrib/samples/ogl/studio/Makefile +++ /dev/null @@ -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 diff --git a/contrib/samples/ogl/studio/Makefile.in b/contrib/samples/ogl/studio/Makefile.in new file mode 100644 index 0000000000..1f6d9c4673 --- /dev/null +++ b/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 + diff --git a/contrib/samples/ogl/studio/makefile.unx b/contrib/samples/ogl/studio/makefile.unx index 5fca57a097..2070bc3b13 100644 --- a/contrib/samples/ogl/studio/makefile.unx +++ b/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\ - mainfrm.o project.o dialogs.o csprint.o +OBJECTS=studio.o cspalette.o csprint.o dialogs.o doc.o mainfrm.o project.o shapes.o symbols.o view.o -EXTRACPPFLAGS=-I$(WXDIR)/utils/ogl/src -I./bitmaps -EXTRALDLIBS=-logl$(GUISUFFIX) +studio: $(OBJECTS) + $(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: - cd $(WXDIR)/utils/ogl/src; make -f makefile.unx cleanmotif +doc.o: doc.cpp + $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c doc.cpp -ogl: - cd $(WXDIR)/utils/ogl/src; make -f makefile.unx motif +view.o: view.cpp + $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c view.cpp -wx: - cd $(WXDIR)/src/motif; make -f makefile.unx motif +dialogs.o: dialogs.cpp + $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c dialogs.cpp -cleanwx: - cd $(WXDIR)/src/motif; make -f makefile.unx cleanmotif +mainfrm.o: mainfrm.cpp + $(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 diff --git a/contrib/samples/stc/Makefile.in b/contrib/samples/stc/Makefile.in index 39b2292d0d..cffdcc78d7 100644 --- a/contrib/samples/stc/Makefile.in +++ b/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 diff --git a/contrib/src/Makefile.in b/contrib/src/Makefile.in index 93e54c589c..42a7ef8d06 100644 --- a/contrib/src/Makefile.in +++ b/contrib/src/Makefile.in @@ -1,6 +1,4 @@ -# -# Makefile : Builds wxWindows contrib src for Unix. -# +# $Id$ CONTRIB_SUBDIRS=ogl mmedia stc diff --git a/contrib/src/mmedia/Makefile.in b/contrib/src/mmedia/Makefile.in index 7eaca8e349..3162aa9b3f 100644 --- a/contrib/src/mmedia/Makefile.in +++ b/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 -# 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 +APPEXTRADEFS=-I$(top_srcdir)/contrib/include include $(top_builddir)/src/makelib.env diff --git a/contrib/src/ogl/Makefile.in b/contrib/src/ogl/Makefile.in index 64f08fbfad..e1e0aedcd1 100644 --- a/contrib/src/ogl/Makefile.in +++ b/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 \ - basic2.o canvas.o constrnt.o drawn.o mfutils.o ogldiag.o +HEADER_PATH=$(top_srcdir)/contrib/include/wx +HEADER_SUBDIR=ogl -# 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 = :$(top_srcdir)/src/ogl # ':' for autoconf +HEADERS=basic.h basicp.h bmpshape.h canvas.h composit.h constrnt.h \ + divided.h drawn.h drawnp.h lines.h linesp.h mfutils.h misc.h \ + ogl.h ogldiag.h -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 + diff --git a/contrib/src/stc/Makefile.in b/contrib/src/stc/Makefile.in index 425ea48714..45fb960944 100644 --- a/contrib/src/stc/Makefile.in +++ b/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=$(this_dir)/scintilla -VPATH=$(this_dir)@PATH_IFS@$(scintilla_dir)/src # ':' for autoconf +scintilla_dir = $(top_srcdir)/contrib/src/stc/scintilla +libsrc_dir = contrib/src/stc@PATH_IFS@$(scintilla_dir)/src 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 diff --git a/debian/changelog b/debian/changelog index 8eebb0864a..f3e52cc244 100644 --- a/debian/changelog +++ b/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. diff --git a/debian/control.in b/debian/control.in index 9dbe952fb1..edd700fed4 100644 --- a/debian/control.in +++ b/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 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 diff --git a/debian/libwxgtk-dev.dirs b/debian/libwxgtk-dev.dirs index f3281f468f..d5f4413e0c 100644 --- a/debian/libwxgtk-dev.dirs +++ b/debian/libwxgtk-dev.dirs @@ -1,4 +1,3 @@ usr/bin usr/lib/wx/include/wx/gtk/ -usr/include/wx usr/share/man/man1 diff --git a/debian/libwxgtk-dev.files b/debian/libwxgtk-dev.files index d1e42a2f78..eb1e976efc 100644 --- a/debian/libwxgtk-dev.files +++ b/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*.a +usr/lib/libwx_gtk-*.so +usr/lib/libwx_gtk.so +usr/lib/libwx_gtk.a diff --git a/debian/libwxgtk.files b/debian/libwxgtk.files index ad2e7b204b..8f5440b3ba 100644 --- a/debian/libwxgtk.files +++ b/debian/libwxgtk.files @@ -1,2 +1,2 @@ -usr/lib/libwx_gtk*.so.* +usr/lib/libwx_gtk-*.so.* usr/share/wx diff --git a/debian/rules b/debian/rules index 17d49a9165..1c11517805 100755 --- a/debian/rules +++ b/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 \ diff --git a/debian/wxwin-contrib-dev.dirs b/debian/wxwin-contrib-dev.dirs new file mode 100644 index 0000000000..7e033b0c69 --- /dev/null +++ b/debian/wxwin-contrib-dev.dirs @@ -0,0 +1,2 @@ +usr/lib/ + diff --git a/debian/wxwin-contrib-dev.docs b/debian/wxwin-contrib-dev.docs new file mode 100644 index 0000000000..4c4d01649e --- /dev/null +++ b/debian/wxwin-contrib-dev.docs @@ -0,0 +1,2 @@ +docs/licence.txt + diff --git a/debian/wxwin-contrib-dev.files b/debian/wxwin-contrib-dev.files new file mode 100644 index 0000000000..3855471cfc --- /dev/null +++ b/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 + diff --git a/debian/wxwin-contrib.dirs b/debian/wxwin-contrib.dirs new file mode 100644 index 0000000000..7e033b0c69 --- /dev/null +++ b/debian/wxwin-contrib.dirs @@ -0,0 +1,2 @@ +usr/lib/ + diff --git a/debian/wxwin-contrib.docs b/debian/wxwin-contrib.docs new file mode 100644 index 0000000000..4c4d01649e --- /dev/null +++ b/debian/wxwin-contrib.docs @@ -0,0 +1,2 @@ +docs/licence.txt + diff --git a/debian/wxwin-contrib.files b/debian/wxwin-contrib.files new file mode 100644 index 0000000000..07edd190f0 --- /dev/null +++ b/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.* + diff --git a/debian/wxwin-contrib.postinst b/debian/wxwin-contrib.postinst new file mode 100644 index 0000000000..881b6e24e2 --- /dev/null +++ b/debian/wxwin-contrib.postinst @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ]; then + ldconfig +fi + +#DEBHELPER# + diff --git a/debian/wxwin-headers.dirs b/debian/wxwin-headers.dirs new file mode 100644 index 0000000000..d3e1cff74a --- /dev/null +++ b/debian/wxwin-headers.dirs @@ -0,0 +1,3 @@ +usr/include/wx +usr/share/man/man1 + diff --git a/debian/wxwin-headers.docs b/debian/wxwin-headers.docs new file mode 100644 index 0000000000..4c4d01649e --- /dev/null +++ b/debian/wxwin-headers.docs @@ -0,0 +1,2 @@ +docs/licence.txt + diff --git a/debian/wxwin-headers.files b/debian/wxwin-headers.files new file mode 100644 index 0000000000..e3a60cecd2 --- /dev/null +++ b/debian/wxwin-headers.files @@ -0,0 +1 @@ +usr/include/wx/ diff --git a/demos/dbbrowse/de/mo.cmd b/demos/dbbrowse/de/mo.cmd index da7c1256c9..d8ae41c89c 100755 --- a/demos/dbbrowse/de/mo.cmd +++ b/demos/dbbrowse/de/mo.cmd @@ -1,2 +1,3 @@ +#! /bin/sh msgfmt -o dbbrowse.mo dbbrowse.po msgfmt -o help.mo help.po diff --git a/demos/dbbrowse/de/mo_de.cmd b/demos/dbbrowse/de/mo_de.cmd index 722caf2c11..1e6d197077 100755 --- a/demos/dbbrowse/de/mo_de.cmd +++ b/demos/dbbrowse/de/mo_de.cmd @@ -1 +1,2 @@ +#! /bin/sh msgfmt -o wxStd.mo de.po diff --git a/demos/dbbrowse/de/xget.cmd b/demos/dbbrowse/de/xget.cmd index bbd922a278..17edc1468b 100755 --- a/demos/dbbrowse/de/xget.cmd +++ b/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 diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in index 39b2292d0d..cffdcc78d7 100644 --- a/samples/stc/Makefile.in +++ b/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 diff --git a/src/make.env.in b/src/make.env.in index f6bd4cc51b..f732eab79b 100644 --- a/src/make.env.in +++ b/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 ################################# diff --git a/src/makelib.env.in b/src/makelib.env.in index 7b6d8b1896..24d821b09c 100644 --- a/src/makelib.env.in +++ b/src/makelib.env.in @@ -3,13 +3,23 @@ # # Author: Ron Lee # 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_SHARED=$(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE) -TARGETLIB_LINK1=$(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT) -TARGETLIB_LINK2=$(TARGET_LIBNAME).so +TARGETLIB_STATIC = $(TARGET_LIBNAME).a +TARGETLIB_SHARED = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE) +TARGETLIB_LINK1 = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT) +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) - $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) - $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2) + cd $(top_builddir)/lib \ + && $(RM) $(TARGETLIB_LINK1) $(TARGETLIB_LINK2) \ + && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \ + && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2) $(TARGETLIB_STATIC): $(OBJECTS) - ar $(AROPTIONS) $@ $(OBJECTS) - $(RANLIB) $@ + @$(INSTALL) -d $(top_builddir)/lib + 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) \ - $(TARGETLIB_LINK2) $(TARGETLIB_STATIC) core + $(RM) $(OBJECTS) $(top_builddir)/lib/$(TARGETLIB_SHARED) \ + $(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 diff --git a/src/stc/Makefile.in b/src/stc/Makefile.in index 425ea48714..45fb960944 100644 --- a/src/stc/Makefile.in +++ b/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=$(this_dir)/scintilla -VPATH=$(this_dir)@PATH_IFS@$(scintilla_dir)/src # ':' for autoconf +scintilla_dir = $(top_srcdir)/contrib/src/stc/scintilla +libsrc_dir = contrib/src/stc@PATH_IFS@$(scintilla_dir)/src 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