Fixed dist target; added relevant wxX11 files to wxMotif.

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

diff --git a/Makefile.in b/Makefile.in
index c88383a0b90d4e2401164fc45d60de2f25c588a7..95f384e6c47d83892472632351265d42b1fefb93 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -636,9 +636,7 @@ ALL_GUI_DIST: ALL_DIST
        cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common
        cp $(COMMDIR)/*.c $(DISTDIR)/src/common
        cp $(COMMDIR)/*.inc $(DISTDIR)/src/common
        cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common
        cp $(COMMDIR)/*.c $(DISTDIR)/src/common
        cp $(COMMDIR)/*.inc $(DISTDIR)/src/common

-       cp $(COMMDIR)/*.l $(DISTDIR)/src/common

        cp $(COMMDIR)/*.h $(DISTDIR)/src/common
        cp $(COMMDIR)/*.h $(DISTDIR)/src/common

-       cp $(COMMDIR)/*.y $(DISTDIR)/src/common

        cp $(COMMDIR)/*.mms $(DISTDIR)/src/common
        cp $(UNIXDIR)/*.c $(DISTDIR)/src/unix
        cp $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix
        cp $(COMMDIR)/*.mms $(DISTDIR)/src/common
        cp $(UNIXDIR)/*.c $(DISTDIR)/src/unix
        cp $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix


@@ -741,8 +739,10 @@ MOTIF_DIST: ALL_GUI_DIST
        cp $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo
        mkdir $(DISTDIR)/src/x11
        mkdir $(DISTDIR)/include/wx/x11
        cp $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo
        mkdir $(DISTDIR)/src/x11
        mkdir $(DISTDIR)/include/wx/x11

-       cp $(X11DIR)/pen.cpp $(X11DIR)/brush.cpp $(DISTDIR)/src/x11
+       cp $(X11DIR)/pen.cpp $(X11DIR)/brush.cpp $(X11DIR)/utilsx.cpp \
+               $(X11DIR)/bitmap.cpp $(DISTDIR)/src/x11

        cp $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \
        cp $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \

+               $(X11INC)/bitmap.h $(X11INC)/private.h \

                $(DISTDIR)/include/wx/x11
 
 MACX_DIST: ALL_GUI_DIST
                $(DISTDIR)/include/wx/x11
 
 MACX_DIST: ALL_GUI_DIST

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index c09c60b9138934af076674920e9d940a7f89f4a4..0e432db71cc76e75689abf05ff620b0c74317b64 100644 (file)
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -1314,6 +1314,7 @@ palette.h X11H
 pen.h  X11H    Motif
 print.h        X11H
 private.h      X11H
 pen.h  X11H    Motif
 print.h        X11H
 private.h      X11H

+privx.h        X11H    Motif

 region.h       X11H
 reparent.h     X11H
 textctrl.h     X11H
 region.h       X11H
 reparent.h     X11H
 textctrl.h     X11H