X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0b129e1a852f024c0c0069d9a4ee3b7c0ea1549a..afc94fa6b43722d604017798a767fa84ef883b47:/distrib/msw/tmake/unx.t?ds=sidebyside diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t index 41007e5159..115f4821a9 100644 --- a/distrib/msw/tmake/unx.t +++ b/distrib/msw/tmake/unx.t @@ -6,14 +6,13 @@ #! Created: 14.07.99 #! Version: $Id$ #!################################################################################ - #${ #! include the code which parses filelist.txt file and initializes #! %wxCommon, %wxGeneric, %wxHtml, %wxUnix and %wxGTK hashes. IncludeTemplate("filelist.t"); #! Generic - + foreach $file (sort keys %wxGeneric) { #! native wxDirDlg can't be compiled due to GnuWin32/OLE limitations, #! so take the generic version @@ -21,52 +20,74 @@ next unless $file =~ /^dirdlgg\./; } + $file2 = $file; $file =~ s/cp?p?$/\o/; - $project{"WXMSW_GENERICOBJS"} .= "src/generic/" . $file . " " + $file2 =~ s/cp?p?$/\d/; + $project{"WXMSW_GENERICOBJS"} .= $file . " "; + $project{"WXMSW_GENERICDEPS"} .= $file2 . " " } foreach $file (sort keys %wxGeneric) { + #! skip generic files not required for the wxGTK port next if $wxGeneric{$file} =~ /\bR\b/; + $file2 = $file; $file =~ s/cp?p?$/\o/; - $project{"WXGTK_GENERICOBJS"} .= "src/generic/" . $file . " " + $file2 =~ s/cp?p?$/\d/; + $project{"WXGTK_GENERICOBJS"} .= $file . " "; + $project{"WXGTK_GENERICDEPS"} .= $file2 . " " } foreach $file (sort keys %wxGeneric) { - next if $wxCommon{$file} =~ /\bX\b/; + next if $wxGeneric{$file} =~ /\bX\b/; + $file2 = $file; $file =~ s/cp?p?$/\o/; - $project{"WXMOTIF_GENERICOBJS"} .= "src/generic/" . $file . " " + $file2 =~ s/cp?p?$/\d/; + $project{"WXMOTIF_GENERICOBJS"} .= $file . " "; + $project{"WXMOTIF_GENERICDEPS"} .= $file2 . " " } - #! Common - - foreach $file (sort keys %wxCommon) { - next if $wxCommon{$file} =~ /\bR\b/; + #! Base - $file =~ s/cp?p?$/\o/; - $project{"WXGTK_COMMONOBJS"} .= "src/common/" . $file . " " - } + foreach $file (sort keys %wxBase) { + ($fileobj = $file) =~ s/cp?p?$/\o/; + ($filedep = $file) =~ s/cp?p?$/\d/; - foreach $file (sort keys %wxCommon) { - next if $wxCommon{$file} =~ /\bX\b/; - - $file =~ s/cp?p?$/\o/; - $project{"WXMOTIF_COMMONOBJS"} .= "src/common/" . $file . " " + $project{"BASE_OBJS"} .= $fileobj . " "; + $project{"BASE_DEPS"} .= $filedep . " "; } + #! Common + foreach $file (sort keys %wxCommon) { - next if $wxCommon{$file} =~ /\b(16)\b/; + ($fileobj = $file) =~ s/cp?p?$/\o/; + ($filedep = $file) =~ s/cp?p?$/\d/; - #! needs extra files (sql*.h) so not compiled by default. - next if $file =~ /^odbc\./; + #! 'B' flag means that the file makes part of wxBase too + if ( $wxCommon{$file} =~ /\bB\b/ ) { + $project{"BASE_OBJS"} .= $fileobj . " "; + $project{"BASE_DEPS"} .= $filedep . " "; + } - $file =~ s/cp?p?$/\o/; - $project{"WXMSW_COMMONOBJS"} .= "src/common/" . $file . " " + if ( $wxCommon{$file} !~ /\bR\b/ ) { #! unless not for GTK + $project{"WXGTK_COMMONOBJS"} .= $fileobj . " "; + $project{"WXGTK_COMMONDEPS"} .= $filedep . " " + } + if ( $wxCommon{$file} !~ /\bX\b/ ) { #! unless not for Motif + $project{"WXMOTIF_COMMONOBJS"} .= $fileobj . " "; + $project{"WXMOTIF_COMMONDEPS"} .= $filedep . " " + } + + #! ODBC needs extra files (sql*.h) so not compiled by default. + if ( (file !~ /^odbc\./) && ($wxCommon{$file} !~ /\b(16)\b/) ) { + $project{"WXMSW_COMMONOBJS"} .= $fileobj . " "; + $project{"WXMSW_COMMONDEPS"} .= $filedep . " " + } } #! GUI - + foreach $file (sort keys %wxMSW) { #! Mingw32 doesn't have the OLE headers and has some troubles with #! socket code @@ -75,36 +96,58 @@ #! native wxDirDlg can't be compiled due to GnuWin32/OLE limitations, next if $file =~ /^dirdlg\./; + $file2 = $file; $file =~ s/cp?p?$/\o/; - $project{"WXMSW_GUIOBJS"} .= "src/msw/" . $file . " " + $file2 =~ s/cp?p?$/\d/; + $project{"WXMSW_GUIOBJS"} .= $file . " "; + $project{"WXMSW_GUIDEPS"} .= $file2 . " " } foreach $file (sort keys %wxGTK) { + $file2 = $file; $file =~ s/cp?p?$/\o/; - $project{"WXGTK_GUIOBJS"} .= "src/gtk/" . $file . " " + $file2 =~ s/cp?p?$/\d/; + $project{"WXGTK_GUIOBJS"} .= $file . " "; + $project{"WXGTK_GUIDEPS"} .= $file2 . " " } foreach $file (sort keys %wxMOTIF) { + $file2 = $file; $file =~ s/cp?p?$/\o/; - $project{"WXMOTIF_GUIOBJS"} .= "src/motif/" . $file . " " + $file2 =~ s/cp?p?$/\d/; + $project{"WXMOTIF_GUIOBJS"} .= $file . " "; + $project{"WXMOTIF_GUIDEPS"} .= $file2 . " " } #! others foreach $file (sort keys %wxHTML) { + $file2 = $file; $file =~ s/cp?p?$/\o/; - $project{"WXHTMLOBJS"} .= "src/html/" . $file . " " + $file2 =~ s/cp?p?$/\d/; + $project{"WXHTMLOBJS"} .= $file . " "; + $project{"WXHTMLDEPS"} .= $file2 . " " } foreach $file (sort keys %wxUNIX) { - $file =~ s/cp?p?$/\o/; - $project{"WXUNIXOBJS"} .= "src/unix/" . $file . " " + ($fileobj = $file) =~ s/cp?p?$/\o/; + ($filedep = $file) =~ s/cp?p?$/\d/; + + #! 'B' flag means that the file makes part of wxBase too + if ( $wxUNIX{$file} =~ /\bB\b/ ) { + $project{"BASE_OBJS"} .= $fileobj . " "; + $project{"BASE_DEPS"} .= $filedep . " " + } + + $project{"WXUNIX_OBJS"} .= $fileobj . " "; + $project{"WXUNIX_DEPS"} .= $filedep . " " } #! headers foreach $file (sort keys %wxWXINCLUDE) { - $project{"WX_HEADERS"} .= $file . " " + $project{"WX_HEADERS"} .= $file . " "; + $project{"BASE_HEADERS"} .= $file . " " if $wxWXINCLUDE{$file} =~ /\bB\b/; } foreach $file (sort keys %wxGENERICINCLUDE) { @@ -160,19 +203,31 @@ include ./src/make.env .SUFFIXES: .o .cpp .c .cxx .c.o : - $(CCC) -c $(CFLAGS) $(PICFLAGS) -o $@ $< + $(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(PICFLAGS) -o $@ $< .cpp.o : - $(CC) -c $(CPPFLAGS) $(PICFLAGS) -o $@ $< + $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $< .cxx.o : - $(CC) -c $(CPPFLAGS) $(PICFLAGS) -o $@ $< + $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $< ########################### Paths ################################# srcdir = @srcdir@ -VPATH = :@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 + +VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9):$(VP10):$(VP11) top_srcdir = @top_srcdir@ prefix = @prefix@ @@ -234,22 +289,30 @@ HTMLDIR = $(WXDIR)/src/html UNIXDIR = $(WXDIR)/src/unix PNGDIR = $(WXDIR)/src/png JPEGDIR = $(WXDIR)/src/jpeg +TIFFDIR = $(WXDIR)/src/tiff ZLIBDIR = $(WXDIR)/src/zlib GTKDIR = $(WXDIR)/src/gtk MOTIFDIR = $(WXDIR)/src/motif MSWDIR = $(WXDIR)/src/msw +ODBCDIR = $(WXDIR)/src/iodbc INCDIR = $(WXDIR)/include SAMPDIR = $(WXDIR)/samples +UTILSDIR = $(WXDIR)/utils +MISCDIR = $(WXDIR)/misc DOCDIR = $(WXDIR)/docs ########################## Archive name ############################### WXARCHIVE = wx$(TOOLKIT)-$(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 DISTDIR = ./_dist_dir/wx$(TOOLKIT) ############################## Files ################################## +BASE_HEADERS = \ + #$ ExpandList("BASE_HEADERS"); + WX_HEADERS = \ #$ ExpandList("WX_HEADERS"); @@ -277,176 +340,267 @@ HTML_HEADERS = \ GTK_GENERICOBJS = \ #$ ExpandList("WXGTK_GENERICOBJS"); +GTK_GENERICDEPS = \ + #$ ExpandList("WXGTK_GENERICDEPS"); + GTK_COMMONOBJS = \ parser.o \ #$ ExpandList("WXGTK_COMMONOBJS"); +GTK_COMMONDEPS = \ + parser.d \ + #$ ExpandList("WXGTK_COMMONDEPS"); + GTK_GUIOBJS = \ #$ ExpandList("WXGTK_GUIOBJS"); +GTK_GUIDEPS = \ + #$ ExpandList("WXGTK_GUIDEPS"); + MOTIF_GENERICOBJS = \ #$ ExpandList("WXMOTIF_GENERICOBJS"); +MOTIF_GENERICDEPS = \ + #$ ExpandList("WXMOTIF_GENERICDEPS"); + MOTIF_COMMONOBJS = \ parser.o \ #$ ExpandList("WXMOTIF_COMMONOBJS"); +MOTIF_COMMONDEPS = \ + parser.d \ + #$ ExpandList("WXMOTIF_COMMONDEPS"); + MOTIF_GUIOBJS = \ - src/motif/xmcombo/xmcombo.o \ + xmcombo.o \ #$ ExpandList("WXMOTIF_GUIOBJS"); +MOTIF_GUIDEPS = \ + xmcombo.d \ + #$ ExpandList("WXMOTIF_GUIDEPS"); + MSW_GENERICOBJS = \ #$ ExpandList("WXMSW_GENERICOBJS"); +MSW_GENERICDEPS = \ + #$ ExpandList("WXMSW_GENERICDEPS"); + MSW_COMMONOBJS = \ + parser.o \ #$ ExpandList("WXMSW_COMMONOBJS"); +MSW_COMMONDEPS = \ + parser.d \ + #$ ExpandList("WXMSW_COMMONDEPS"); + MSW_GUIOBJS = \ #$ ExpandList("WXMSW_GUIOBJS"); +MSW_GUIDEPS = \ + #$ ExpandList("WXMSW_GUIDEPS"); + +BASE_OBJS = \ + #$ ExpandList("BASE_OBJS"); + +BASE_DEPS = \ + #$ ExpandList("BASE_DEPS"); + HTMLOBJS = \ #$ ExpandList("WXHTMLOBJS"); -UNIXOBJS = \ - #$ ExpandList("WXUNIXOBJS"); +HTMLDEPS = \ + #$ ExpandList("WXHTMLDEPS"); + +UNIX_OBJS = \ + #$ ExpandList("WXUNIX_OBJS"); + +UNIX_DEPS = \ + #$ ExpandList("WXUNIX_DEPS"); ZLIBOBJS = \ - src/zlib/adler32.o \ - src/zlib/compress.o \ - src/zlib/crc32.o \ - src/zlib/gzio.o \ - src/zlib/uncompr.o \ - src/zlib/deflate.o \ - src/zlib/trees.o \ - src/zlib/zutil.o \ - src/zlib/inflate.o \ - src/zlib/infblock.o \ - src/zlib/inftrees.o \ - src/zlib/infcodes.o \ - src/zlib/infutil.o \ - src/zlib/inffast.o + adler32.o \ + compress.o \ + crc32.o \ + gzio.o \ + uncompr.o \ + deflate.o \ + trees.o \ + zutil.o \ + inflate.o \ + infblock.o \ + inftrees.o \ + infcodes.o \ + infutil.o \ + inffast.o PNGOBJS = \ - src/png/png.o \ - src/png/pngread.o \ - src/png/pngrtran.o \ - src/png/pngrutil.o \ - src/png/pngpread.o \ - src/png/pngtrans.o \ - src/png/pngwrite.o \ - src/png/pngwtran.o \ - src/png/pngwutil.o \ - src/png/pngerror.o \ - src/png/pngmem.o \ - src/png/pngwio.o \ - src/png/pngrio.o \ - src/png/pngget.o \ - src/png/pngset.o + png.o \ + pngread.o \ + pngrtran.o \ + pngrutil.o \ + pngpread.o \ + pngtrans.o \ + pngwrite.o \ + pngwtran.o \ + pngwutil.o \ + pngerror.o \ + pngmem.o \ + pngwio.o \ + pngrio.o \ + pngget.o \ + pngset.o JPEGOBJS = \ - src/jpeg/jcomapi.o \ - src/jpeg/jutils.o \ - src/jpeg/jerror.o \ - src/jpeg/jmemmgr.o \ - src/jpeg/jmemnobs.o \ - src/jpeg/jcapimin.o \ - src/jpeg/jcapistd.o \ - src/jpeg/jctrans.o \ - src/jpeg/jcparam.o \ - src/jpeg/jdatadst.o \ - src/jpeg/jcinit.o \ - src/jpeg/jcmaster.o \ - src/jpeg/jcmarker.o \ - src/jpeg/jcmainct.o \ - src/jpeg/jcprepct.o \ - src/jpeg/jccoefct.o \ - src/jpeg/jccolor.o \ - src/jpeg/jcsample.o \ - src/jpeg/jchuff.o \ - src/jpeg/jcphuff.o \ - src/jpeg/jcdctmgr.o \ - src/jpeg/jfdctfst.o \ - src/jpeg/jfdctflt.o \ - src/jpeg/jfdctint.o \ - src/jpeg/jdapimin.o \ - src/jpeg/jdapistd.o \ - src/jpeg/jdtrans.o \ - src/jpeg/jdatasrc.o \ - src/jpeg/jdmaster.o \ - src/jpeg/jdinput.o \ - src/jpeg/jdmarker.o \ - src/jpeg/jdhuff.o \ - src/jpeg/jdphuff.o \ - src/jpeg/jdmainct.o \ - src/jpeg/jdcoefct.o \ - src/jpeg/jdpostct.o \ - src/jpeg/jddctmgr.o \ - src/jpeg/jidctfst.o \ - src/jpeg/jidctflt.o \ - src/jpeg/jidctint.o \ - src/jpeg/jidctred.o \ - src/jpeg/jdsample.o \ - src/jpeg/jdcolor.o \ - src/jpeg/jquant1.o \ - src/jpeg/jquant2.o \ - src/jpeg/jdmerge.o - - -OBJECTS = $(@GUIOBJS@) $(@COMMONOBJS@) $(@GENERICOBJS@) $(@UNIXOBJS@) $(HTMLOBJS) \ - $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) - -HEADERS = $(@GUIHEADERS@) $(HTML_HEADERS) $(UNIX_HEADERS) $(PROTOCOL_HEADERS) \ - $(GENERIC_HEADERS) $(WX_HEADERS) - -REQUIRED_DIRS = ./lib ./src ./src/common ./src/gtk ./src/motif ./src/msw \ - ./src/generic ./src/unix ./src/motif/xmombo ./src/html \ - ./src/zlib ./src/jpeg ./src/png - -all: $(REQUIRED_DIRS) $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@ - -$(REQUIRED_DIRS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h - @mkdir -p ./lib - @mkdir -p ./src - @mkdir -p ./src/common - @mkdir -p ./src/msw - @mkdir -p ./src/gtk - @mkdir -p ./src/motif - @mkdir -p ./src/motif/xmcombo - @mkdir -p ./src/generic - @mkdir -p ./src/unix - @mkdir -p ./src/html - @mkdir -p ./src/png - @mkdir -p ./src/jpeg - @mkdir -p ./src/zlib + jcomapi.o \ + jutils.o \ + jerror.o \ + jmemmgr.o \ + jmemnobs.o \ + jcapimin.o \ + jcapistd.o \ + jctrans.o \ + jcparam.o \ + jdatadst.o \ + jcinit.o \ + jcmaster.o \ + jcmarker.o \ + jcmainct.o \ + jcprepct.o \ + jccoefct.o \ + jccolor.o \ + jcsample.o \ + jchuff.o \ + jcphuff.o \ + jcdctmgr.o \ + jfdctfst.o \ + jfdctflt.o \ + jfdctint.o \ + jdapimin.o \ + jdapistd.o \ + jdtrans.o \ + jdatasrc.o \ + jdmaster.o \ + jdinput.o \ + jdmarker.o \ + jdhuff.o \ + jdphuff.o \ + jdmainct.o \ + jdcoefct.o \ + jdpostct.o \ + jddctmgr.o \ + jidctfst.o \ + jidctflt.o \ + jidctint.o \ + jidctred.o \ + jdsample.o \ + jdcolor.o \ + jquant1.o \ + jquant2.o \ + jdmerge.o + +TIFFOBJS = \ + tif_aux.o \ + tif_close.o \ + tif_codec.o \ + tif_compress.o \ + tif_dir.o \ + tif_dirinfo.o \ + tif_dirread.o \ + tif_dirwrite.o \ + tif_dumpmode.o \ + tif_error.o \ + tif_fax3.o \ + tif_fax3sm.o \ + tif_getimage.o \ + tif_jpeg.o \ + tif_flush.o \ + tif_lzw.o \ + tif_luv.o \ + tif_next.o \ + tif_open.o \ + tif_packbits.o \ + tif_pixarlog.o \ + tif_predict.o \ + tif_print.o \ + tif_read.o \ + tif_swab.o \ + tif_strip.o \ + tif_thunder.o \ + tif_tile.o \ + tif_unix.o \ + tif_version.o \ + tif_warning.o \ + tif_write.o \ + tif_zip.o + +IODBC_OBJS = \ + catalog.o \ + connect.o \ + dlf.o \ + dlproc.o \ + execute.o \ + fetch.o \ + hdbc.o \ + henv.o \ + herr.o \ + hstmt.o \ + info.o \ + itrace.o \ + misc.o \ + prepare.o \ + result.o + +GUIOBJS = @GUIOBJS@ +GUIDEPS = @GUIDEPS@ +GUIHEADERS = @GUIHEADERS@ +COMMONOBJS = @COMMONOBJS@ +COMMONDEPS = @COMMONDEPS@ +GENERICOBJS = @GENERICOBJS@ +GENERICDEPS = @GENERICDEPS@ +UNIXOBJS = @UNIXOBJS@ +UNIXDEPS = @UNIXDEPS@ +IODBCOBJS = @IODBCOBJS@ + +OBJECTS = @ALL_OBJECTS@ + +DEPFILES = @ALL_DEPFILES@ + +HEADERS = @ALL_HEADERS@ + +BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@ + +all: @WX_ALL@ @WX_LIBRARY_NAME_STATIC@: $(OBJECTS) + @$(INSTALL) -d ./lib $(AR) $(AROPTIONS) ./lib/$@ $(OBJECTS) $(RANLIB) ./lib/$@ @WX_LIBRARY_NAME_SHARED@: $(OBJECTS) - $(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS) + @$(INSTALL) -d ./lib + $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS) -CREATE_LINKS: ./lib/@WX_TARGET_LIBRARY@ - @if test -e ./lib/@WX_LIBRARY_LINK1@; then $(RM) ./lib/@WX_LIBRARY_LINK1@; fi - @if test -e ./lib/@WX_LIBRARY_LINK2@; then $(RM) ./lib/@WX_LIBRARY_LINK2@; fi - @if test -e ./lib/@WX_LIBRARY_LINK3@; then $(RM) ./lib/@WX_LIBRARY_LINK3@; fi +CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@ + @$(RM) ./lib/@WX_LIBRARY_LINK1@ + @$(RM) ./lib/@WX_LIBRARY_LINK2@ + @$(RM) ./lib/@WX_LIBRARY_LINK3@ $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK1@ $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@ $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@ -CREATE_INSTALLED_LINKS: $(libdir)/@WX_TARGET_LIBRARY@ - @if test -e $(libdir)/@WX_LIBRARY_LINK1@; then $(RM) $(libdir)/@WX_LIBRARY_LINK1@; fi - @if test -e $(libdir)/@WX_LIBRARY_LINK2@; then $(RM) $(libdir)/@WX_LIBRARY_LINK2@; fi - @if test -e $(libdir)/@WX_LIBRARY_LINK3@; then $(RM) $(libdir)/@WX_LIBRARY_LINK3@; fi - $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK1@ - $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK2@ - $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK3@ +CREATE_INSTALLED_LINKS: $(libdir)/@WX_LIBRARY_NAME_SHARED@ + $(RM) $(libdir)/@WX_LIBRARY_LINK1@ + $(RM) $(libdir)/@WX_LIBRARY_LINK2@ + $(RM) $(libdir)/@WX_LIBRARY_LINK3@ + $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK1@ + $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK2@ + $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK3@ -$(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h +$(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h parser.o: parser.c lexer.c - $(CCLEX) -c $(CFLAGS) -o $@ parser.c + $(CCLEX) -c $(CFLAGS) $(PICFLAGS) -o $@ parser.c parser.c: $(COMMDIR)/parser.y lexer.c $(YACC) $(COMMDIR)/parser.y @@ -466,15 +620,17 @@ lexer.c: $(COMMDIR)/lexer.l sed -e "s/unput/PROIO_unput/g" > lexer.c @$(RM) lex.yy.c -preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(top_builddir)/setup.h +-include $(DEPFILES) + +preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config @echo " " @echo " Installing wxWindows..." @echo " " - $(INSTALL) -d $(prefix) $(INSTALL) -d $(bindir) $(INSTALL) -d $(libdir) + $(INSTALL) -d $(datadir) $(INSTALL_SCRIPT) $(top_builddir)/wx-config $(bindir)/wx-config $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@ @@ -483,7 +639,13 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $( $(INSTALL) -d $(libdir)/wx/include $(INSTALL) -d $(libdir)/wx/include/wx $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@ - $(INSTALL_DATA) $(top_builddir)/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h + $(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h + + $(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 $(includedir)/wx $(INSTALL) -d $(includedir)/wx/msw @@ -501,8 +663,8 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $( write_message: @echo " " @echo " The installation of wxWindows is finished. On certain" - @echo " platforms (e.g. Linux, Solaris) you'll now have to run" - @echo " ldconfig if you installed a shared library." + @echo " platforms (e.g. Linux) you'll now have to run ldconfig" + @echo " if you installed a shared library." @echo " " @echo " wxWindows comes with no guarantees and doesn't claim" @echo " to be suitable for any purpose." @@ -510,7 +672,7 @@ write_message: @echo " Read the wxWindows Licence on licencing conditions." @echo " " -install: preinstall @WX_CREATE_INSTALLED_LINKS@ write_message +install: preinstall @WX_ALL_INSTALLED@ write_message uninstall: @echo " " @@ -524,6 +686,11 @@ uninstall: @echo " Removing helper files..." @$(RM) $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h @$(RM) $(bindir)/wx-config + @$(RM) $(datadir)/wx/afm/* + @$(RM) $(datadir)/wx/gs_afm/* + @rmdir $(datadir)/wx/gs_afm + @rmdir $(datadir)/wx/afm + @rmdir $(datadir)/wx @echo " Removing headers..." @list='$(HEADERS)'; for p in $$list; do \ $(RM) $(includedir)/wx/$$p; \ @@ -535,7 +702,7 @@ uninstall: @if test -d $(libdir)/wx; then rmdir $(libdir)/wx; fi @if test -d $(includedir)/wx/gtk; then rmdir $(includedir)/wx/gtk; fi @if test -d $(includedir)/wx/motif; then rmdir $(includedir)/wx/motif; fi - @if test -d $(includedir)/wx/motif; then rmdir $(includedir)/wx/msw; fi + @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/generic; then rmdir $(includedir)/wx/generic; fi @@ -546,6 +713,7 @@ ALL_DIST: mkdir _dist_dir mkdir $(DISTDIR) cp $(WXDIR)/wx$(TOOLKIT).spec $(DISTDIR) + cp $(WXDIR)/configure.in $(DISTDIR) cp $(WXDIR)/configure $(DISTDIR) cp $(WXDIR)/config.sub $(DISTDIR) cp $(WXDIR)/config.guess $(DISTDIR) @@ -584,7 +752,9 @@ ALL_DIST: mkdir $(DISTDIR)/src/unix mkdir $(DISTDIR)/src/png mkdir $(DISTDIR)/src/jpeg + mkdir $(DISTDIR)/src/tiff mkdir $(DISTDIR)/src/zlib + mkdir $(DISTDIR)/src/iodbc cp $(SRCDIR)/*.in $(DISTDIR)/src cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common cp $(COMMDIR)/*.c $(DISTDIR)/src/common @@ -594,9 +764,7 @@ ALL_DIST: cp $(COMMDIR)/*.y $(DISTDIR)/src/common cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic cp $(HTMLDIR)/*.cpp $(DISTDIR)/src/html - cp $(HTMLDIR)/*.h $(DISTDIR)/src/html cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps - cp $(UNIXDIR)/*.h $(DISTDIR)/src/unix cp $(UNIXDIR)/*.c $(DISTDIR)/src/unix cp $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix cp $(PNGDIR)/*.h $(DISTDIR)/src/png @@ -608,6 +776,16 @@ ALL_DIST: cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg + cp $(TIFFDIR)/*.h $(DISTDIR)/src/tiff + cp $(TIFFDIR)/*.c $(DISTDIR)/src/tiff + cp $(TIFFDIR)/README $(DISTDIR)/src/tiff + cp $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc + cp $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc + cp $(ODBCDIR)/*.ci $(DISTDIR)/src/iodbc + cp $(ODBCDIR)/*.exp $(DISTDIR)/src/iodbc + cp $(ODBCDIR)/README $(DISTDIR)/src/iodbc + cp $(ODBCDIR)/NEWS $(DISTDIR)/src/iodbc + cp $(ODBCDIR)/Changes.log $(DISTDIR)/src/iodbc GTK_DIST: cp $(WXDIR)/wxGTK.spec $(DISTDIR) @@ -643,52 +821,372 @@ MSW_DIST: SAMPLES_DIST: mkdir $(DISTDIR)/samples cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples + mkdir $(DISTDIR)/samples/bombs cp $(SAMPDIR)/bombs/Makefile.in $(DISTDIR)/samples/bombs + cp $(SAMPDIR)/bombs/makefile.unx $(DISTDIR)/samples/bombs cp $(SAMPDIR)/bombs/*.cpp $(DISTDIR)/samples/bombs cp $(SAMPDIR)/bombs/*.h $(DISTDIR)/samples/bombs cp $(SAMPDIR)/bombs/*.xpm $(DISTDIR)/samples/bombs cp $(SAMPDIR)/bombs/readme.txt $(DISTDIR)/samples/bombs + mkdir $(DISTDIR)/samples/caret cp $(SAMPDIR)/caret/Makefile.in $(DISTDIR)/samples/caret + cp $(SAMPDIR)/caret/makefile.unx $(DISTDIR)/samples/caret cp $(SAMPDIR)/caret/*.cpp $(DISTDIR)/samples/caret cp $(SAMPDIR)/caret/*.xpm $(DISTDIR)/samples/caret + mkdir $(DISTDIR)/samples/config cp $(SAMPDIR)/config/Makefile.in $(DISTDIR)/samples/config + cp $(SAMPDIR)/config/makefile.unx $(DISTDIR)/samples/config cp $(SAMPDIR)/config/*.cpp $(DISTDIR)/samples/config + mkdir $(DISTDIR)/samples/controls mkdir $(DISTDIR)/samples/controls/icons cp $(SAMPDIR)/controls/Makefile.in $(DISTDIR)/samples/controls + cp $(SAMPDIR)/controls/makefile.unx $(DISTDIR)/samples/controls cp $(SAMPDIR)/controls/*.cpp $(DISTDIR)/samples/controls cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls cp $(SAMPDIR)/controls/icons/*.??? $(DISTDIR)/samples/controls/icons + mkdir $(DISTDIR)/samples/checklst cp $(SAMPDIR)/checklst/Makefile.in $(DISTDIR)/samples/checklst + cp $(SAMPDIR)/checklst/makefile.unx $(DISTDIR)/samples/checklst cp $(SAMPDIR)/checklst/*.cpp $(DISTDIR)/samples/checklst cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst - mkdir $(DISTDIR)/samples/checkls + + mkdir $(DISTDIR)/samples/printing cp $(SAMPDIR)/printing/Makefile.in $(DISTDIR)/samples/printing + cp $(SAMPDIR)/printing/makefile.unx $(DISTDIR)/samples/printing cp $(SAMPDIR)/printing/*.cpp $(DISTDIR)/samples/printing cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing - -dist: ALL_DIST @GUIDIST@ SAMPLES_DIST + + mkdir $(DISTDIR)/samples/db + cp $(SAMPDIR)/db/Makefile.in $(DISTDIR)/samples/db + cp $(SAMPDIR)/db/makefile.unx $(DISTDIR)/samples/db + cp $(SAMPDIR)/db/*.cpp $(DISTDIR)/samples/db + cp $(SAMPDIR)/db/*.h $(DISTDIR)/samples/db + cp $(SAMPDIR)/db/*.xpm $(DISTDIR)/samples/db + + mkdir $(DISTDIR)/samples/dialogs + cp $(SAMPDIR)/dialogs/Makefile.in $(DISTDIR)/samples/dialogs + cp $(SAMPDIR)/dialogs/makefile.unx $(DISTDIR)/samples/dialogs + cp $(SAMPDIR)/dialogs/*.cpp $(DISTDIR)/samples/dialogs + cp $(SAMPDIR)/dialogs/*.h $(DISTDIR)/samples/dialogs + cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs + + mkdir $(DISTDIR)/samples/dnd + cp $(SAMPDIR)/dnd/Makefile.in $(DISTDIR)/samples/dnd + cp $(SAMPDIR)/dnd/makefile.unx $(DISTDIR)/samples/dnd + cp $(SAMPDIR)/dnd/*.wxr $(DISTDIR)/samples/dnd + cp $(SAMPDIR)/dnd/*.cpp $(DISTDIR)/samples/dnd + cp $(SAMPDIR)/dnd/*.xpm $(DISTDIR)/samples/dnd + cp $(SAMPDIR)/dnd/*.txt $(DISTDIR)/samples/dnd + cp $(SAMPDIR)/dnd/*.png $(DISTDIR)/samples/dnd + + mkdir $(DISTDIR)/samples/docview + cp $(SAMPDIR)/docview/Makefile.in $(DISTDIR)/samples/docview + cp $(SAMPDIR)/docview/makefile.unx $(DISTDIR)/samples/docview + cp $(SAMPDIR)/docview/*.cpp $(DISTDIR)/samples/docview + cp $(SAMPDIR)/docview/*.h $(DISTDIR)/samples/docview + cp $(SAMPDIR)/docview/*.xpm $(DISTDIR)/samples/docview + + mkdir $(DISTDIR)/samples/docvwmdi + cp $(SAMPDIR)/docvwmdi/Makefile.in $(DISTDIR)/samples/docvwmdi + cp $(SAMPDIR)/docvwmdi/makefile.unx $(DISTDIR)/samples/docvwmdi + cp $(SAMPDIR)/docvwmdi/*.cpp $(DISTDIR)/samples/docvwmdi + cp $(SAMPDIR)/docvwmdi/*.h $(DISTDIR)/samples/docvwmdi + + mkdir $(DISTDIR)/samples/drawing + cp $(SAMPDIR)/drawing/Makefile.in $(DISTDIR)/samples/drawing + cp $(SAMPDIR)/drawing/makefile.unx $(DISTDIR)/samples/drawing + cp $(SAMPDIR)/drawing/*.cpp $(DISTDIR)/samples/drawing + cp $(SAMPDIR)/drawing/*.xpm $(DISTDIR)/samples/drawing + + mkdir $(DISTDIR)/samples/dynamic + cp $(SAMPDIR)/dynamic/Makefile.in $(DISTDIR)/samples/dynamic + cp $(SAMPDIR)/dynamic/makefile.unx $(DISTDIR)/samples/dynamic + cp $(SAMPDIR)/dynamic/*.cpp $(DISTDIR)/samples/dynamic + cp $(SAMPDIR)/dynamic/*.xpm $(DISTDIR)/samples/dynamic + + mkdir $(DISTDIR)/samples/forty + cp $(SAMPDIR)/forty/Makefile.in $(DISTDIR)/samples/forty + cp $(SAMPDIR)/forty/makefile.unx $(DISTDIR)/samples/forty + cp $(SAMPDIR)/forty/*.h $(DISTDIR)/samples/forty + cp $(SAMPDIR)/forty/*.cpp $(DISTDIR)/samples/forty + cp $(SAMPDIR)/forty/*.xpm $(DISTDIR)/samples/forty + cp $(SAMPDIR)/forty/*.xbm $(DISTDIR)/samples/forty + + mkdir $(DISTDIR)/samples/fractal + cp $(SAMPDIR)/fractal/Makefile.in $(DISTDIR)/samples/fractal + cp $(SAMPDIR)/fractal/makefile.unx $(DISTDIR)/samples/fractal + cp $(SAMPDIR)/fractal/*.cpp $(DISTDIR)/samples/fractal + + mkdir $(DISTDIR)/samples/help + mkdir $(DISTDIR)/samples/help/doc + cp $(SAMPDIR)/help/Makefile.in $(DISTDIR)/samples/help + cp $(SAMPDIR)/help/makefile.unx $(DISTDIR)/samples/help + cp $(SAMPDIR)/help/*.cpp $(DISTDIR)/samples/help + cp $(SAMPDIR)/help/*.xpm $(DISTDIR)/samples/help + cp $(SAMPDIR)/help/doc/*.* $(DISTDIR)/samples/help/doc + + mkdir $(DISTDIR)/samples/html + cp $(SAMPDIR)/html/Makefile.in $(DISTDIR)/samples/html + mkdir $(DISTDIR)/samples/html/about + cp $(SAMPDIR)/html/about/Makefile.in $(DISTDIR)/samples/html/about + cp $(SAMPDIR)/html/about/*.cpp $(DISTDIR)/samples/html/about + mkdir $(DISTDIR)/samples/html/about/data + cp $(SAMPDIR)/html/about/data/*.htm $(DISTDIR)/samples/html/about/data + cp $(SAMPDIR)/html/about/data/*.png $(DISTDIR)/samples/html/about/data + mkdir $(DISTDIR)/samples/html/help + cp $(SAMPDIR)/html/help/Makefile.in $(DISTDIR)/samples/html/help + cp $(SAMPDIR)/html/help/*.cpp $(DISTDIR)/samples/html/help + mkdir $(DISTDIR)/samples/html/help/helpfiles + cp $(SAMPDIR)/html/help/helpfiles/*.??? $(DISTDIR)/samples/html/help/helpfiles + mkdir $(DISTDIR)/samples/html/helpview + cp $(SAMPDIR)/html/helpview/Makefile.in $(DISTDIR)/samples/html/helpview + cp $(SAMPDIR)/html/helpview/*.cpp $(DISTDIR)/samples/html/helpview + cp $(SAMPDIR)/html/helpview/*.zip $(DISTDIR)/samples/html/helpview + mkdir $(DISTDIR)/samples/html/printing + cp $(SAMPDIR)/html/printing/Makefile.in $(DISTDIR)/samples/html/printing + cp $(SAMPDIR)/html/printing/*.cpp $(DISTDIR)/samples/html/printing + cp $(SAMPDIR)/html/printing/*.htm $(DISTDIR)/samples/html/printing + mkdir $(DISTDIR)/samples/html/test + cp $(SAMPDIR)/html/test/Makefile.in $(DISTDIR)/samples/html/test + cp $(SAMPDIR)/html/test/*.cpp $(DISTDIR)/samples/html/test + cp $(SAMPDIR)/html/test/*.bmp $(DISTDIR)/samples/html/test + cp $(SAMPDIR)/html/test/*.png $(DISTDIR)/samples/html/test + cp $(SAMPDIR)/html/test/*.htm $(DISTDIR)/samples/html/test + cp $(SAMPDIR)/html/test/*.html $(DISTDIR)/samples/html/test + mkdir $(DISTDIR)/samples/html/virtual + cp $(SAMPDIR)/html/virtual/Makefile.in $(DISTDIR)/samples/html/virtual + cp $(SAMPDIR)/html/virtual/*.cpp $(DISTDIR)/samples/html/virtual + cp $(SAMPDIR)/html/virtual/*.htm $(DISTDIR)/samples/html/virtual + mkdir $(DISTDIR)/samples/html/widget + cp $(SAMPDIR)/html/widget/Makefile.in $(DISTDIR)/samples/html/widget + cp $(SAMPDIR)/html/widget/*.cpp $(DISTDIR)/samples/html/widget + cp $(SAMPDIR)/html/widget/*.htm $(DISTDIR)/samples/html/widget + mkdir $(DISTDIR)/samples/html/zip + cp $(SAMPDIR)/html/zip/Makefile.in $(DISTDIR)/samples/html/zip + cp $(SAMPDIR)/html/zip/*.cpp $(DISTDIR)/samples/html/zip + cp $(SAMPDIR)/html/zip/*.htm $(DISTDIR)/samples/html/zip + cp $(SAMPDIR)/html/zip/*.zip $(DISTDIR)/samples/html/zip + + mkdir $(DISTDIR)/samples/image + cp $(SAMPDIR)/image/Makefile.in $(DISTDIR)/samples/image + cp $(SAMPDIR)/image/makefile.unx $(DISTDIR)/samples/image + cp $(SAMPDIR)/image/*.cpp $(DISTDIR)/samples/image + cp $(SAMPDIR)/image/horse.* $(DISTDIR)/samples/image + + mkdir $(DISTDIR)/samples/internat + mkdir $(DISTDIR)/samples/internat/de + mkdir $(DISTDIR)/samples/internat/fr + cp $(SAMPDIR)/internat/Makefile.in $(DISTDIR)/samples/internat + cp $(SAMPDIR)/internat/makefile.unx $(DISTDIR)/samples/internat + cp $(SAMPDIR)/internat/*.cpp $(DISTDIR)/samples/internat + cp $(SAMPDIR)/internat/*.xpm $(DISTDIR)/samples/internat + cp $(SAMPDIR)/internat/*.txt $(DISTDIR)/samples/internat + cp $(SAMPDIR)/internat/*.po $(DISTDIR)/samples/internat + cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr + cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de + cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr + cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de + + mkdir $(DISTDIR)/samples/layout + cp $(SAMPDIR)/layout/Makefile.in $(DISTDIR)/samples/layout + cp $(SAMPDIR)/layout/makefile.unx $(DISTDIR)/samples/layout + cp $(SAMPDIR)/layout/*.cpp $(DISTDIR)/samples/layout + cp $(SAMPDIR)/layout/*.h $(DISTDIR)/samples/layout + + mkdir $(DISTDIR)/samples/listctrl + mkdir $(DISTDIR)/samples/listctrl/bitmaps + cp $(SAMPDIR)/listctrl/Makefile.in $(DISTDIR)/samples/listctrl + cp $(SAMPDIR)/listctrl/makefile.unx $(DISTDIR)/samples/listctrl + cp $(SAMPDIR)/listctrl/*.cpp $(DISTDIR)/samples/listctrl + cp $(SAMPDIR)/listctrl/*.h $(DISTDIR)/samples/listctrl + cp $(SAMPDIR)/listctrl/*.xpm $(DISTDIR)/samples/listctrl + cp $(SAMPDIR)/listctrl/bitmaps/*.xpm $(DISTDIR)/samples/listctrl/bitmaps + + mkdir $(DISTDIR)/samples/mdi + mkdir $(DISTDIR)/samples/mdi/bitmaps + cp $(SAMPDIR)/mdi/Makefile.in $(DISTDIR)/samples/mdi + cp $(SAMPDIR)/mdi/makefile.unx $(DISTDIR)/samples/mdi + cp $(SAMPDIR)/mdi/*.cpp $(DISTDIR)/samples/mdi + cp $(SAMPDIR)/mdi/*.h $(DISTDIR)/samples/mdi + cp $(SAMPDIR)/mdi/*.xpm $(DISTDIR)/samples/mdi + cp $(SAMPDIR)/mdi/bitmaps/*.xpm $(DISTDIR)/samples/mdi/bitmaps + + mkdir $(DISTDIR)/samples/memcheck + cp $(SAMPDIR)/memcheck/Makefile.in $(DISTDIR)/samples/memcheck + cp $(SAMPDIR)/memcheck/makefile.unx $(DISTDIR)/samples/memcheck + cp $(SAMPDIR)/memcheck/*.cpp $(DISTDIR)/samples/memcheck + cp $(SAMPDIR)/memcheck/*.xpm $(DISTDIR)/samples/memcheck + + mkdir $(DISTDIR)/samples/menu + cp $(SAMPDIR)/menu/Makefile.in $(DISTDIR)/samples/menu + cp $(SAMPDIR)/menu/makefile.unx $(DISTDIR)/samples/menu + cp $(SAMPDIR)/menu/*.cpp $(DISTDIR)/samples/menu + + mkdir $(DISTDIR)/samples/minifram + mkdir $(DISTDIR)/samples/minifram/bitmaps + cp $(SAMPDIR)/minifram/Makefile.in $(DISTDIR)/samples/minifram + cp $(SAMPDIR)/minifram/makefile.unx $(DISTDIR)/samples/minifram + cp $(SAMPDIR)/minifram/*.cpp $(DISTDIR)/samples/minifram + cp $(SAMPDIR)/minifram/*.h $(DISTDIR)/samples/minifram + cp $(SAMPDIR)/minifram/*.xpm $(DISTDIR)/samples/minifram + cp $(SAMPDIR)/minifram/bitmaps/*.xpm $(DISTDIR)/samples/minifram/bitmaps + + mkdir $(DISTDIR)/samples/minimal + cp $(SAMPDIR)/minimal/Makefile.in $(DISTDIR)/samples/minimal + cp $(SAMPDIR)/minimal/makefile.unx $(DISTDIR)/samples/minimal + cp $(SAMPDIR)/minimal/*.cpp $(DISTDIR)/samples/minimal + cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal + + mkdir $(DISTDIR)/samples/nettest + cp $(SAMPDIR)/nettest/Makefile.in $(DISTDIR)/samples/nettest + cp $(SAMPDIR)/nettest/*.cpp $(DISTDIR)/samples/nettest + + mkdir $(DISTDIR)/samples/newgrid + cp $(SAMPDIR)/newgrid/Makefile.in $(DISTDIR)/samples/newgrid + cp $(SAMPDIR)/newgrid/*.cpp $(DISTDIR)/samples/newgrid + cp $(SAMPDIR)/newgrid/*.h $(DISTDIR)/samples/newgrid + + mkdir $(DISTDIR)/samples/notebook + cp $(SAMPDIR)/notebook/Makefile.in $(DISTDIR)/samples/notebook + cp $(SAMPDIR)/notebook/*.cpp $(DISTDIR)/samples/notebook + cp $(SAMPDIR)/notebook/*.h $(DISTDIR)/samples/notebook + + mkdir $(DISTDIR)/samples/png + cp $(SAMPDIR)/png/Makefile.in $(DISTDIR)/samples/png + cp $(SAMPDIR)/png/*.cpp $(DISTDIR)/samples/png + cp $(SAMPDIR)/png/*.h $(DISTDIR)/samples/png + cp $(SAMPDIR)/png/*.png $(DISTDIR)/samples/png + + mkdir $(DISTDIR)/samples/resource + cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource + cp $(SAMPDIR)/resource/*.cpp $(DISTDIR)/samples/resource + cp $(SAMPDIR)/resource/*.h $(DISTDIR)/samples/resource + cp $(SAMPDIR)/resource/*.wxr $(DISTDIR)/samples/resource + + mkdir $(DISTDIR)/samples/richedit + cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit + cp $(SAMPDIR)/richedit/*.cpp $(DISTDIR)/samples/richedit + cp $(SAMPDIR)/richedit/*.h $(DISTDIR)/samples/richedit + 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/*.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/*.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/*.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/*.cpp $(DISTDIR)/samples/scroll + mkdir $(DISTDIR)/samples/scrollsub + cp $(SAMPDIR)/scrollsub/Makefile.in $(DISTDIR)/samples/scrollsub + cp $(SAMPDIR)/scrollsub/*.cpp $(DISTDIR)/samples/scrollsub + mkdir $(DISTDIR)/samples/splitter + cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter + cp $(SAMPDIR)/splitter/*.cpp $(DISTDIR)/samples/splitter + mkdir $(DISTDIR)/samples/text + cp $(SAMPDIR)/text/Makefile.in $(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/*.cpp $(DISTDIR)/samples/thread + mkdir $(DISTDIR)/samples/toolbar + cp $(SAMPDIR)/toolbar/Makefile.in $(DISTDIR)/samples/toolbar + cp $(SAMPDIR)/toolbar/*.cpp $(DISTDIR)/samples/toolbar + 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/*.cpp $(DISTDIR)/samples/treectrl + cp $(SAMPDIR)/treectrl/*.h $(DISTDIR)/samples/treectrl + cp $(SAMPDIR)/treectrl/*.xpm $(DISTDIR)/samples/treectrl + mkdir $(DISTDIR)/samples/typetest + cp $(SAMPDIR)/typetest/Makefile.in $(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/*.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/*.cpp $(DISTDIR)/samples/wizard + cp $(SAMPDIR)/wizard/*.xpm $(DISTDIR)/samples/wizard + mkdir $(DISTDIR)/samples/wxpoem + cp $(SAMPDIR)/wxpoem/Makefile.in $(DISTDIR)/samples/wxpoem + cp $(SAMPDIR)/wxpoem/*.cpp $(DISTDIR)/samples/wxpoem + cp $(SAMPDIR)/wxpoem/*.xpm $(DISTDIR)/samples/wxpoem + cp $(SAMPDIR)/wxpoem/*.dat $(DISTDIR)/samples/wxpoem + cp $(SAMPDIR)/wxpoem/*.txt $(DISTDIR)/samples/wxpoem + mkdir $(DISTDIR)/samples/wxsocket + cp $(SAMPDIR)/wxsocket/Makefile.in $(DISTDIR)/samples/wxsocket + cp $(SAMPDIR)/wxsocket/*.cpp $(DISTDIR)/samples/wxsocket + cp $(SAMPDIR)/wxsocket/*.xpm $(DISTDIR)/samples/wxsocket + +UTILS_DIST: + mkdir $(DISTDIR)/utils + cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils + + mkdir $(DISTDIR)/utils/wxMMedia2 + mkdir $(DISTDIR)/utils/wxMMedia2/lib + mkdir $(DISTDIR)/utils/wxMMedia2/sample + cp $(UTILSDIR)/wxMMedia2/Makefile.in $(DISTDIR)/utils/wxMMedia2 + cp $(UTILSDIR)/wxMMedia2/lib/Makefile.in $(DISTDIR)/utils/wxMMedia2/lib + cp $(UTILSDIR)/wxMMedia2/lib/*.h $(DISTDIR)/utils/wxMMedia2/lib + cp $(UTILSDIR)/wxMMedia2/lib/*.cpp $(DISTDIR)/utils/wxMMedia2/lib + cp $(UTILSDIR)/wxMMedia2/lib/*.def $(DISTDIR)/utils/wxMMedia2/lib + cp $(UTILSDIR)/wxMMedia2/sample/Makefile.in $(DISTDIR)/utils/wxMMedia2/sample + cp $(UTILSDIR)/wxMMedia2/sample/*.cpp $(DISTDIR)/utils/wxMMedia2/sample + + mkdir $(DISTDIR)/utils/glcanvas + mkdir $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR) + cp $(UTILSDIR)/glcanvas/Makefile.in $(DISTDIR)/utils/glcanvas + cp $(UTILSDIR)/glcanvas/docs/notes.txt $(DISTDIR)/utils/glcanvas/NOTES.txt + cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/Makefile.in $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR) + cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.h $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR) + cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.cpp $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR) + + mkdir $(DISTDIR)/utils/ogl + mkdir $(DISTDIR)/utils/ogl/src + cp $(UTILSDIR)/ogl/Makefile.in $(DISTDIR)/utils/ogl + cp $(UTILSDIR)/ogl/src/Makefile.in $(DISTDIR)/utils/ogl/src + cp $(UTILSDIR)/ogl/src/*.h $(DISTDIR)/utils/ogl/src + cp $(UTILSDIR)/ogl/src/*.cpp $(DISTDIR)/utils/ogl/src + +MISC_DIST: + mkdir $(DISTDIR)/misc + mkdir $(DISTDIR)/misc/afm + cp $(MISCDIR)/afm/*.afm $(DISTDIR)/misc/afm + mkdir $(DISTDIR)/misc/gs_afm + cp $(MISCDIR)/gs_afm/*.afm $(DISTDIR)/misc/gs_afm + +dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST MISC_DIST cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) .. + mv _dist_dir/wx$(TOOLKIT)/samples _dist_dir/wx$(TOOLKIT)/wxSamples + cd _dist_dir/wx$(TOOLKIT); tar ch wxSamples | gzip -f9 > $(WXSAMPLES); mv $(WXSAMPLES) ../.. $(RM) -r _dist_dir clean: - $(RM) ./src/msw/*.o - $(RM) ./src/gtk/*.o - $(RM) ./src/motif/*.o - $(RM) ./src/html/*.o - $(RM) ./src/common/*.o - $(RM) ./src/unix/*.o - $(RM) ./src/generic/*.o - $(RM) ./src/png/*.o - $(RM) ./src/jpeg/*.o - $(RM) ./src/zlib/*.o $(RM) *.o + $(RM) *.d $(RM) parser.c $(RM) lexer.c $(RM) ./lib/*