X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/39989a809365a18a4ed98828837f8d51fe38be4e..29865cc3b9875fae2ca915030fc562e7018c24f5:/Makefile.in diff --git a/Makefile.in b/Makefile.in index e4e37c9151..498bc446f7 100644 --- 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 @@ -112,6 +112,7 @@ MOTIFDIR = $(WXDIR)/src/motif MSWDIR = $(WXDIR)/src/msw PMDIR = $(WXDIR)/src/os2 MACDIR = $(WXDIR)/src/mac +COCOADIR = $(WXDIR)/src/cocoa ODBCDIR = $(WXDIR)/src/iodbc FTDIR = $(WXDIR)/src/freetype INCDIR = $(WXDIR)/include @@ -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) @@ -630,15 +631,12 @@ ALL_GUI_DIST: ALL_DIST mkdir $(DISTDIR)/src/png mkdir $(DISTDIR)/src/jpeg mkdir $(DISTDIR)/src/tiff - mkdir $(DISTDIR)/src/iodbc mkdir $(DISTDIR)/src/unix cp $(SRCDIR)/*.in $(DISTDIR)/src 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 @@ -655,6 +653,7 @@ 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 @@ -740,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 @@ -758,6 +760,10 @@ MACX_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/src/mac/macsock cp $(MACDIR)/macsock/*.lib $(DISTDIR)/src/mac/macsock +# TODO: Distribute some files +COCOA_DIST: ALL_GUI_DIST + cp $(COCOADIR)/*.mm $(DISTDIR)/src/cocoa + MSW_DIST: ALL_GUI_DIST cp $(WXDIR)/wxWINE.spec $(DISTDIR) mkdir $(DISTDIR)/include/wx/msw/ctl3d @@ -1017,7 +1023,7 @@ SAMPLES_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/samples/grid cp $(SAMPDIR)/grid/Makefile.in $(DISTDIR)/samples/grid cp $(SAMPDIR)/grid/makefile.unx $(DISTDIR)/samples/grid - cp $(SAMPDIR)/grid/*.cpp $(DISTDIR)/samples/grid + cp $(SAMPDIR)/grid/*.cpp $(SAMPDIR)/grid/*.h $(DISTDIR)/samples/grid mkdir $(DISTDIR)/samples/help mkdir $(DISTDIR)/samples/help/doc @@ -1184,12 +1190,6 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/dialup/makefile.unx $(DISTDIR)/samples/dialup cp $(SAMPDIR)/dialup/*.cpp $(DISTDIR)/samples/dialup - mkdir $(DISTDIR)/samples/newgrid - cp $(SAMPDIR)/newgrid/Makefile.in $(DISTDIR)/samples/newgrid - cp $(SAMPDIR)/newgrid/makefile.unx $(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/makefile.unx $(DISTDIR)/samples/notebook @@ -1232,12 +1232,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 @@ -1254,11 +1254,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 @@ -1282,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 @@ -1325,11 +1332,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