X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c521c4947e25963c1a3de4855b6b2fdb4e24843b..376ef4a1f497822dd6e0de572e2d59ea192a7380:/Makefile.in diff --git a/Makefile.in b/Makefile.in index 51be10983d..bce0b0c21c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,114 +1,79 @@ -# +##################################################################### # File: makefile.unx -# Author: Julian Smart, Robert Roebling, Vadim Zeitlin +# Purpose: Makefile for Unix wxWindows ports (both GUI and wxBase) +# Author: Julian Smart, Robert Roebling, Vadim Zeitlin, Ron Lee # Created: 1993 -# Updated: 1999 +# Version: $Id$ # Copyright:(c) 1993, AIAI, University of Edinburgh, # Copyright:(c) 1999, Vadim Zeitlin # Copyright:(c) 1999, Robert Roebling -# -# Makefile for libwx_gtk.a, libwx_motif.a and libwx_msw.a - -################################################################### +# Copyright:(c) 2001, Ron Lee +##################################################################### include ./src/make.env -############## override make.env for PIC ########################## +#################### the implicit rules ############################# + +# NB: we use the old style suffix rules (.c.o) and not the GNU make +# implicit rules (%.o: %.c) because they are more portable, in +# particular the BSD make understands the former but not the +# latter +.SUFFIXES: .o .c .cpp .cxx .rsrc .r -# Clears all default suffixes -.SUFFIXES: .o .cpp .c .cxx +.c.o: + $(CC) -c $(CFLAGS) $(PICFLAGS) -o $@ $< -.c.o : - $(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(PICFLAGS) -o $@ $< +.cpp.o: + $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $< -.cpp.o : - $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $< +.cxx.o: + $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $< -.cxx.o : - $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $< +.rsrc.r: + $(DEREZ) $^ Carbon.r -useDF > $@ -########################### Paths ################################# +############################# Paths ################################# srcdir = @srcdir@ +top_srcdir = @top_srcdir@ -VP1 = @top_srcdir@/src/common -VP2 = @top_srcdir@/src/@TOOLKIT_DIR@ -VP3 = @top_srcdir@/src/motif/xmcombo -VP4 = @top_srcdir@/src/generic -VP5 = @top_srcdir@/src/unix -VP6 = @top_srcdir@/src/html -VP7 = @top_srcdir@/src/png -VP8 = @top_srcdir@/src/jpeg -VP9 = @top_srcdir@/src/tiff -VP10 = @top_srcdir@/src/zlib -VP11 = @top_srcdir@/src/iodbc - -FTVP01 = @top_srcdir@/src/freetype/unix -FTVP02 = @top_srcdir@/src/freetype/autohint -FTVP03 = @top_srcdir@/src/freetype/base -FTVP04 = @top_srcdir@/src/freetype/cff -FTVP05 = @top_srcdir@/src/freetype/cid -FTVP06 = @top_srcdir@/src/freetype/macfond -FTVP07 = @top_srcdir@/src/freetype/otlayout -FTVP08 = @top_srcdir@/src/freetype/psnames -FTVP09 = @top_srcdir@/src/freetype/raster1 -FTVP10 = @top_srcdir@/src/freetype/sfnt -FTVP11 = @top_srcdir@/src/freetype/smooth -FTVP12 = @top_srcdir@/src/freetype/truetype -FTVP13 = @top_srcdir@/src/freetype/type1 -FTVP14 = @top_srcdir@/src/freetype/type1z -FTVP15 = @top_srcdir@/src/freetype/winfonts - -VP12 = $(FTVP01)@PATH_IFS@$(FTVP02)@PATH_IFS@$(FTVP03)@PATH_IFS@$(FTVP04)@PATH_IFS@$(FTVP05)@PATH_IFS@$(FTVP06)@PATH_IFS@$(FTVP07)@PATH_IFS@$(FTVP08)@PATH_IFS@ -VP13 = $(FTVP09)@PATH_IFS@$(FTVP10)@PATH_IFS@$(FTVP11)@PATH_IFS@$(FTVP12)@PATH_IFS@$(FTVP13)@PATH_IFS@$(FTVP14)@PATH_IFS@$(FTVP15)@PATH_IFS@ +VP1 = @TOOLKIT_VPATH@ +VP2 = @top_srcdir@/src/common +VP3 = @top_srcdir@/src/generic +VP4 = @top_srcdir@/src/unix +VP5 = @top_srcdir@/src/html +VP6 = @top_srcdir@/src/png +VP7 = @top_srcdir@/src/jpeg +VP8 = @top_srcdir@/src/tiff +VP9 = @top_srcdir@/src/zlib +VPA = @top_srcdir@/src/regex +VP10 = @top_srcdir@/src/iodbc +VP11 = @top_srcdir@/src/msw/ole # 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 = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11)@PATH_IFS@$(VP12)@PATH_IFS@$(VP13) # ':' for autoconf +VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VPA)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11) # ':' for autoconf -top_srcdir = @top_srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ libdir = @libdir@ -infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = localedir = $(datadir)/locale -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = . +build_libdir = $(top_builddir)/lib INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -# my autoconf doesn't set this -#INSTALL_SCRIPT = @INSTALL_SCRIPT@ -# maybe do an additional chmod if needed? INSTALL_SCRIPT = @INSTALL@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : + build_alias = @build_alias@ build_triplet = @build@ host_alias = @host_alias@ @@ -133,7 +98,10 @@ PNGDIR = $(WXDIR)/src/png JPEGDIR = $(WXDIR)/src/jpeg TIFFDIR = $(WXDIR)/src/tiff ZLIBDIR = $(WXDIR)/src/zlib +REGEXDIR = $(WXDIR)/src/regex GTKDIR = $(WXDIR)/src/gtk +X11DIR = $(WXDIR)/src/x11 +MGLDIR = $(WXDIR)/src/mgl MOTIFDIR = $(WXDIR)/src/motif MSWDIR = $(WXDIR)/src/msw PMDIR = $(WXDIR)/src/os2 @@ -152,18 +120,21 @@ INTLDIR = $(WXDIR)/locale ########################## Archive name ############################### # append a version suffix x.y.z to all file names -VER_SUFFIX=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER) -WXARCHIVE = @DISTDIR@-$(VER_SUFFIX).tar.gz -WXGLARCHIVE = @DISTDIR@-gl-$(VER_SUFFIX).tar.gz -WXSAMPLES = wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.gz -WXDEMOS = wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.gz +VER_MAJMIN=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER) +VER_SUFFIX=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)$(EXTRA_VER) +WXARCHIVE=@DISTDIR@-$(VER_SUFFIX).tar.gz +WXGLARCHIVE=@DISTDIR@-gl-$(VER_SUFFIX).tar.gz +WXSAMPLES=wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.gz +WXDEMOS=wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.gz +WXARCHIVE_ZIP=wxMSW-$(VER_SUFFIX).zip -WXARCHIVE_BZIP = @DISTDIR@-$(VER_SUFFIX).tar.bz2 -WXGLARCHIVE_BZIP = @DISTDIR@-gl-$(VER_SUFFIX).tar.bz2 -WXSAMPLES_BZIP = wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.bz2 -WXDEMOS_BZIP = wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.bz2 +WXARCHIVE_BZIP=@DISTDIR@-$(VER_SUFFIX).tar.bz2 +WXGLARCHIVE_BZIP=@DISTDIR@-gl-$(VER_SUFFIX).tar.bz2 +WXSAMPLES_BZIP=wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.bz2 +WXDEMOS_BZIP=wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.bz2 -DISTDIR = ./_dist_dir/@DISTDIR@ +DISTDIRNAME=@DISTDIR@-$(VER_SUFFIX) +DISTDIR=./_dist_dir/$(DISTDIRNAME) ############################## Files ################################## @@ -173,19 +144,24 @@ WX_LINGUAS = `cd $(top_srcdir)/locale && ls *.mo 2> /dev/null | sed -n 's/\.mo// # this line will include a file which defines ALL_SOURCES, ALL_OBJECTS, # ALL_DEPFILES and ALL_HEADERS variables with the complete list of .cpp, .o, # .d and .h/.inl files for the current toolkit -include $(top_srcdir)/@PORT_FILES@ +include @PORT_FILES@ -SOURCES = $(ALL_SOURCES) -HEADERS = $(ALL_HEADERS) +SOURCES = @ALL_SOURCES@ +HEADERS = @ALL_HEADERS@ # for the objects and depfiles, we might be bulding only part of them # depending on configure arguments, so select a subset of ALL OBJECTS = @ALL_OBJECTS@ -DEPFILES = @ALL_DEPFILES@ # the object files of sublibraries (we assume that they don't change [often], # so we don't generate these lists with tmake but embed them here) -ZLIBOBJS = \ +REGEXOBJS = \ + regcomp.o \ + regexec.o \ + regerror.o \ + regfree.o + +ZLIBOBJS = \ adler32.o \ compress.o \ crc32.o \ @@ -201,43 +177,26 @@ ZLIBOBJS = \ infutil.o \ inffast.o -PNGOBJS = \ +PNGOBJS = \ png.o \ + pngerror.o \ + pnggccrd.o \ + pngget.o \ + pngmem.o \ + pngpread.o \ pngread.o \ + pngrio.o \ pngrtran.o \ pngrutil.o \ - pngpread.o \ + pngset.o \ pngtrans.o \ + pngvcrd.o \ + pngwio.o \ pngwrite.o \ pngwtran.o \ - pngwutil.o \ - pngerror.o \ - pngmem.o \ - pngwio.o \ - pngrio.o \ - pngget.o \ - pngset.o - -FREETYPEOBJS = \ - ftsystem.o \ - autohint.o \ - ftbase.o \ - ftdebug.o \ - ftglyph.o \ - ftinit.o \ - ftmm.o \ - cff.o \ - type1cid.o \ - psnames.o \ - psmodule.o \ - raster1.o \ - sfnt.o \ - smooth.o \ - truetype.o \ - type1z.o \ - winfnt.o - -JPEGOBJS = \ + pngwutil.o + +JPEGOBJS = \ jcomapi.o \ jutils.o \ jerror.o \ @@ -285,7 +244,7 @@ JPEGOBJS = \ jquant2.o \ jdmerge.o -TIFFOBJS = \ +TIFFOBJS = \ tif_aux.o \ tif_close.o \ tif_codec.o \ @@ -336,74 +295,61 @@ IODBCOBJS = \ misc.o \ prepare.o \ result.o - + + ############################## Rules ################################## -BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@ -BURNT_LIBRARY_NAME_GL = @BURNT_LIBRARY_NAME_GL@ +SONAME_FLAGS = @SONAME_FLAGS@ +SONAME_FLAGS_GL = @SONAME_FLAGS_GL@ all: @WX_ALL@ -@WX_LIBRARY_NAME_STATIC@: $(OBJECTS) - @$(INSTALL) -d ./lib - $(AR) $(AROPTIONS) ./lib/$@ $(OBJECTS) - $(RANLIB) ./lib/$@ - -@WX_LIBRARY_NAME_STATIC_GL@: glcanvas.o - @$(INSTALL) -d ./lib - $(AR) $(AROPTIONS) ./lib/$@ glcanvas.o - $(RANLIB) ./lib/$@ - -@WX_LIBRARY_NAME_SHARED@: $(OBJECTS) - @$(INSTALL) -d ./lib - $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS) - -@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o - @$(INSTALL) -d ./lib - $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o $(EXTRALIBS) - -CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@ - @$(RM) ./lib/@WX_LIBRARY_LINK1@ - @$(RM) ./lib/@WX_LIBRARY_LINK2@ - @$(RM) ./lib/@WX_LIBRARY_LINK3@ - cd lib \ +$(build_libdir)/@WX_LIBRARY_NAME_STATIC@: $(OBJECTS) + @$(INSTALL) -d $(build_libdir) + @$(RM) $@ + $(AR) $(AROPTIONS) $@ $(OBJECTS) + $(RANLIB) $@ + +$(build_libdir)/@WX_LIBRARY_NAME_STATIC_GL@: glcanvas.o + @$(INSTALL) -d $(build_libdir) + @$(RM) $@ + $(AR) $(AROPTIONS) $@ glcanvas.o + $(RANLIB) $@ + +$(build_libdir)/@WX_LIBRARY_NAME_SHARED@: $(OBJECTS) + @$(INSTALL) -d $(build_libdir) + $(SHARED_LD) $@ $(SONAME_FLAGS) $(OBJECTS) $(EXTRALIBS) + +# NB: we used to have "-L$(build_libdir) @WXCONFIG_LIBS@" in the SHARED_LD line +# but this seems to result in problems with libwx_gtk being linked in twice +$(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o $(build_libdir)/@WX_LIBRARY_NAME_SHARED@ + @$(INSTALL) -d $(build_libdir) + $(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o $(EXTRALIBS) $(OPENGLLIBS) + +$(build_libdir)/@WX_RESOURCES_MACOSX_DATA@: $(MACRESOURCES) + @$(INSTALL) -d $(build_libdir) + $(RESCOMP) -d __UNIX__ -useDF $^ -o $@ + +$(build_libdir)/@WX_LIBRARY_LINK1@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED@ + @$(RM) $(build_libdir)/@WX_LIBRARY_LINK1@ + @$(RM) $(build_libdir)/@WX_LIBRARY_LINK2@ + cd $(build_libdir) \ && $(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_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@ - @$(RM) ./lib/@WX_LIBRARY_LINK1_GL@ - @$(RM) ./lib/@WX_LIBRARY_LINK2_GL@ - @$(RM) ./lib/@WX_LIBRARY_LINK3_GL@ - cd lib \ - && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \ - && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ \ - && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK3_GL@ - -CREATE_INSTALLED_LINKS: preinstall - $(RM) $(libdir)/@WX_LIBRARY_LINK1@ - $(RM) $(libdir)/@WX_LIBRARY_LINK2@ - $(RM) $(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@ + && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ -CREATE_INSTALLED_LINKS_GL: preinstall_gl - $(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@ - $(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@ - $(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@ - cd $(libdir) \ - && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \ - && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ \ - && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK3_GL@ +$(build_libdir)/@WX_LIBRARY_LINK1_GL@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@ + @$(RM) $(build_libdir)/@WX_LIBRARY_LINK1_GL@ + @$(RM) $(build_libdir)/@WX_LIBRARY_LINK2_GL@ + cd $(build_libdir) \ + && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \ + && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ -$(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h +$(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h -parser.o: parser.c lexer.c - $(CCLEX) -c $(CFLAGS) $(PICFLAGS) -o $@ parser.c +parser.o: parser.c lexer.c + $(CCLEX) -c $(CFLAGS) -I. $(PICFLAGS) -o $@ parser.c -parser.c: $(COMMDIR)/parser.y lexer.c +parser.c: $(COMMDIR)/parser.y lexer.c $(YACC) $(COMMDIR)/parser.y @sed -e "s;$(COMMDIR)/y.tab.c;parser.y;g" < y.tab.c | \ sed -e "s/BUFSIZ/5000/g" | \ @@ -413,7 +359,7 @@ parser.c: $(COMMDIR)/parser.y lexer.c sed -e "s/unput/PROIO_unput/g" > parser.c @$(RM) y.tab.c -lexer.c: $(COMMDIR)/lexer.l +lexer.c: $(COMMDIR)/lexer.l $(LEX) $(COMMDIR)/lexer.l @sed -e "s;$(COMMDIR)/@LEX_STEM@.c;lexer.l;g" < @LEX_STEM@.c | \ sed -e "s/yy/PROIO_yy/g" | \ @@ -421,41 +367,71 @@ lexer.c: $(COMMDIR)/lexer.l sed -e "s/unput/PROIO_unput/g" > lexer.c @$(RM) @LEX_STEM@.c --include $(DEPFILES) +@IF_GNU_MAKE@-include $(OBJECTS:.o=.d) + +CREATE_INSTALLED_LINKS: preinstall + $(RM) $(libdir)/@WX_LIBRARY_LINK1@ + $(RM) $(libdir)/@WX_LIBRARY_LINK2@ + cd $(libdir) \ + && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \ + && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ + +CREATE_INSTALLED_LINKS_GL: preinstall_gl + $(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@ + $(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@ + cd $(libdir) \ + && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \ + && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ afminstall: preinstall - $(INSTALL) -d $(datadir) + @if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi $(INSTALL) -d $(datadir)/wx - $(INSTALL) -d $(datadir)/wx/afm - $(INSTALL) -d $(datadir)/wx/gs_afm - $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm - $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm + $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN) + $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/afm + $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/gs_afm + $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/afm + $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/gs_afm + +m4datainstall: preinstall + $(INSTALL) -d $(datadir)/aclocal + $(INSTALL_DATA) $(top_srcdir)/wxwin.m4 $(datadir)/aclocal # 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@TOOLKIT_NAME@-config +preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config @echo " " @echo " Installing wxWindows..." @echo " " - $(INSTALL) -d $(prefix) - $(INSTALL) -d $(bindir) - $(INSTALL) -d $(libdir) + @if test ! -d $(prefix); then $(INSTALL) -d $(prefix); fi + @if test ! -d $(bindir); then $(INSTALL) -d $(bindir); fi + @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi - $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLKIT_NAME@-config $(bindir)/wx@TOOLKIT_NAME@-config - cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLKIT_NAME@-config wx-config - $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@ + $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config + cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config + @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@ + @if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \ + $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi $(INSTALL) -d $(libdir)/wx $(INSTALL) -d $(libdir)/wx/include - $(INSTALL) -d $(libdir)/wx/include/wx - $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_NAME@ - $(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h + $(INSTALL) -d $(libdir)/wx/include/univ + $(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@ + $(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx + $(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \ + $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h $(INSTALL) -d $(includedir)/wx + @# FIXME: This will erroneously install a wx/base dir for wxBase.. @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi + @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/univ; fi + @if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL) -d $(includedir)/wx/msw/ole; fi + + @# always install msw headers for wxBase, it's much simpler + @if test "$(USE_GUI)" = 0; then $(INSTALL) -d $(includedir)/wx/msw; fi + $(INSTALL) -d $(includedir)/wx/protocol $(INSTALL) -d $(includedir)/wx/unix @list='$(HEADERS)'; for p in $$list; do \ @@ -463,26 +439,34 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_N echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \ done - $(INSTALL) -d $(localedir) + @if test ! -d $(localedir); then $(INSTALL) -d $(localedir); fi @for p in $(WX_LINGUAS); do \ - $(INSTALL) -d $(localedir)/$$p; \ - $(INSTALL) -d $(localedir)/$$p/LC_MESSAGES; \ + if test ! -d $(localedir)/$$p; then $(INSTALL) -d $(localedir)/$$p; fi;\ + if test ! -d $(localedir)/$$p/LC_MESSAGES; then $(INSTALL) -d $(localedir)/$$p/LC_MESSAGES; fi;\ $(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo; \ echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \ done -preinstall_gl: $(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@ +preinstall_res: $(build_libdir)/@WX_RESOURCES_MACOSX_ASCII@ $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@ + @echo " " + @echo " Installing wxWindows Mac resource ..." + @echo " " + @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi + $(INSTALL_PROGRAM) $(build_libdir)/@WX_RESOURCES_MACOSX_ASCII@ $(libdir)/@WX_RESOURCES_MACOSX_ASCII@ + $(INSTALL_PROGRAM) $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@ $(libdir)/@WX_RESOURCES_MACOSX_DATA@ + +preinstall_gl: $(build_libdir)/@WX_TARGET_LIBRARY_GL@ @echo " " @echo " Installing wxWindows OpenGl add-on..." @echo " " - $(INSTALL) -d $(libdir) - $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@ + @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi + @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@ -install: @AFMINSTALL@ @WX_ALL_INSTALLED@ +install: @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall @echo " " @echo " The installation of wxWindows is finished. On certain" @echo " platforms (e.g. Linux) you'll now have to run ldconfig" - @echo " if you installed a shared library and also modify" + @echo " if you installed a shared library and also modify the" @echo " LD_LIBRARY_PATH (or equivalent) environment variable." @echo " " @echo " wxWindows comes with no guarantees and doesn't claim" @@ -499,21 +483,20 @@ uninstall: @$(RM) $(libdir)/@WX_TARGET_LIBRARY@ @$(RM) $(libdir)/@WX_LIBRARY_LINK1@ @$(RM) $(libdir)/@WX_LIBRARY_LINK2@ - @$(RM) $(libdir)/@WX_LIBRARY_LINK3@ @echo " Removing GL library..." @$(RM) $(libdir)/@WX_TARGET_LIBRARY_GL@ @$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@ @$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@ - @$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@ @echo " Removing helper files..." - @$(RM) $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h + @$(RM) $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h @$(RM) $(bindir)/wx-config - @$(RM) $(bindir)/wx@TOOLKIT_NAME@-config - @$(RM) $(datadir)/wx/afm/* - @$(RM) $(datadir)/wx/gs_afm/* + @$(RM) $(bindir)/wx@TOOLCHAIN_NAME@-config + @$(RM) $(datadir)/wx/$(VER_MAJMIN)/afm/* + @$(RM) $(datadir)/wx/$(VER_MAJMIN)/gs_afm/* # FIXME: wxBase doesnt install these next 3 dirs. - @-rmdir $(datadir)/wx/gs_afm - @-rmdir $(datadir)/wx/afm + @-rmdir $(datadir)/wx/$(VER_MAJMIN)/gs_afm + @-rmdir $(datadir)/wx/$(VER_MAJMIN)/afm + @-rmdir $(datadir)/wx/$(VER_MAJMIN) @-rmdir $(datadir)/wx @echo " Removing headers..." @list='$(HEADERS)'; for p in $$list; do \ @@ -527,8 +510,8 @@ uninstall: done @echo " Removing directories..." @-rmdir $(localedir) - @if test -d $(libdir)/wx/include/wx/@TOOLKIT_NAME@; then rmdir $(libdir)/wx/include/wx/@TOOLKIT_NAME@; fi - @if test -d $(libdir)/wx/include/wx; then rmdir $(libdir)/wx/include/wx; fi + @if test -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx; then rmdir $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx; fi + @if test -d $(libdir)/wx/include/@TOOLCHAIN_NAME@; then rmdir $(libdir)/wx/include/@TOOLCHAIN_NAME@; fi @if test -d $(libdir)/wx/include; then rmdir $(libdir)/wx/include; fi @if test -d $(libdir)/wx; then rmdir $(libdir)/wx; fi @if test -d $(includedir)/wx/gtk; then rmdir $(includedir)/wx/gtk; fi @@ -536,6 +519,7 @@ uninstall: @if test -d $(includedir)/wx/msw; then rmdir $(includedir)/wx/msw; fi @if test -d $(includedir)/wx/html; then rmdir $(includedir)/wx/html; fi @if test -d $(includedir)/wx/unix; then rmdir $(includedir)/wx/unix; fi + @if test -d $(includedir)/wx/univ; then rmdir $(includedir)/wx/univ; fi @if test -d $(includedir)/wx/generic; then rmdir $(includedir)/wx/generic; fi @if test -d $(includedir)/wx/protocol; then rmdir $(includedir)/wx/protocol; fi @if test -d $(includedir)/wx; then rmdir $(includedir)/wx; fi @@ -545,8 +529,8 @@ uninstall: ALL_DIST: distclean mkdir _dist_dir mkdir $(DISTDIR) - cp $(WXDIR)/configure.in $(DISTDIR) - cp $(WXDIR)/configure $(DISTDIR) + cp $(WXDIR)/wxwin.m4 $(DISTDIR) + cp $(WXDIR)/aclocal.m4 $(DISTDIR) cp $(WXDIR)/config.sub $(DISTDIR) cp $(WXDIR)/config.guess $(DISTDIR) cp $(WXDIR)/install-sh $(DISTDIR) @@ -556,27 +540,46 @@ ALL_DIST: distclean cp $(WXDIR)/setup.h_vms $(DISTDIR) cp $(WXDIR)/descrip.mms $(DISTDIR) cp $(WXDIR)/Makefile.in $(DISTDIR) + cp $(WXDIR)/wxBase.spec $(DISTDIR) cp $(DOCDIR)/lgpl.txt $(DISTDIR)/COPYING.LIB cp $(DOCDIR)/licence.txt $(DISTDIR)/LICENCE.txt - cp $(DOCDIR)/symbols.txt $(DISTDIR)/SYMBOLS.txt + cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt mkdir $(DISTDIR)/lib cp $(WXDIR)/lib/vms.opt $(DISTDIR)/lib cp $(WXDIR)/lib/vms_gtk.opt $(DISTDIR)/lib mkdir $(DISTDIR)/src + # temp hack for common/execcmn.cpp: it's not supported by tmake + # yet (it's a header-like file but in src/common directory and it + # shouldn't be distributed...) + mkdir $(DISTDIR)/src/common + cp $(SRCDIR)/common/execcmn.cpp $(DISTDIR)/src/common mkdir $(DISTDIR)/src/zlib cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib + mkdir $(DISTDIR)/src/regex + cp $(REGEXDIR)/*.h $(DISTDIR)/src/regex + cp $(REGEXDIR)/*.ih $(DISTDIR)/src/regex + cp $(REGEXDIR)/*.c $(DISTDIR)/src/regex + cp $(REGEXDIR)/Makefile $(DISTDIR)/src/regex + cp $(REGEXDIR)/makefile.* $(DISTDIR)/src/regex + cp $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex + cp $(REGEXDIR)/README $(DISTDIR)/src/regex + cp $(REGEXDIR)/WHATSNEW $(DISTDIR)/src/regex + cp $(REGEXDIR)/mkh $(DISTDIR)/src/regex + cp $(REGEXDIR)/tests $(DISTDIR)/src/regex # this target is the common part of distribution script for all GUI toolkits, # but is not used when building wxBase distribution ALL_GUI_DIST: ALL_DIST - cp $(WXDIR)/wx$(TOOLKIT).spec $(DISTDIR) - cp $(WXDIR)/wxBase.spec $(DISTDIR) + cp $(WXDIR)/configure.in $(DISTDIR) + cp $(WXDIR)/configure $(DISTDIR) + cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt - cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES.txt - cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README.txt + if test -f $(DOCDIR)/$(TOOLKITDIR)/changes.txt ; then \ + cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES-$(TOOLKIT).txt ; fi + cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README-$(TOOLKIT).txt cp $(DOCDIR)/$(TOOLKITDIR)/todo.txt $(DISTDIR)/TODO.txt mkdir $(DISTDIR)/include mkdir $(DISTDIR)/include/wx @@ -589,21 +592,23 @@ ALL_GUI_DIST: ALL_DIST cp $(INCDIR)/wx/*.inl $(DISTDIR)/include/wx cp $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx cp $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic - cp $(INCDIR)/wx/generic/*.xpm $(DISTDIR)/include/wx/generic cp $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html cp $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix cp $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol - mkdir $(DISTDIR)/src/common + mkdir $(DISTDIR)/art + mkdir $(DISTDIR)/art/gtk + mkdir $(DISTDIR)/art/motif + cp $(WXDIR)/art/*.xpm $(DISTDIR)/art + cp $(WXDIR)/art/gtk/*.xpm $(DISTDIR)/art/gtk + cp $(WXDIR)/art/motif/*.xpm $(DISTDIR)/art/motif mkdir $(DISTDIR)/src/generic mkdir $(DISTDIR)/src/html - mkdir $(DISTDIR)/src/html/bitmaps mkdir $(DISTDIR)/src/$(TOOLKITDIR) mkdir $(DISTDIR)/src/png mkdir $(DISTDIR)/src/jpeg mkdir $(DISTDIR)/src/tiff mkdir $(DISTDIR)/src/iodbc mkdir $(DISTDIR)/src/unix - cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@ cp $(SRCDIR)/*.in $(DISTDIR)/src cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common cp $(COMMDIR)/*.c $(DISTDIR)/src/common @@ -618,7 +623,6 @@ ALL_GUI_DIST: ALL_DIST cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic cp $(GENDIR)/*.mms $(DISTDIR)/src/generic cp $(HTMLDIR)/*.cpp $(DISTDIR)/src/html - cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps cp $(PNGDIR)/*.h $(DISTDIR)/src/png cp $(PNGDIR)/*.c $(DISTDIR)/src/png cp $(PNGDIR)/README $(DISTDIR)/src/png @@ -637,19 +641,26 @@ ALL_GUI_DIST: ALL_DIST cp $(ODBCDIR)/Changes.log $(DISTDIR)/src/iodbc BASE_DIST: ALL_DIST + # make --disable-gui the default + sed 's/DEFAULT_wxUSE_GUI=yes/DEFAULT_wxUSE_GUI=no/' \ + $(WXDIR)/configure.in > $(DISTDIR)/configure.in + sed 's/DEFAULT_wxUSE_GUI=yes/DEFAULT_wxUSE_GUI=no/' \ + $(WXDIR)/configure > $(DISTDIR)/configure + chmod +x $(DISTDIR)/configure mkdir $(DISTDIR)/include mkdir $(DISTDIR)/include/wx mkdir $(DISTDIR)/include/wx/protocol mkdir $(DISTDIR)/include/wx/unix - mkdir $(DISTDIR)/src/common + mkdir $(DISTDIR)/include/wx/msw mkdir $(DISTDIR)/src/unix - cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@ - cp $(WXDIR)/@RPM_FILES@ $(DISTDIR)/@RPM_FILES@ - cp $(WXDIR)/@RPM_SPEC@ $(DISTDIR)/@RPM_SPEC@ - cp $(WXDIR)/wxBase*.ds[pw] $(DISTDIR) + mkdir $(DISTDIR)/src/msw + cp @PORT_FILES@ $(DISTDIR) + cp $(WXDIR)/src/wxBase*.dsp $(DISTDIR) + cp $(WXDIR)/src/wxBase*.dsw $(DISTDIR) cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt - cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt + cp $(DOCDIR)/base/readme.txt $(DISTDIR)/README.txt cp $(SRCDIR)/*.in $(DISTDIR)/src + cp $(SRCDIR)/files.lst $(DISTDIR)/src cp $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common cp $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common cp $(WXDIR)/src/common/unzip.h $(DISTDIR)/src/common @@ -669,11 +680,13 @@ BASE_DIST: ALL_DIST cp $(SAMPDIR)/console/Makefile.in $(DISTDIR)/samples/console cp $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console cp $(SAMPDIR)/console/console.cpp $(DISTDIR)/samples/console + cp $(SAMPDIR)/console/console.dsp $(DISTDIR)/samples/console cp $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console GTK_DIST: ALL_GUI_DIST + cp $(WXDIR)/wxGTK.spec $(DISTDIR) cp $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk - cp $(INCDIR)/wx/gtk/*.xpm $(DISTDIR)/include/wx/gtk + cp $(GTKDIR)/files.lst $(DISTDIR)/src/gtk cp $(GTKDIR)/*.cpp $(DISTDIR)/src/gtk cp $(GTKDIR)/*.c $(DISTDIR)/src/gtk cp $(GTKDIR)/*.xbm $(DISTDIR)/src/gtk @@ -681,10 +694,22 @@ GTK_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/contrib cp -R $(WXDIR)/contrib $(DISTDIR) +X11_DIST: ALL_GUI_DIST UNIV_DIST + cp $(WXDIR)/wxX11.spec $(DISTDIR) + cp $(INCDIR)/wx/x11/*.h $(DISTDIR)/include/wx/x11 + cp $(X11DIR)/files.lst $(DISTDIR)/src/x11 + cp $(X11DIR)/*.cpp $(DISTDIR)/src/x11 + cp $(X11DIR)/*.c $(DISTDIR)/src/x11 + cp $(X11DIR)/*.xbm $(DISTDIR)/src/x11 + mkdir $(DISTDIR)/contrib + cp -R $(WXDIR)/contrib $(DISTDIR) + MOTIF_DIST: ALL_GUI_DIST - cp $(WXDIR)/wxMOTIF.spec $(DISTDIR) + cp $(WXDIR)/wxMotif.spec $(DISTDIR) cp $(INCDIR)/wx/motif/*.h $(DISTDIR)/include/wx/motif + cp $(MOTIFDIR)/files.lst $(DISTDIR)/src/motif cp $(MOTIFDIR)/*.cpp $(DISTDIR)/src/motif + cp $(MOTIFDIR)/*.c $(DISTDIR)/src/motif cp $(MOTIFDIR)/*.xbm $(DISTDIR)/src/motif mkdir $(DISTDIR)/src/motif/xmcombo cp $(MOTIFDIR)/xmcombo/*.c $(DISTDIR)/src/motif/xmcombo @@ -692,20 +717,75 @@ MOTIF_DIST: ALL_GUI_DIST cp $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo MACX_DIST: ALL_GUI_DIST - echo "Apple Mac OS X specific distribution not complete" + cp $(INCDIR)/*.* $(DISTDIR)/include + cp $(INCDIR)/wx/mac/*.h $(DISTDIR)/include/wx/mac + cp $(MACDIR)/files.lst $(DISTDIR)/src/mac + cp $(MACDIR)/*.cpp $(DISTDIR)/src/mac + cp $(MACDIR)/*.c $(DISTDIR)/src/mac + cp $(MACDIR)/*.h $(DISTDIR)/src/mac + cp $(MACDIR)/*.r $(DISTDIR)/src/mac + mkdir $(DISTDIR)/src/mac/morefile + cp $(MACDIR)/morefile/*.h $(DISTDIR)/src/mac/morefile + cp $(MACDIR)/morefile/*.c $(DISTDIR)/src/mac/morefile + mkdir $(DISTDIR)/src/mac/macsock + cp $(MACDIR)/macsock/*.lib $(DISTDIR)/src/mac/macsock MSW_DIST: ALL_GUI_DIST cp $(WXDIR)/wxWINE.spec $(DISTDIR) + mkdir $(DISTDIR)/include/wx/msw/ctl3d + mkdir $(DISTDIR)/include/wx/msw/gnuwin32 + mkdir $(DISTDIR)/include/wx/msw/gnuwin32/gl + mkdir $(DISTDIR)/include/wx/msw/ole cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/*.cur $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/*.ico $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/*.bmp $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw + cp $(INCDIR)/wx/msw/ctl3d/*.h $(DISTDIR)/include/wx/msw/ctl3d + cp $(INCDIR)/wx/msw/gnuwin32/*.h $(DISTDIR)/include/wx/msw/gnuwin32 + cp $(INCDIR)/wx/msw/gnuwin32/gl/*.h $(DISTDIR)/include/wx/msw/gnuwin32/gl + cp $(INCDIR)/wx/msw/gnuwin32/gl/*.def $(DISTDIR)/include/wx/msw/gnuwin32/gl + cp $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole + mkdir $(DISTDIR)/src/msw/ole + cp $(MSWDIR)/files.lst $(DISTDIR)/src/msw cp $(MSWDIR)/*.cpp $(DISTDIR)/src/msw cp $(MSWDIR)/*.c $(DISTDIR)/src/msw cp $(MSWDIR)/*.def $(DISTDIR)/src/msw + cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole + +MSW_ZIP_TEXT_DIST: ALL_GUI_DIST + cp $(WXDIR)/wxWINE.spec $(DISTDIR) + mkdir $(DISTDIR)/include/wx/msw + mkdir $(DISTDIR)/include/wx/msw/ctl3d + mkdir $(DISTDIR)/include/wx/msw/gnuwin32 + mkdir $(DISTDIR)/include/wx/msw/gnuwin32/gl + mkdir $(DISTDIR)/include/wx/msw/ole + cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw + cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw + cp $(INCDIR)/wx/msw/ctl3d/*.h $(DISTDIR)/include/wx/msw/ctl3d + cp $(INCDIR)/wx/msw/gnuwin32/*.h $(DISTDIR)/include/wx/msw/gnuwin32 + cp $(INCDIR)/wx/msw/gnuwin32/gl/*.h $(DISTDIR)/include/wx/msw/gnuwin32/gl + cp $(INCDIR)/wx/msw/gnuwin32/gl/*.def $(DISTDIR)/include/wx/msw/gnuwin32/gl + cp $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole + mkdir $(DISTDIR)/src/msw mkdir $(DISTDIR)/src/msw/ole + cp $(MSWDIR)/files.lst $(DISTDIR)/src/msw + cp $(MSWDIR)/*.cpp $(DISTDIR)/src/msw + cp $(MSWDIR)/*.c $(DISTDIR)/src/msw + cp $(MSWDIR)/*.def $(DISTDIR)/src/msw cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole + cp $(SRCDIR)/*.??? $(DISTDIR)/src + cp $(SRCDIR)/*.?? $(DISTDIR)/src + cp $(MSWDIR)/?ake*.* $(DISTDIR)/src/msw + +UNIV_DIST: ALL_GUI_DIST + mkdir $(DISTDIR)/include/wx/univ + mkdir $(DISTDIR)/src/univ + mkdir $(DISTDIR)/src/univ/themes + cp $(INCDIR)/wx/univ/*.h $(DISTDIR)/include/wx/univ + cp $(SRCDIR)/univ/files.lst $(DISTDIR)/src/univ + cp $(SRCDIR)/univ/*.cpp $(DISTDIR)/src/univ + cp $(SRCDIR)/univ/themes/*.cpp $(DISTDIR)/src/univ/themes DEMOS_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/demos @@ -713,8 +793,6 @@ DEMOS_DIST: ALL_GUI_DIST cp $(DEMODIR)/configure $(DISTDIR)/demos cp $(DEMODIR)/configure.in $(DISTDIR)/demos - cp -R $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse - mkdir $(DISTDIR)/demos/bombs cp $(DEMODIR)/bombs/Makefile.in $(DISTDIR)/demos/bombs cp $(DEMODIR)/bombs/makefile.unx $(DISTDIR)/demos/bombs @@ -723,6 +801,8 @@ DEMOS_DIST: ALL_GUI_DIST cp $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs cp $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs + cp -R $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse + mkdir $(DISTDIR)/demos/forty cp $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty cp $(DEMODIR)/forty/makefile.unx $(DISTDIR)/demos/forty @@ -857,6 +937,16 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/dynamic/*.cpp $(DISTDIR)/samples/dynamic cp $(SAMPDIR)/dynamic/*.xpm $(DISTDIR)/samples/dynamic + mkdir $(DISTDIR)/samples/erase + cp $(SAMPDIR)/erase/Makefile.in $(DISTDIR)/samples/erase + cp $(SAMPDIR)/erase/makefile.unx $(DISTDIR)/samples/erase + cp $(SAMPDIR)/erase/*.cpp $(DISTDIR)/samples/erase + + mkdir $(DISTDIR)/samples/event + cp $(SAMPDIR)/event/Makefile.in $(DISTDIR)/samples/event + cp $(SAMPDIR)/event/makefile.unx $(DISTDIR)/samples/event + cp $(SAMPDIR)/event/*.cpp $(DISTDIR)/samples/event + mkdir $(DISTDIR)/samples/exec cp $(SAMPDIR)/exec/Makefile.in $(DISTDIR)/samples/exec cp $(SAMPDIR)/exec/makefile.unx $(DISTDIR)/samples/exec @@ -931,10 +1021,11 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/image/horse.* $(DISTDIR)/samples/image cp $(SAMPDIR)/image/smile.xbm $(DISTDIR)/samples/image cp $(SAMPDIR)/image/smile.xpm $(DISTDIR)/samples/image - + mkdir $(DISTDIR)/samples/internat mkdir $(DISTDIR)/samples/internat/de mkdir $(DISTDIR)/samples/internat/fr + mkdir $(DISTDIR)/samples/internat/ru cp $(SAMPDIR)/internat/Makefile.in $(DISTDIR)/samples/internat cp $(SAMPDIR)/internat/makefile.unx $(DISTDIR)/samples/internat cp $(SAMPDIR)/internat/*.cpp $(DISTDIR)/samples/internat @@ -943,10 +1034,10 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/internat/*.po $(DISTDIR)/samples/internat cp $(SAMPDIR)/internat/fr/*.mo $(DISTDIR)/samples/internat/fr cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de - cp $(SAMPDIR)/internat/ru/*.mo $(DISTDIR)/samples/internat/de + cp $(SAMPDIR)/internat/ru/*.mo $(DISTDIR)/samples/internat/ru cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr cp $(SAMPDIR)/internat/de/*.po $(DISTDIR)/samples/internat/de - cp $(SAMPDIR)/internat/ru/*.po $(DISTDIR)/samples/internat/de + cp $(SAMPDIR)/internat/ru/*.po $(DISTDIR)/samples/internat/ru mkdir $(DISTDIR)/samples/ipc cp $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc @@ -1013,6 +1104,13 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal cp $(SAMPDIR)/minimal/*.mms $(DISTDIR)/samples/minimal + mkdir $(DISTDIR)/samples/mobile + cp $(SAMPDIR)/mobile/Makefile.in $(DISTDIR)/samples/mobile + mkdir $(DISTDIR)/samples/mobile/wxedit + cp $(SAMPDIR)/mobile/wxedit/Makefile.in $(DISTDIR)/samples/mobile/wxedit + cp $(SAMPDIR)/mobile/wxedit/*.cpp $(DISTDIR)/samples/mobile/wxedit + cp $(SAMPDIR)/mobile/wxedit/*.h $(DISTDIR)/samples/mobile/wxedit + mkdir $(DISTDIR)/samples/dialup cp $(SAMPDIR)/dialup/Makefile.in $(DISTDIR)/samples/dialup cp $(SAMPDIR)/dialup/makefile.unx $(DISTDIR)/samples/dialup @@ -1078,7 +1176,7 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/rotate/makefile.unx $(DISTDIR)/samples/rotate cp $(SAMPDIR)/rotate/*.cpp $(DISTDIR)/samples/rotate cp $(SAMPDIR)/rotate/*.bmp $(DISTDIR)/samples/rotate - + mkdir $(DISTDIR)/samples/richedit cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit cp $(SAMPDIR)/richedit/makefile.unx $(DISTDIR)/samples/richedit @@ -1087,35 +1185,35 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/richedit/*.xpm $(DISTDIR)/samples/richedit cp $(SAMPDIR)/richedit/README $(DISTDIR)/samples/richedit cp $(SAMPDIR)/richedit/TODO $(DISTDIR)/samples/richedit - + mkdir $(DISTDIR)/samples/proplist cp $(SAMPDIR)/proplist/Makefile.in $(DISTDIR)/samples/proplist cp $(SAMPDIR)/proplist/makefile.unx $(DISTDIR)/samples/proplist cp $(SAMPDIR)/proplist/*.cpp $(DISTDIR)/samples/proplist cp $(SAMPDIR)/proplist/*.h $(DISTDIR)/samples/proplist - + mkdir $(DISTDIR)/samples/propsize cp $(SAMPDIR)/propsize/Makefile.in $(DISTDIR)/samples/propsize cp $(SAMPDIR)/propsize/makefile.unx $(DISTDIR)/samples/propsize cp $(SAMPDIR)/propsize/*.cpp $(DISTDIR)/samples/propsize cp $(SAMPDIR)/propsize/*.xpm $(DISTDIR)/samples/propsize - + mkdir $(DISTDIR)/samples/sashtest cp $(SAMPDIR)/sashtest/Makefile.in $(DISTDIR)/samples/sashtest cp $(SAMPDIR)/sashtest/makefile.unx $(DISTDIR)/samples/sashtest cp $(SAMPDIR)/sashtest/*.cpp $(DISTDIR)/samples/sashtest cp $(SAMPDIR)/sashtest/*.h $(DISTDIR)/samples/sashtest - + mkdir $(DISTDIR)/samples/scroll cp $(SAMPDIR)/scroll/Makefile.in $(DISTDIR)/samples/scroll cp $(SAMPDIR)/scroll/makefile.unx $(DISTDIR)/samples/scroll cp $(SAMPDIR)/scroll/*.cpp $(DISTDIR)/samples/scroll - + mkdir $(DISTDIR)/samples/scrollsub cp $(SAMPDIR)/scrollsub/Makefile.in $(DISTDIR)/samples/scrollsub cp $(SAMPDIR)/scrollsub/makefile.unx $(DISTDIR)/samples/scrollsub cp $(SAMPDIR)/scrollsub/*.cpp $(DISTDIR)/samples/scrollsub - + mkdir $(DISTDIR)/samples/sockets cp $(SAMPDIR)/sockets/Makefile.in $(DISTDIR)/samples/sockets cp $(SAMPDIR)/sockets/makefile.unx $(DISTDIR)/samples/sockets @@ -1126,7 +1224,7 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter cp $(SAMPDIR)/splitter/makefile.unx $(DISTDIR)/samples/splitter cp $(SAMPDIR)/splitter/*.cpp $(DISTDIR)/samples/splitter - + mkdir $(DISTDIR)/samples/statbar cp $(SAMPDIR)/statbar/Makefile.in $(DISTDIR)/samples/statbar cp $(SAMPDIR)/statbar/makefile.unx $(DISTDIR)/samples/statbar @@ -1138,12 +1236,12 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/text/makefile.unx $(DISTDIR)/samples/text cp $(SAMPDIR)/text/*.cpp $(DISTDIR)/samples/text cp $(SAMPDIR)/text/*.xpm $(DISTDIR)/samples/text - + mkdir $(DISTDIR)/samples/thread cp $(SAMPDIR)/thread/Makefile.in $(DISTDIR)/samples/thread cp $(SAMPDIR)/thread/makefile.unx $(DISTDIR)/samples/thread cp $(SAMPDIR)/thread/*.cpp $(DISTDIR)/samples/thread - + mkdir $(DISTDIR)/samples/toolbar cp $(SAMPDIR)/toolbar/Makefile.in $(DISTDIR)/samples/toolbar cp $(SAMPDIR)/toolbar/makefile.unx $(DISTDIR)/samples/toolbar @@ -1151,42 +1249,48 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar mkdir $(DISTDIR)/samples/toolbar/bitmaps cp $(SAMPDIR)/toolbar/bitmaps/*.xpm $(DISTDIR)/samples/toolbar/bitmaps - + mkdir $(DISTDIR)/samples/treectrl cp $(SAMPDIR)/treectrl/Makefile.in $(DISTDIR)/samples/treectrl cp $(SAMPDIR)/treectrl/makefile.unx $(DISTDIR)/samples/treectrl cp $(SAMPDIR)/treectrl/*.cpp $(DISTDIR)/samples/treectrl cp $(SAMPDIR)/treectrl/*.h $(DISTDIR)/samples/treectrl cp $(SAMPDIR)/treectrl/*.xpm $(DISTDIR)/samples/treectrl - mkdir $(DISTDIR)/samples/treectrl/bitmaps - cp $(SAMPDIR)/treectrl/bitmaps/*.bmp $(DISTDIR)/samples/treectrl/bitmaps - + mkdir $(DISTDIR)/samples/treelay cp $(SAMPDIR)/treelay/Makefile.in $(DISTDIR)/samples/treelay cp $(SAMPDIR)/treelay/makefile.unx $(DISTDIR)/samples/treelay cp $(SAMPDIR)/treelay/*.cpp $(DISTDIR)/samples/treelay cp $(SAMPDIR)/treelay/*.h $(DISTDIR)/samples/treelay - + mkdir $(DISTDIR)/samples/typetest cp $(SAMPDIR)/typetest/Makefile.in $(DISTDIR)/samples/typetest cp $(SAMPDIR)/typetest/makefile.unx $(DISTDIR)/samples/typetest cp $(SAMPDIR)/typetest/*.cpp $(DISTDIR)/samples/typetest cp $(SAMPDIR)/typetest/*.h $(DISTDIR)/samples/typetest cp $(SAMPDIR)/typetest/*.xpm $(DISTDIR)/samples/typetest - + mkdir $(DISTDIR)/samples/validate cp $(SAMPDIR)/validate/Makefile.in $(DISTDIR)/samples/validate cp $(SAMPDIR)/validate/makefile.unx $(DISTDIR)/samples/validate cp $(SAMPDIR)/validate/*.cpp $(DISTDIR)/samples/validate cp $(SAMPDIR)/validate/*.h $(DISTDIR)/samples/validate cp $(SAMPDIR)/validate/*.xpm $(DISTDIR)/samples/validate - + mkdir $(DISTDIR)/samples/wizard cp $(SAMPDIR)/wizard/Makefile.in $(DISTDIR)/samples/wizard cp $(SAMPDIR)/wizard/makefile.unx $(DISTDIR)/samples/wizard cp $(SAMPDIR)/wizard/*.cpp $(DISTDIR)/samples/wizard cp $(SAMPDIR)/wizard/*.xpm $(DISTDIR)/samples/wizard - + + mkdir $(DISTDIR)/samples/widgets + mkdir $(DISTDIR)/samples/widgets/icons + cp $(SAMPDIR)/widgets/Makefile.in $(DISTDIR)/samples/widgets + cp $(SAMPDIR)/widgets/*.cpp $(DISTDIR)/samples/widgets + cp $(SAMPDIR)/widgets/*.h $(DISTDIR)/samples/widgets + cp $(SAMPDIR)/widgets/*.rc $(DISTDIR)/samples/widgets + cp $(SAMPDIR)/widgets/icons/*.xpm $(DISTDIR)/samples/widgets/icons + UTILS_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/utils cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils @@ -1235,6 +1339,7 @@ MANUAL_DIST: mkdir $(DISTDIR)/docs/latex mkdir $(DISTDIR)/docs/latex/wx cp $(DOCDIR)/latex/wx/*.tex $(DISTDIR)/docs/latex/wx + cp $(DOCDIR)/latex/wx/*.inc $(DISTDIR)/docs/latex/wx cp $(DOCDIR)/latex/wx/*.gif $(DISTDIR)/docs/latex/wx cp $(DOCDIR)/latex/wx/*.ini $(DISTDIR)/docs/latex/wx cp $(DOCDIR)/latex/wx/*.bib $(DISTDIR)/docs/latex/wx @@ -1246,61 +1351,112 @@ MANUAL_DIST: PYTHON_DIST: mkdir $(DISTDIR)/wxPython mkdir $(DISTDIR)/wxPython/contrib + mkdir $(DISTDIR)/wxPython/contrib/dllwidget + mkdir $(DISTDIR)/wxPython/contrib/gizmos mkdir $(DISTDIR)/wxPython/contrib/glcanvas mkdir $(DISTDIR)/wxPython/contrib/glcanvas/gtk mkdir $(DISTDIR)/wxPython/contrib/ogl mkdir $(DISTDIR)/wxPython/contrib/stc + mkdir $(DISTDIR)/wxPython/contrib/stc/gtk + mkdir $(DISTDIR)/wxPython/contrib/xrc mkdir $(DISTDIR)/wxPython/demo mkdir $(DISTDIR)/wxPython/demo/bitmaps + mkdir $(DISTDIR)/wxPython/demo/bmp_source mkdir $(DISTDIR)/wxPython/demo/data + mkdir $(DISTDIR)/wxPython/demo/dllwidget mkdir $(DISTDIR)/wxPython/src mkdir $(DISTDIR)/wxPython/src/gtk + mkdir $(DISTDIR)/wxPython/scripts mkdir $(DISTDIR)/wxPython/wxPython mkdir $(DISTDIR)/wxPython/wxPython/lib + mkdir $(DISTDIR)/wxPython/wxPython/lib/PyCrust mkdir $(DISTDIR)/wxPython/wxPython/lib/editor - mkdir $(DISTDIR)/wxPython/wxPython/lib/sizers + mkdir $(DISTDIR)/wxPython/wxPython/lib/mixins + mkdir $(DISTDIR)/wxPython/wxPython/tools + mkdir $(DISTDIR)/wxPython/wxPython/tools/XRCed cp $(WXDIR)/wxPython/*.txt $(DISTDIR)/wxPython cp $(WXDIR)/wxPython/*.py $(DISTDIR)/wxPython cp $(WXDIR)/wxPython/setup.cfg $(DISTDIR)/wxPython cp $(WXDIR)/wxPython/MANIFEST.in $(DISTDIR)/wxPython + cp $(WXDIR)/wxPython/contrib/dllwidget/*.{py,cpp,h,i} $(DISTDIR)/wxPython/contrib/dllwidget + cp $(WXDIR)/wxPython/contrib/gizmos/*.{py,cpp,i} $(DISTDIR)/wxPython/contrib/gizmos -cp $(WXDIR)/wxPython/contrib/glcanvas/* $(DISTDIR)/wxPython/contrib/glcanvas cp $(WXDIR)/wxPython/contrib/glcanvas/gtk/glcanvas.* $(DISTDIR)/wxPython/contrib/glcanvas/gtk -cp $(WXDIR)/wxPython/contrib/ogl/* $(DISTDIR)/wxPython/contrib/ogl -cp $(WXDIR)/wxPython/contrib/stc/* $(DISTDIR)/wxPython/contrib/stc + -cp $(WXDIR)/wxPython/contrib/stc/gtk/* $(DISTDIR)/wxPython/contrib/stc/gtk + -cp $(WXDIR)/wxPython/contrib/xrc/xrc.* $(DISTDIR)/wxPython/contrib/xrc -cp $(WXDIR)/wxPython/demo/* $(DISTDIR)/wxPython/demo -cp $(WXDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/wxPython/demo/bitmaps + -cp $(WXDIR)/wxPython/demo/bmp_source/* $(DISTDIR)/wxPython/demo/bmp_source -cp $(WXDIR)/wxPython/demo/data/* $(DISTDIR)/wxPython/demo/data + -cp $(WXDIR)/wxPython/demo/dllwidget/Makefile $(DISTDIR)/wxPython/demo/dllwidget + -cp $(WXDIR)/wxPython/demo/dllwidget/test_* $(DISTDIR)/wxPython/demo/dllwidget + -cp $(WXDIR)/wxPython/scripts/* $(DISTDIR)/wxPython/scripts -cp $(WXDIR)/wxPython/src/* $(DISTDIR)/wxPython/src cp $(WXDIR)/wxPython/src/gtk/*.py $(DISTDIR)/wxPython/src/gtk cp $(WXDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/wxPython/src/gtk cp $(WXDIR)/wxPython/wxPython/lib/*.py $(DISTDIR)/wxPython/wxPython/lib + cp $(WXDIR)/wxPython/wxPython/lib/PyCrust/*.py $(DISTDIR)/wxPython/wxPython/lib/PyCrust cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor + cp $(WXDIR)/wxPython/wxPython/lib/mixins/*.py $(DISTDIR)/wxPython/wxPython/lib/mixins + cp $(WXDIR)/wxPython/wxPython/tools/*.py $(DISTDIR)/wxPython/wxPython/tools + cp $(WXDIR)/wxPython/wxPython/tools/XRCed/*.{py,ico,sh,xrc} $(DISTDIR)/wxPython/wxPython/tools/XRCed distclean: $(RM) -r _dist_dir +# VZ: the -only targets allow to do "make dist bzip-dist-only" without copying +# the files twice +dist-only: + @echo "*** Creating wxWindows distribution in $(DISTDIR)..." + @cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE); + @if test "$(USE_GUI)" = 1; then \ + cd $(DISTDIR); \ + mv samples wxSamples-$(VER_SUFFIX); \ + echo "*** Creating wxSamples archive..."; \ + tar ch wxSamples-$(VER_SUFFIX) | gzip -f9 > ../../$(WXSAMPLES); \ + mv wxSamples-$(VER_SUFFIX) samples; \ + mv demos wxDemos-$(VER_SUFFIX); \ + echo "*** Creating wxDemos archive..."; \ + tar ch wxDemos-$(VER_SUFFIX) | gzip -f9 > ../../$(WXDEMOS); \ + mv wxDemos-$(VER_SUFFIX) demos; \ + fi + dist: @GUIDIST@ - cp $(WXDIR)/src/files.lst $(DISTDIR)/src/ @echo "*** Creating wxWindows distribution in $(DISTDIR)..." - @cd _dist_dir; \ - mv @DISTDIR@ @DISTDIR@-$(VER_SUFFIX); \ - tar ch @DISTDIR@-$(VER_SUFFIX) | gzip -f9 > ../$(WXARCHIVE); \ - mv @DISTDIR@-$(VER_SUFFIX) @DISTDIR@ + @cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE); @if test "$(USE_GUI)" = 1; then \ cd $(DISTDIR); \ mv samples wxSamples-$(VER_SUFFIX); \ + echo "*** Creating wxSamples archive..."; \ tar ch wxSamples-$(VER_SUFFIX) | gzip -f9 > ../../$(WXSAMPLES); \ mv wxSamples-$(VER_SUFFIX) samples; \ mv demos wxDemos-$(VER_SUFFIX); \ + echo "*** Creating wxDemos archive..."; \ tar ch wxDemos-$(VER_SUFFIX) | gzip -f9 > ../../$(WXDEMOS); \ mv wxDemos-$(VER_SUFFIX) demos; \ fi +bzip-dist-only: + @echo "*** Creating wxWindows distribution in $(DISTDIR)..." + @cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP); + @if test "$(USE_GUI)" = 1; then \ + cd $(DISTDIR); \ + mv samples wxSamples-${VER_SUFFIX}; \ + echo "*** Creating wxSamples archive..."; \ + tar ch wxSamples-${VER_SUFFIX} | bzip2 -f9 > ../../$(WXSAMPLES_BZIP); \ + mv wxSamples-${VER_SUFFIX} samples; \ + mv demos wxDemos-${VER_SUFFIX}; \ + echo "*** Creating wxDemos archive..."; \ + tar ch wxDemos-${VER_SUFFIX} | bzip2 -f9 > ../../$(WXDEMOS_BZIP); \ + mv wxDemos-${VER_SUFFIX} demos; \ + fi + bzip-dist: @GUIDIST@ - cp $(WXDIR)/src/files.lst $(DISTDIR)/src/ @echo "*** Creating wxWindows distribution in $(DISTDIR)..." - cd _dist_dir; tar ch @DISTDIR@ | bzip2 -f9 > $(WXARCHIVE_BZIP); mv $(WXARCHIVE_BZIP) .. + @cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP) @if test "$(USE_GUI)" = 1; then \ cd $(DISTDIR); \ mv samples wxSamples; \ @@ -1311,23 +1467,68 @@ bzip-dist: @GUIDIST@ mv wxDemos demos; \ fi -debian-dist: @GUIDIST@ MANUAL_DIST PYTHON_DIST +# RR: Copy text and binary data separatly +win-dist: MSW_ZIP_TEXT_DIST + @echo "*** Creating wxWindows ZIP distribution in $(DISTDIR)..." + @cd _dist_dir && mv $(DISTDIRNAME) wxMSW + @cd _dist_dir && zip -r -l ../$(WXARCHIVE_ZIP) * + cp $(INCDIR)/wx/msw/*.cur _dist_dir/wxMSW/include/wx/msw + cp $(INCDIR)/wx/msw/*.ico _dist_dir/wxMSW/include/wx/msw + cp $(INCDIR)/wx/msw/*.bmp _dist_dir/wxMSW/include/wx/msw + @cd _dist_dir && zip -r ../$(WXARCHIVE_ZIP) wxMSW/include/wx/msw/*.cur + @cd _dist_dir && zip -r ../$(WXARCHIVE_ZIP) wxMSW/include/wx/msw/*.ico + @cd _dist_dir && zip -r ../$(WXARCHIVE_ZIP) wxMSW/include/wx/msw/*.bmp + +debian-dist: debian-native-dist debian-msw-dirs MSW_DIST mkdir $(DISTDIR)/debian -cp $(WXDIR)/debian/* $(DISTDIR)/debian - cp $(WXDIR)/src/files.lst $(DISTDIR)/src/ cp $(DOCDIR)/licence.txt $(DISTDIR)/docs cp $(DOCDIR)/licendoc.txt $(DISTDIR)/docs cp $(DOCDIR)/preamble.txt $(DISTDIR)/docs rm -f $(DISTDIR)/*.spec + + @# now prune away a lot of the crap included by using cp -R + @# in other dist targets. Ugly and hardly portable but it + @# will run on any Debian box and that's enough for now. + + find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \ + \( -name "makefile.*" -a ! -name "makefile.unx" \) \) \ + -print0 | xargs -0 rm -rf + 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-msw-dirs: + mkdir $(DISTDIR)/include/wx/msw + mkdir $(DISTDIR)/src/msw + + clean: $(RM) *.o $(RM) *.d $(RM) parser.c $(RM) lexer.c - $(RM) -r ./lib/wx/* - $(RM) ./lib/lib* + $(RM) $(build_libdir)/lib* + # Don't remove this lot, configure will reuse it + # if it's still good + # $(RM) -r $(build_libdir)/wx/* cleanall: clean + + +RPMTOP=_dist_dir/_rpm_top + +rpm: bzip-dist + @echo "*** Building RPMs ***" + -mkdir $(RPMTOP) + -mkdir $(RPMTOP)/SOURCES + -mkdir $(RPMTOP)/SPECS + -mkdir $(RPMTOP)/BUILD + -mkdir $(RPMTOP)/RPMS + -mkdir $(RPMTOP)/SRPMS + cp -f $(WXARCHIVE_BZIP) $(RPMTOP)/SOURCES + rpm -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec + mv -f `find $(RPMTOP) -name "wx$(TARGET)*.rpm"` . +