X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c4c3659cf2b1fc4ad90467c9b8d5f180d52908e9..5d8f5f875eaf8b32dee93acec5664b4fc9c93ff7:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 8b1e501dc9..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
@@ -18,7 +18,7 @@ include ./src/make.env
 #     implicit rules (%.o: %.c) because they are more portable, in
 #     particular the BSD make understands the former but not the
 #     latter
-.SUFFIXES: .o .c .cpp .cxx .rsrc .r
+.SUFFIXES: .o .c .cpp .cxx .rsrc .r .mm
 
 .c.o:
 	$(CC) -c $(CFLAGS) $(PICFLAGS) -o $@ $<
@@ -29,6 +29,10 @@ include ./src/make.env
 .cxx.o:
 	$(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
 
+# Objective-C++, right now just use CXXFLAGS
+.mm.o:
+	$(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
+
 .rsrc.r:
 	$(DEREZ) $^ Carbon.r -useDF > $@
 
@@ -73,6 +77,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL@
+INSTALL_DIR = @INSTALL_DIR@
 
 build_alias = @build_alias@
 build_triplet = @build@
@@ -101,11 +106,13 @@ ZLIBDIR  = $(WXDIR)/src/zlib
 REGEXDIR = $(WXDIR)/src/regex
 GTKDIR   = $(WXDIR)/src/gtk
 X11DIR   = $(WXDIR)/src/x11
+X11INC   = $(WXDIR)/include/wx/x11
 MGLDIR   = $(WXDIR)/src/mgl
 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
@@ -305,29 +312,29 @@ SONAME_FLAGS_GL = @SONAME_FLAGS_GL@
 all: @WX_ALL@
 
 $(build_libdir)/@WX_LIBRARY_NAME_STATIC@: $(OBJECTS)
-	@$(INSTALL) -d $(build_libdir)
+	@$(INSTALL_DIR) $(build_libdir)
 	@$(RM) $@
 	$(AR) $(AROPTIONS) $@ $(OBJECTS)
 	$(RANLIB) $@
 
 $(build_libdir)/@WX_LIBRARY_NAME_STATIC_GL@: glcanvas.o
-	@$(INSTALL) -d $(build_libdir)
+	@$(INSTALL_DIR) $(build_libdir)
 	@$(RM) $@
 	$(AR) $(AROPTIONS) $@ glcanvas.o
 	$(RANLIB) $@
 
 $(build_libdir)/@WX_LIBRARY_NAME_SHARED@: $(OBJECTS)
-	@$(INSTALL) -d $(build_libdir)
+	@$(INSTALL_DIR) $(build_libdir)
 	$(SHARED_LD) $@ $(SONAME_FLAGS) $(OBJECTS) $(EXTRALIBS)
 
 # NB: we used to have "-L$(build_libdir) @WXCONFIG_LIBS@" in the SHARED_LD line
 #     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) -d $(build_libdir)
-	$(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o $(EXTRALIBS) $(OPENGLLIBS)
+	@$(INSTALL_DIR) $(build_libdir)
+	$(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o $(EXTRALIBS) $(LDFLAGS_GL) $(OPENGLLIBS)
 
 $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@: $(MACRESOURCES)
-	@$(INSTALL) -d $(build_libdir)
+	@$(INSTALL_DIR) $(build_libdir)
 	$(RESCOMP) -d __UNIX__ -useDF $^ -o $@
 
 $(build_libdir)/@WX_LIBRARY_LINK1@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
@@ -384,25 +391,29 @@ CREATE_INSTALLED_LINKS_GL: preinstall_gl
 		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@
 
 afminstall: preinstall
-	@if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi
-	$(INSTALL) -d $(datadir)/wx
-	$(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)
-	$(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/afm
-	$(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/gs_afm
+	@if test ! -d $(datadir); then $(INSTALL_DIR) $(datadir); fi
+	$(INSTALL_DIR) $(datadir)/wx
+	$(INSTALL_DIR) $(datadir)/wx/$(VER_MAJMIN)
+	$(INSTALL_DIR) $(datadir)/wx/$(VER_MAJMIN)/afm
+	$(INSTALL_DIR) $(datadir)/wx/$(VER_MAJMIN)/gs_afm
 	$(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/afm
 	$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/gs_afm
 
 m4datainstall: preinstall
-	$(INSTALL) -d $(datadir)/aclocal
+	$(INSTALL_DIR) $(datadir)/aclocal
 	$(INSTALL_DATA) $(top_srcdir)/wxwin.m4 $(datadir)/aclocal
 
 win32install: preinstall
-	$(INSTALL) -d $(includedir)/wx/msw
+	$(INSTALL_DIR) $(includedir)/wx/msw
+	$(INSTALL_DIR) $(includedir)/wx/msw/gnuwin32
+	$(INSTALL_DIR) $(includedir)/wx/msw/gnuwin32/gl
 	$(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.rc \
 				$(includedir)/wx/msw
+	$(INSTALL_DATA) $(top_srcdir)/include/wx/msw/gnuwin32/*.h $(includedir)/wx/msw/gnuwin32
+	$(INSTALL_DATA) $(top_srcdir)/include/wx/msw/gnuwin32/gl/*.h $(includedir)/wx/msw/gnuwin32/gl
 
 # this is the real install target: copies the library, wx-config and the
 # headers to the installation directory
@@ -411,9 +422,9 @@ preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAM
 	@echo " Installing wxWindows..."
 	@echo " "
 
-	@if test ! -d $(prefix); then $(INSTALL) -d $(prefix); fi
-	@if test ! -d $(bindir); then $(INSTALL) -d $(bindir); fi
-	@if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
+	@if test ! -d $(prefix); then $(INSTALL_DIR) $(prefix); fi
+	@if test ! -d $(bindir); then $(INSTALL_DIR) $(bindir); fi
+	@if test ! -d $(libdir); then $(INSTALL_DIR) $(libdir); fi
 
 	$(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config
 	cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config
@@ -421,36 +432,37 @@ preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAM
 	@if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \
 		$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi
 
-	$(INSTALL) -d $(libdir)/wx
-	$(INSTALL) -d $(libdir)/wx/include
-	$(INSTALL) -d $(libdir)/wx/include/univ
-	$(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@
-	$(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx
+	$(INSTALL_DIR) $(libdir)/wx
+	$(INSTALL_DIR) $(libdir)/wx/include
+	$(INSTALL_DIR) $(libdir)/wx/include/univ
+	$(INSTALL_DIR) $(libdir)/wx/include/@TOOLCHAIN_NAME@
+	$(INSTALL_DIR) $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx
 	$(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \
                     $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
 
-	$(INSTALL) -d $(includedir)/wx
+	$(INSTALL_DIR) $(includedir)/wx
 	@# FIXME: This will erroneously install a wx/base dir for wxBase..
-	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
-	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
-	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi
-	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/univ; fi
-	@if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL) -d $(includedir)/wx/msw/ole; fi
+	@if test "$(USE_GUI)" = 1; then $(INSTALL_DIR) $(includedir)/wx/@TOOLKIT_DIR@; fi
+	@if test "$(USE_GUI)" = 1; then $(INSTALL_DIR) $(includedir)/wx/html; fi
+	@if test "$(USE_GUI)" = 1; then $(INSTALL_DIR) $(includedir)/wx/generic; fi
+	@if test "$(USE_GUI)" = 1; then $(INSTALL_DIR) $(includedir)/wx/univ; fi
+	@if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL_DIR) $(includedir)/wx/msw/ole; fi
+	@if test "@TOOLKIT_DIR@" = "motif"; then $(INSTALL_DIR) $(includedir)/wx/x11; fi
 
 	@# always install msw headers for wxBase, it's much simpler
-	@if test "$(USE_GUI)" = 0; then $(INSTALL) -d $(includedir)/wx/msw; fi
+	@if test "$(USE_GUI)" = 0; then $(INSTALL_DIR) $(includedir)/wx/msw; fi
 
-	$(INSTALL) -d $(includedir)/wx/protocol
-	$(INSTALL) -d $(includedir)/wx/unix
+	$(INSTALL_DIR) $(includedir)/wx/protocol
+	$(INSTALL_DIR) $(includedir)/wx/unix
 	@list='$(HEADERS)'; for p in $$list; do \
 	  $(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \
 	  echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
 	done
 
-	@if test ! -d $(localedir); then $(INSTALL) -d $(localedir); fi
+	@if test ! -d $(localedir); then $(INSTALL_DIR) $(localedir); fi
 	@for p in $(WX_LINGUAS); do \
-	  if test ! -d $(localedir)/$$p; then $(INSTALL) -d $(localedir)/$$p; fi;\
-	  if test ! -d $(localedir)/$$p/LC_MESSAGES; then $(INSTALL) -d $(localedir)/$$p/LC_MESSAGES; fi;\
+	  if test ! -d $(localedir)/$$p; then $(INSTALL_DIR) $(localedir)/$$p; fi;\
+	  if test ! -d $(localedir)/$$p/LC_MESSAGES; then $(INSTALL_DIR) $(localedir)/$$p/LC_MESSAGES; fi;\
 	  $(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo; \
 	  echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \
 	done
@@ -459,7 +471,7 @@ preinstall_res: $(build_libdir)/@WX_RESOURCES_MACOSX_ASCII@ $(build_libdir)/@WX_
 	@echo " "
 	@echo " Installing wxWindows Mac resource ..."
 	@echo " "
-	@if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
+	@if test ! -d $(libdir); then $(INSTALL_DIR) $(libdir); fi
 	$(INSTALL_PROGRAM) $(build_libdir)/@WX_RESOURCES_MACOSX_ASCII@ $(libdir)/@WX_RESOURCES_MACOSX_ASCII@
 	$(INSTALL_PROGRAM) $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@ $(libdir)/@WX_RESOURCES_MACOSX_DATA@
 
@@ -467,7 +479,7 @@ preinstall_gl: $(build_libdir)/@WX_TARGET_LIBRARY_GL@
 	@echo " "
 	@echo " Installing wxWindows OpenGl add-on..."
 	@echo " "
-	@if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
+	@if test ! -d $(libdir); then $(INSTALL_DIR) $(libdir); fi
 	@INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@
 
 install: @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall @WIN32INSTALL@
@@ -506,6 +518,7 @@ uninstall:
 	@-rmdir $(datadir)/wx/$(VER_MAJMIN)/afm
 	@-rmdir $(datadir)/wx/$(VER_MAJMIN)
 	@-rmdir $(datadir)/wx
+	@$(RM) $(datadir)/aclocal/wxwin.m4
 	@echo " Removing headers..."
 	@list='$(HEADERS)'; for p in $$list; do \
 	  $(RM) $(includedir)/wx/$$p; \
@@ -618,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
@@ -643,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
@@ -726,6 +737,14 @@ MOTIF_DIST: ALL_GUI_DIST
 	cp $(MOTIFDIR)/xmcombo/*.c $(DISTDIR)/src/motif/xmcombo
 	cp $(MOTIFDIR)/xmcombo/*.h $(DISTDIR)/src/motif/xmcombo
 	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 $(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
 	cp $(INCDIR)/*.* $(DISTDIR)/include
@@ -741,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
@@ -767,6 +790,8 @@ MSW_DIST: ALL_GUI_DIST
 	cp $(MSWDIR)/*.def $(DISTDIR)/src/msw
 	cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
 	cp $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince
+	mkdir $(DISTDIR)/contrib
+	cp -R $(WXDIR)/contrib $(DISTDIR)
 
 MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
 	cp $(WXDIR)/wxWINE.spec $(DISTDIR)
@@ -998,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
@@ -1063,18 +1088,20 @@ SAMPLES_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/samples/internat
 	mkdir $(DISTDIR)/samples/internat/de
 	mkdir $(DISTDIR)/samples/internat/fr
+	mkdir $(DISTDIR)/samples/internat/ju
 	mkdir $(DISTDIR)/samples/internat/ru
 	cp $(SAMPDIR)/internat/Makefile.in $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/makefile.unx $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/*.cpp $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/*.xpm $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/*.txt $(DISTDIR)/samples/internat
-	cp $(SAMPDIR)/internat/*.po $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/fr/*.mo $(DISTDIR)/samples/internat/fr
 	cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
+	cp $(SAMPDIR)/internat/ja/*.mo $(DISTDIR)/samples/internat/ja
 	cp $(SAMPDIR)/internat/ru/*.mo $(DISTDIR)/samples/internat/ru
 	cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr
 	cp $(SAMPDIR)/internat/de/*.po $(DISTDIR)/samples/internat/de
+	cp $(SAMPDIR)/internat/ja/*.po $(DISTDIR)/samples/internat/ja
 	cp $(SAMPDIR)/internat/ru/*.po $(DISTDIR)/samples/internat/ru
 
 	mkdir $(DISTDIR)/samples/ipc
@@ -1163,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
@@ -1211,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
@@ -1233,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
@@ -1261,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
@@ -1304,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