]> git.saurik.com Git - wxWidgets.git/blobdiff - Makefile.in
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
support Show() in wxFlexGridSizer (patch 737850)
[wxWidgets.git] / Makefile.in
diff --git a/Makefile.in b/Makefile.in
index 95aaa8ac0aab904ae4132ed762d51f744246c3c1..dfddd1749cdaf9aa0cbafbc113a69b8b50161ee1 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,7 +4,7 @@
 # Author:   Julian Smart, Robert Roebling, Vadim Zeitlin, Ron Lee
 # Created:  1993
 # Version:  $Id$
-# Copyright:(c) 1993, AIAI, University of Edinburgh,
+# Copyright:,
 # Copyright:(c) 1999, Vadim Zeitlin
 # Copyright:(c) 1999, Robert Roebling
 # Copyright:(c) 2001, Ron Lee
@@ -51,12 +51,13 @@ VP7 = @top_srcdir@/src/jpeg
 VP8 = @top_srcdir@/src/tiff
 VP9 = @top_srcdir@/src/zlib
 VPA = @top_srcdir@/src/regex
-VP10 = @top_srcdir@/src/msw/ole
+VP10 = @top_srcdir@/src/iodbc
+VP11 = @top_srcdir@/src/msw/ole
 
 # 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@$(VPA)@PATH_IFS@$(VP10) # ':' 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) # ':' for autoconf
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -112,7 +113,7 @@ MSWDIR   = $(WXDIR)/src/msw
 PMDIR    = $(WXDIR)/src/os2
 MACDIR   = $(WXDIR)/src/mac
 COCOADIR = $(WXDIR)/src/cocoa
-# ODBCDIR  = $(WXDIR)/src/iodbc
+ODBCDIR  = $(WXDIR)/src/iodbc
 FTDIR    = $(WXDIR)/src/freetype
 INCDIR   = $(WXDIR)/include
 SAMPDIR  = $(WXDIR)/samples
@@ -285,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 ##################################
@@ -330,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)
@@ -409,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
@@ -635,9 +637,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
@@ -654,14 +654,14 @@ ALL_GUI_DIST: ALL_DIST
        cp $(TIFFDIR)/*.h $(DISTDIR)/src/tiff
        cp $(TIFFDIR)/*.c $(DISTDIR)/src/tiff
        cp $(TIFFDIR)/README $(DISTDIR)/src/tiff
-       #mkdir $(DISTDIR)/src/iodbc
-       #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
+       mkdir $(DISTDIR)/src/iodbc
+       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
 
 BASE_DIST: ALL_DIST
        # make --disable-gui the default
@@ -740,8 +740,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
@@ -1230,12 +1233,12 @@ SAMPLES_DIST: ALL_GUI_DIST
        cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing
        cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing
 
-       mkdir $(DISTDIR)/samples/resource
-       cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource
-       cp $(SAMPDIR)/resource/makefile.unx $(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/resource
+#      cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource
+#      cp $(SAMPDIR)/resource/makefile.unx $(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/rotate
        cp $(SAMPDIR)/rotate/Makefile.in $(DISTDIR)/samples/rotate
@@ -1252,11 +1255,11 @@ SAMPLES_DIST: ALL_GUI_DIST
        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/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
@@ -1280,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
@@ -1323,11 +1333,11 @@ SAMPLES_DIST: ALL_GUI_DIST
        cp $(SAMPDIR)/treectrl/*.h $(DISTDIR)/samples/treectrl
        cp $(SAMPDIR)/treectrl/*.xpm $(DISTDIR)/samples/treectrl
 
-       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/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
wxWidgets (Impactor)