Added extra wxGLCanvas documentation from

[wxWidgets.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 203b0a236631d2f4d80bfc7fff802b243af38be6..498bc446f737c74f7a12a21b5dc52f94d4adf0cf 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 ##################################
@@ -331,7 +331,7 @@ $(build_libdir)/@WX_LIBRARY_NAME_SHARED@: $(OBJECTS)
 #     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_DIR) $(build_libdir)
-       $(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o $(EXTRALIBS) $(OPENGLLIBS)
+       $(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o $(EXTRALIBS) $(LDFLAGS_GL) $(OPENGLLIBS)
 
 $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@: $(MACRESOURCES)
        @$(INSTALL_DIR) $(build_libdir)
@@ -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)/*.l $(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
@@ -741,8 +739,11 @@ MOTIF_DIST: ALL_GUI_DIST
        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 $(X11DIR)/region.cpp \
+               $(DISTDIR)/src/x11
        cp $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \
+               $(X11INC)/bitmap.h $(X11INC)/private.h $(X11INC)/region.h \
                $(DISTDIR)/include/wx/x11
 
 MACX_DIST: ALL_GUI_DIST
@@ -1281,6 +1282,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