support Show() in wxFlexGridSizer (patch 737850)

[wxWidgets.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 95f384e6c47d83892472632351265d42b1fefb93..dfddd1749cdaf9aa0cbafbc113a69b8b50161ee1 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -286,22 +286,22 @@ TIFFOBJS = \
                tif_write.o \
                tif_zip.o
 
-# IODBCOBJS = \
-#              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
+IODBCOBJS = \
+               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
 
 
 ############################## Rules ##################################
@@ -410,6 +410,7 @@ win32install: preinstall
        $(INSTALL_DATA) $(top_srcdir)/include/wx/msw/*.cur \
                        $(top_srcdir)/include/wx/msw/*.ico \
                        $(top_srcdir)/include/wx/msw/*.bmp \
+                       $(top_srcdir)/include/wx/msw/wx.manifest \
                        $(top_srcdir)/include/wx/msw/wx.rc \
                                $(includedir)/wx/msw
        $(INSTALL_DATA) $(top_srcdir)/include/wx/msw/gnuwin32/*.h $(includedir)/wx/msw/gnuwin32
@@ -740,9 +741,10 @@ MOTIF_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/src/x11
        mkdir $(DISTDIR)/include/wx/x11
        cp $(X11DIR)/pen.cpp $(X11DIR)/brush.cpp $(X11DIR)/utilsx.cpp \
-               $(X11DIR)/bitmap.cpp $(DISTDIR)/src/x11
+               $(X11DIR)/bitmap.cpp $(X11DIR)/region.cpp \
+               $(DISTDIR)/src/x11
        cp $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \
-               $(X11INC)/bitmap.h $(X11INC)/private.h \
+               $(X11INC)/bitmap.h $(X11INC)/private.h $(X11INC)/region.h \
                $(DISTDIR)/include/wx/x11
 
 MACX_DIST: ALL_GUI_DIST
@@ -1281,6 +1283,13 @@ SAMPLES_DIST: ALL_GUI_DIST
        cp $(SAMPDIR)/scrollsub/makefile.unx $(DISTDIR)/samples/scrollsub
        cp $(SAMPDIR)/scrollsub/*.cpp $(DISTDIR)/samples/scrollsub
 
+       mkdir $(DISTDIR)/samples/shaped
+       cp $(SAMPDIR)/shaped/Makefile.in $(DISTDIR)/samples/shaped
+       cp $(SAMPDIR)/shaped/makefile.unx $(DISTDIR)/samples/shaped
+       cp $(SAMPDIR)/shaped/*.cpp $(DISTDIR)/samples/shaped
+       cp $(SAMPDIR)/shaped/*.h $(DISTDIR)/samples/shaped
+       cp $(SAMPDIR)/shaped/*.png $(DISTDIR)/samples/shaped
+
        mkdir $(DISTDIR)/samples/sockets
        cp $(SAMPDIR)/sockets/Makefile.in $(DISTDIR)/samples/sockets
        cp $(SAMPDIR)/sockets/makefile.unx $(DISTDIR)/samples/sockets