merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

samples/joytest/Makefile.in

@@ -1,18 +1,12 @@
-#
-# File:		makefile.unx
-# Author:	Julian Smart
-# Created:	1998
-# Updated:	
-# Copyright:	(c) 1998 Julian Smart
-#
-# "%W% %G%"
-#
-# Makefile for joytest example (UNIX).
+# Purpose: makefile for joytest example (UNIX).
+# Created: 2000-03-14
 
 top_srcdir = @top_srcdir@/..
 top_builddir = ../..
 program_dir = samples/joytest
 
+DATAFILES=gun.wav
+
 PROGRAM=joytest
 
 OBJECTS=$(PROGRAM).o

samples/joytest/makefile.g95

@@ -6,5 +6,5 @@ WXDIR = ../..
 TARGET=joytest
 OBJECTS = $(TARGET).o
 
-include $(WXDIR)\src\makeprog.g95
+include $(WXDIR)/src/makeprog.g95