X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc3d889d0bb65725e521963d4f47019884a6d7c8..a132a1c810bea2d37b09f01524b57440c968de1c:/Makefile.in diff --git a/Makefile.in b/Makefile.in index 32d3e0e95c..8321615ba6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -30,25 +30,28 @@ include ./src/make.env ########################### 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 +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 +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@ # 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) # ':' 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)@PATH_IFS@$(VP12)@PATH_IFS@$(VP13) # ':' for autoconf -top_srcdir = @top_srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -67,6 +70,8 @@ oldincludedir = /usr/include DESTDIR = +localedir = $(datadir)/locale + pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -116,29 +121,44 @@ GTKDIR = $(WXDIR)/src/gtk MOTIFDIR = $(WXDIR)/src/motif MSWDIR = $(WXDIR)/src/msw PMDIR = $(WXDIR)/src/os2 +MACDIR = $(WXDIR)/src/mac ODBCDIR = $(WXDIR)/src/iodbc +FTDIR = $(WXDIR)/src/freetype INCDIR = $(WXDIR)/include SAMPDIR = $(WXDIR)/samples DEMODIR = $(WXDIR)/demos UTILSDIR = $(WXDIR)/utils MISCDIR = $(WXDIR)/misc -DOCDIR = $(WXDIR)/docs +DOCDIR = $(WXDIR)/docs +INTLDIR = $(WXDIR)/locale ########################## Archive name ############################### -WXARCHIVE = @DISTDIR@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz -WXGLARCHIVE = @DISTDIR@-gl-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz -WXSAMPLES = wx$(TOOLKIT)-samples-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz -WXDEMOS = wx$(TOOLKIT)-demos-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz -DISTDIR = ./_dist_dir/@DISTDIR@ +# append a version suffix x.y.z to all file names +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_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 + +DISTDIRNAME=@DISTDIR@-$(VER_SUFFIX) +DISTDIR=./_dist_dir/$(DISTDIRNAME) + ############################## Files ################################## +WX_LINGUAS = `cd $(top_srcdir)/locale && ls *.mo 2> /dev/null | sed -n 's/\.mo//p'` + # 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) @@ -150,7 +170,13 @@ 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 \ @@ -166,7 +192,7 @@ ZLIBOBJS = \ infutil.o \ inffast.o -PNGOBJS = \ +PNGOBJS = \ png.o \ pngread.o \ pngrtran.o \ @@ -183,8 +209,26 @@ PNGOBJS = \ pngget.o \ pngset.o - -JPEGOBJS = \ +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 = \ jcomapi.o \ jutils.o \ jerror.o \ @@ -232,7 +276,7 @@ JPEGOBJS = \ jquant2.o \ jdmerge.o -TIFFOBJS = \ +TIFFOBJS = \ tif_aux.o \ tif_close.o \ tif_codec.o \ @@ -283,7 +327,15 @@ IODBCOBJS = \ misc.o \ prepare.o \ result.o - + +OLEOBJS = \ + automtn.o \ + dataobj.o \ + dropsrc.o \ + droptgt.o \ + oleutils.o \ + uuid.o + ############################## Rules ################################## BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@ @@ -304,11 +356,17 @@ all: @WX_ALL@ @WX_LIBRARY_NAME_SHARED@: $(OBJECTS) @$(INSTALL) -d ./lib $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS) - -@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o + +@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o @WX_LIBRARY_NAME_SHARED@ @$(INSTALL) -d ./lib - $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o $(EXTRALIBS) - + $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o ./lib/@WX_LIBRARY_NAME_SHARED@ $(EXTRALIBS) $(OPENGLLIBS) + +./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).r: ./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).rsrc + $(DEREZ) $^ $(DEREZFLAGS) > $@ + +./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).rsrc: $(MACRESOURCES) + $(REZ) $(REZFLAGS) $^ -o $@ + CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@ @$(RM) ./lib/@WX_LIBRARY_LINK1@ @$(RM) ./lib/@WX_LIBRARY_LINK2@ @@ -317,7 +375,7 @@ CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@ && $(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@ @@ -326,7 +384,7 @@ CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@ && $(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@ @@ -335,7 +393,7 @@ CREATE_INSTALLED_LINKS: preinstall && $(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@ - + CREATE_INSTALLED_LINKS_GL: preinstall_gl $(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@ $(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@ @@ -344,7 +402,7 @@ CREATE_INSTALLED_LINKS_GL: preinstall_gl && $(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@ - + $(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h parser.o: parser.c lexer.c @@ -380,7 +438,7 @@ afminstall: preinstall # this is the real install target: copies the library, wx-config and the # headers to the installation directory -preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_DIR@-config +preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_NAME@-config @echo " " @echo " Installing wxWindows..." @echo " " @@ -389,16 +447,16 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_D $(INSTALL) -d $(bindir) $(INSTALL) -d $(libdir) - $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLKIT_DIR@-config $(bindir)/wx@TOOLKIT_DIR@-config - cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLKIT_DIR@-config wx-config + $(INSTALL_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) -d $(libdir)/wx $(INSTALL) -d $(libdir)/wx/include $(INSTALL) -d $(libdir)/wx/include/wx - $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@ - $(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h - + $(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 $(includedir)/wx @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 @@ -410,6 +468,14 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_D echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \ done + $(INSTALL) -d $(localedir) + @for p in $(WX_LINGUAS); do \ + $(INSTALL) -d $(localedir)/$$p; \ + $(INSTALL) -d $(localedir)/$$p/LC_MESSAGES; \ + $(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@ @echo " " @echo " Installing wxWindows OpenGl add-on..." @@ -445,9 +511,9 @@ uninstall: @$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@ @$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@ @echo " Removing helper files..." - @$(RM) $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h + @$(RM) $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h @$(RM) $(bindir)/wx-config - @$(RM) $(bindir)/wx@TOOLKIT_DIR@-config + @$(RM) $(bindir)/wx@TOOLKIT_NAME@-config @$(RM) $(datadir)/wx/afm/* @$(RM) $(datadir)/wx/gs_afm/* # FIXME: wxBase doesnt install these next 3 dirs. @@ -458,8 +524,15 @@ uninstall: @list='$(HEADERS)'; for p in $$list; do \ $(RM) $(includedir)/wx/$$p; \ done + @echo " Removing i18n files..." + @-for p in $(WX_LINGUAS); do \ + $(RM) $(localedir)/$$p/LC_MESSAGES/wxstd.mo; \ + rmdir $(localedir)/$$p/LC_MESSAGES; \ + rmdir $(localedir)/$$p; \ + done @echo " Removing directories..." - @if test -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@; then rmdir $(libdir)/wx/include/wx/@TOOLKIT_DIR@; fi + @-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; then rmdir $(libdir)/wx/include; fi @if test -d $(libdir)/wx; then rmdir $(libdir)/wx; fi @@ -505,6 +578,7 @@ ALL_DIST: distclean # 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 $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES.txt cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README.txt @@ -534,7 +608,7 @@ ALL_GUI_DIST: ALL_DIST mkdir $(DISTDIR)/src/tiff mkdir $(DISTDIR)/src/iodbc mkdir $(DISTDIR)/src/unix - cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@ + cp $(WXDIR)/@PORT_FILES@ $(DISTDIR) cp $(SRCDIR)/*.in $(DISTDIR)/src cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common cp $(COMMDIR)/*.c $(DISTDIR)/src/common @@ -574,16 +648,16 @@ BASE_DIST: ALL_DIST mkdir $(DISTDIR)/include/wx/unix mkdir $(DISTDIR)/src/common mkdir $(DISTDIR)/src/unix - cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@ + cp $(WXDIR)/@PORT_FILES@ $(DISTDIR) cp $(WXDIR)/@RPM_FILES@ $(DISTDIR)/@RPM_FILES@ cp $(WXDIR)/@RPM_SPEC@ $(DISTDIR)/@RPM_SPEC@ - cp $(WXDIR)/wxBase.dsp $(DISTDIR) - cp $(DOCDIR)/install.txt $(DISTDIR)/INSTALL.txt + cp $(WXDIR)/wxBase*.ds[pw] $(DISTDIR) cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt - cp $(DOCDIR)/todo.txt $(DISTDIR)/TODO.txt cp $(SRCDIR)/*.in $(DISTDIR)/src - cp $(WXDIR)/src/common/unzip.h $(DISTDIR)/src/common/unzip.h + 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 list='$(HEADERS)'; for p in $$list; do \ cp $(WXDIR)/include/wx/$$p $(DISTDIR)/include/wx/$$p; \ done @@ -591,8 +665,18 @@ BASE_DIST: ALL_DIST cp $(WXDIR)/src/$$p $(DISTDIR)/src/$$p; \ done + mkdir $(DISTDIR)/samples + cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples + cp $(SAMPDIR)/configure $(DISTDIR)/samples + cp $(SAMPDIR)/configure.in $(DISTDIR)/samples + + mkdir $(DISTDIR)/samples/console + 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/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)/*.cpp $(DISTDIR)/src/gtk @@ -612,6 +696,9 @@ MOTIF_DIST: ALL_GUI_DIST cp $(MOTIFDIR)/xmcombo/*.h $(DISTDIR)/src/motif/xmcombo cp $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo +MACX_DIST: ALL_GUI_DIST + echo "Apple Mac OS X specific distribution not complete" + MSW_DIST: ALL_GUI_DIST cp $(WXDIR)/wxWINE.spec $(DISTDIR) cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw @@ -630,9 +717,9 @@ DEMOS_DIST: ALL_GUI_DIST cp $(DEMODIR)/Makefile.in $(DISTDIR)/demos 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 @@ -640,7 +727,7 @@ DEMOS_DIST: ALL_GUI_DIST cp $(DEMODIR)/bombs/*.h $(DISTDIR)/demos/bombs cp $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs cp $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs - + mkdir $(DISTDIR)/demos/forty cp $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty cp $(DEMODIR)/forty/makefile.unx $(DISTDIR)/demos/forty @@ -648,7 +735,7 @@ DEMOS_DIST: ALL_GUI_DIST cp $(DEMODIR)/forty/*.cpp $(DISTDIR)/demos/forty cp $(DEMODIR)/forty/*.xpm $(DISTDIR)/demos/forty cp $(DEMODIR)/forty/*.xbm $(DISTDIR)/demos/forty - + mkdir $(DISTDIR)/demos/life mkdir $(DISTDIR)/demos/life/bitmaps cp $(DEMODIR)/life/Makefile.in $(DISTDIR)/demos/life @@ -657,8 +744,9 @@ DEMOS_DIST: ALL_GUI_DIST cp $(DEMODIR)/life/*.h $(DISTDIR)/demos/life cp $(DEMODIR)/life/*.xpm $(DISTDIR)/demos/life cp $(DEMODIR)/life/*.inc $(DISTDIR)/demos/life + cp $(DEMODIR)/life/*.lif $(DISTDIR)/demos/life cp $(DEMODIR)/life/bitmaps/*.xpm $(DISTDIR)/demos/life/bitmaps - + mkdir $(DISTDIR)/demos/poem cp $(DEMODIR)/poem/Makefile.in $(DISTDIR)/demos/poem cp $(DEMODIR)/poem/makefile.unx $(DISTDIR)/demos/poem @@ -667,12 +755,12 @@ DEMOS_DIST: ALL_GUI_DIST cp $(DEMODIR)/poem/*.xpm $(DISTDIR)/demos/poem cp $(DEMODIR)/poem/*.dat $(DISTDIR)/demos/poem cp $(DEMODIR)/poem/*.txt $(DISTDIR)/demos/poem - + mkdir $(DISTDIR)/demos/fractal cp $(DEMODIR)/fractal/Makefile.in $(DISTDIR)/demos/fractal cp $(DEMODIR)/fractal/makefile.unx $(DISTDIR)/demos/fractal cp $(DEMODIR)/fractal/*.cpp $(DISTDIR)/demos/fractal - + SAMPLES_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/samples cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples @@ -774,6 +862,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 @@ -848,10 +946,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 @@ -860,8 +959,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/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/ru mkdir $(DISTDIR)/samples/ipc cp $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc @@ -966,11 +1067,6 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/opengl/isosurf/*.h $(DISTDIR)/samples/opengl/isosurf cp $(SAMPDIR)/opengl/isosurf/*.gz $(DISTDIR)/samples/opengl/isosurf - mkdir $(DISTDIR)/samples/plot - cp $(SAMPDIR)/plot/Makefile.in $(DISTDIR)/samples/plot - cp $(SAMPDIR)/plot/makefile.unx $(DISTDIR)/samples/plot - cp $(SAMPDIR)/plot/*.cpp $(DISTDIR)/samples/plot - mkdir $(DISTDIR)/samples/png cp $(SAMPDIR)/png/Makefile.in $(DISTDIR)/samples/png cp $(SAMPDIR)/png/makefile.unx $(DISTDIR)/samples/png @@ -998,7 +1094,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 @@ -1007,35 +1103,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 @@ -1046,7 +1142,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 @@ -1058,12 +1154,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 @@ -1071,7 +1167,7 @@ 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 @@ -1080,33 +1176,33 @@ SAMPLES_DIST: ALL_GUI_DIST 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 - + UTILS_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/utils cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils @@ -1144,6 +1240,12 @@ MISC_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/misc/gs_afm cp $(MISCDIR)/gs_afm/*.afm $(DISTDIR)/misc/gs_afm +INTL_DIST: + mkdir $(DISTDIR)/locale + cp $(INTLDIR)/Makefile $(DISTDIR)/locale + cp $(INTLDIR)/*.po $(DISTDIR)/locale + -cp $(INTLDIR)/*.mo $(DISTDIR)/locale + MANUAL_DIST: mkdir $(DISTDIR)/docs mkdir $(DISTDIR)/docs/latex @@ -1158,49 +1260,101 @@ MANUAL_DIST: # those files needed for the Debian source package. # see utils/wxPython/distrib for scripts to make a proper wxPython dist. PYTHON_DIST: - mkdir $(DISTDIR)/utils/wxPython - mkdir $(DISTDIR)/utils/wxPython/demo - mkdir $(DISTDIR)/utils/wxPython/demo/bitmaps - mkdir $(DISTDIR)/utils/wxPython/demo/data - mkdir $(DISTDIR)/utils/wxPython/distrib - mkdir $(DISTDIR)/utils/wxPython/lib - mkdir $(DISTDIR)/utils/wxPython/lib/editor - mkdir $(DISTDIR)/utils/wxPython/lib/sizers - mkdir $(DISTDIR)/utils/wxPython/modules - mkdir $(DISTDIR)/utils/wxPython/modules/html - mkdir $(DISTDIR)/utils/wxPython/modules/utils - mkdir $(DISTDIR)/utils/wxPython/modules/utils/gtk - mkdir $(DISTDIR)/utils/wxPython/src - mkdir $(DISTDIR)/utils/wxPython/src/gtk - - cp $(UTILSDIR)/wxPython/*.txt $(DISTDIR)/utils/wxPython - -cp $(UTILSDIR)/wxPython/demo/* $(DISTDIR)/utils/wxPython/demo - -cp $(UTILSDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/utils/wxPython/demo/bitmaps - -cp $(UTILSDIR)/wxPython/demo/data/* $(DISTDIR)/utils/wxPython/demo/data - cp $(UTILSDIR)/wxPython/distrib/build.py $(DISTDIR)/utils/wxPython/distrib - cp $(UTILSDIR)/wxPython/lib/*.py $(DISTDIR)/utils/wxPython/lib - cp $(UTILSDIR)/wxPython/lib/editor/*.py $(DISTDIR)/utils/wxPython/lib/editor - cp $(UTILSDIR)/wxPython/lib/sizers/*.py $(DISTDIR)/utils/wxPython/lib/sizers - -cp $(UTILSDIR)/wxPython/modules/html/* $(DISTDIR)/utils/wxPython/modules/html - -cp $(UTILSDIR)/wxPython/modules/utils/* $(DISTDIR)/utils/wxPython/modules/utils - cp $(UTILSDIR)/wxPython/modules/utils/gtk/utils.* $(DISTDIR)/utils/wxPython/modules/utils/gtk - -cp $(UTILSDIR)/wxPython/src/* $(DISTDIR)/utils/wxPython/src - cp $(UTILSDIR)/wxPython/src/gtk/*.py $(DISTDIR)/utils/wxPython/src/gtk - cp $(UTILSDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/utils/wxPython/src/gtk + mkdir $(DISTDIR)/wxPython + mkdir $(DISTDIR)/wxPython/contrib + mkdir $(DISTDIR)/wxPython/contrib/glcanvas + mkdir $(DISTDIR)/wxPython/contrib/glcanvas/gtk + mkdir $(DISTDIR)/wxPython/contrib/ogl + mkdir $(DISTDIR)/wxPython/contrib/stc + mkdir $(DISTDIR)/wxPython/demo + mkdir $(DISTDIR)/wxPython/demo/bitmaps + mkdir $(DISTDIR)/wxPython/demo/data + mkdir $(DISTDIR)/wxPython/src + mkdir $(DISTDIR)/wxPython/src/gtk + mkdir $(DISTDIR)/wxPython/wxPython + mkdir $(DISTDIR)/wxPython/wxPython/lib + mkdir $(DISTDIR)/wxPython/wxPython/lib/editor + mkdir $(DISTDIR)/wxPython/wxPython/lib/sizers + + 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/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/demo/* $(DISTDIR)/wxPython/demo + -cp $(WXDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/wxPython/demo/bitmaps + -cp $(WXDIR)/wxPython/demo/data/* $(DISTDIR)/wxPython/demo/data + -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/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor 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 && 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@ | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) .. + @cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP) @if test "$(USE_GUI)" = 1; then \ cd $(DISTDIR); \ mv samples wxSamples; \ - tar ch wxSamples | gzip -f9 > ../../$(WXSAMPLES); \ + tar ch wxSamples | bzip2 -f9 > ../../$(WXSAMPLES_BZIP); \ mv wxSamples samples; \ mv demos wxDemos; \ - tar ch wxDemos | gzip -f9 > ../../$(WXDEMOS); \ + tar ch wxDemos | bzip2 -f9 > ../../$(WXDEMOS_BZIP); \ mv wxDemos demos; \ fi @@ -1220,6 +1374,22 @@ clean: $(RM) *.d $(RM) parser.c $(RM) lexer.c - $(RM) -r ./lib/* + # $(RM) -r ./lib/wx/* + $(RM) ./lib/lib* cleanall: clean + + +RPMTOP=_dist_dir/_rpm_top + +rpm: dist + @echo "*** Building RPMs ***" + -mkdir $(RPMTOP) + -mkdir $(RPMTOP)/SOURCES + -mkdir $(RPMTOP)/SPECS + -mkdir $(RPMTOP)/BUILD + -mkdir $(RPMTOP)/RPMS + -mkdir $(RPMTOP)/SRPMS + cp -f $(WXARCHIVE) $(RPMTOP)/SOURCES + rpm -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec + mv -f `find $(RPMTOP) -name "wx$(TARGET)*.rpm"` .