replaced "CC = gcc" and even stranger "CPP = gcc -g" (huh?) with

"CXX = $(shell wx-config --cxx)" in all makefile.unx git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-28 18:10:15 +00:00
parent 0a3e82894a
commit a6f762a646
69 changed files with 218 additions and 220 deletions
--- a/samples/calendar/makefile.unx
+++ b/samples/calendar/makefile.unx
@@ -1,7 +1,7 @@
 # Purpose: makefile for calendar example (Unix)
 # Created: 2000-01-03

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = calendar

@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean:
 	rm -f *.o $(PROGRAM)
--- a/samples/caret/makefile.unx
+++ b/samples/caret/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = caret

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/checklst/makefile.unx
+++ b/samples/checklst/makefile.unx
@@ -15,7 +15,7 @@

 PROGRAM = checklst

-CC = gcc
+CXX = $(shell wx-config --cxx)

 OBJECTS = $(PROGRAM).o

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/config/makefile.unx
+++ b/samples/config/makefile.unx
@@ -15,7 +15,7 @@

 PROGRAM = config

-CC = gcc
+CXX = $(shell wx-config --cxx)

 OBJECTS = $(PROGRAM).o

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/console/makefile.unx
+++ b/samples/console/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = console

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/controls/makefile.unx
+++ b/samples/controls/makefile.unx
@@ -15,7 +15,7 @@

 PROGRAM = controls

-CC = gcc
+CXX = $(shell wx-config --cxx)

 OBJECTS = $(PROGRAM).o

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/db/makefile.unx
+++ b/samples/db/makefile.unx
@@ -15,7 +15,7 @@

 PROGRAM = dbtest

-CC = gcc
+CXX = $(shell wx-config --cxx)

 OBJECTS = $(PROGRAM).o listdb.o

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o listdb.o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/dialogs/makefile.unx
+++ b/samples/dialogs/makefile.unx
@@ -15,7 +15,7 @@

 PROGRAM = dialogs

-CC = gcc
+CXX = $(shell wx-config --cxx)

 OBJECTS = $(PROGRAM).o

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/dialup/makefile.unx
+++ b/samples/dialup/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = nettest

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/dnd/makefile.unx
+++ b/samples/dnd/makefile.unx
@@ -15,7 +15,7 @@

 PROGRAM = dnd

-CC = gcc
+CXX = $(shell wx-config --cxx)

 OBJECTS = $(PROGRAM).o

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/docview/makefile.unx
+++ b/samples/docview/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = docview

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o view.o doc.o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/docvwmdi/makefile.unx
+++ b/samples/docvwmdi/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = docview

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o view.o doc.o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/dragimag/makefile.unx
+++ b/samples/dragimag/makefile.unx
@@ -1,7 +1,7 @@
 # Purpose: makefile for dragimag example (Unix)
 # Created: 2000-03-15

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = dragimag

@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean:
 	rm -f *.o $(PROGRAM)
--- a/samples/drawing/makefile.unx
+++ b/samples/drawing/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = drawing

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/dynamic/makefile.unx
+++ b/samples/dynamic/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = dynamic

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/erase/makefile.unx
+++ b/samples/erase/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = erase

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/event/makefile.unx
+++ b/samples/event/makefile.unx
@@ -1,7 +1,7 @@
 # Purpose: makefile for event example (Unix)
 # Created: 2001-01-31

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = event

@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean:
 	rm -f *.o $(PROGRAM)
--- a/samples/exec/makefile.unx
+++ b/samples/exec/makefile.unx
@@ -1,7 +1,7 @@
 # Purpose: makefile for exec example (Unix)
 # Created: 2000-03-14

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = exec

@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean:
 	rm -f *.o $(PROGRAM)
--- a/samples/font/makefile.unx
+++ b/samples/font/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = font

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/grid/makefile.unx
+++ b/samples/grid/makefile.unx
@@ -1,7 +1,7 @@
 # Purpose: makefile for grid example (Unix)
 # Created: 2000-03-15

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = grid

@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean:
 	rm -f *.o $(PROGRAM)
--- a/samples/help/makefile.unx
+++ b/samples/help/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = demo

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/image/makefile.unx
+++ b/samples/image/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = image

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/internat/makefile.unx
+++ b/samples/internat/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = internat

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/ipc/makefile.unx
+++ b/samples/ipc/makefile.unx
@@ -2,7 +2,7 @@
 # Created: 2000-03-14
 # hand hacked from template file by Ron <ron@debian.org>

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAMS = client server

@@ -11,15 +11,15 @@ PROGRAMS = client server
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all: $(PROGRAMS)

 client: client.o
-	$(CC) -o $@ $< `wx-config --libs`
+	$(CXX) -o $@ $< `wx-config --libs`

 server: server.o
-	$(CC) -o $@ $< `wx-config --libs`
+	$(CXX) -o $@ $< `wx-config --libs`

 clean:
 	rm -f *.o $(PROGRAMS)
--- a/samples/joytest/makefile.unx
+++ b/samples/joytest/makefile.unx
@@ -1,7 +1,7 @@
 # Purpose: makefile for joytest example (Unix)
 # Created: 2000-03-14

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = joytest

@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean:
 	rm -f *.o $(PROGRAM)
--- a/samples/layout/makefile.unx
+++ b/samples/layout/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = layout

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/listctrl/makefile.unx
+++ b/samples/listctrl/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = listtest

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/mdi/makefile.unx
+++ b/samples/mdi/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = mdi

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/memcheck/makefile.unx
+++ b/samples/memcheck/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = memcheck

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/menu/makefile.unx
+++ b/samples/menu/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = menu

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/minifram/makefile.unx
+++ b/samples/minifram/makefile.unx
@@ -1,7 +1,7 @@
 # Purpose: makefile for minifram example (Unix)
 # Created: 2000-03-15

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = minifram

@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean:
 	rm -f *.o $(PROGRAM)
--- a/samples/minimal/makefile.unx
+++ b/samples/minimal/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = minimal

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/newgrid/makefile.unx
+++ b/samples/newgrid/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = griddemo

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/notebook/makefile.unx
+++ b/samples/notebook/makefile.unx
@@ -1,7 +1,7 @@
 # Purpose: makefile for notebook example (Unix)
 # Created: 2000-03-15

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = notebook

@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean:
 	rm -f *.o $(PROGRAM)
--- a/samples/opengl/cube/makefile.unx
+++ b/samples/opengl/cube/makefile.unx
@@ -15,7 +15,7 @@ OPENGL_LIBS=-lGL -lGLU

 PROGRAM=cube

-CC = gcc
+CXX = $(shell wx-config --cxx)

 OBJECTS = $(PROGRAM).o

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` -lwx_gtk_gl $(OPENGL_LIBS)
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` -lwx_gtk_gl $(OPENGL_LIBS)

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/opengl/isosurf/makefile.unx
+++ b/samples/opengl/isosurf/makefile.unx
@@ -15,7 +15,7 @@ OPENGL_LIBS=-lGL -lGLU

 PROGRAM=isosurf

-CC = gcc
+CXX = $(shell wx-config --cxx)

 OBJECTS = $(PROGRAM).o

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all: $(PROGRAM) isosurf.dat

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` -lwx_gtk_gl $(OPENGL_LIBS)
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` -lwx_gtk_gl $(OPENGL_LIBS)

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/opengl/penguin/makefile.unx
+++ b/samples/opengl/penguin/makefile.unx
@@ -12,7 +12,7 @@ OPENGL_LIBS=-lGL -lGLU
 #OPENGL_LIBS=-lMesaGL -lMesaGLU

 CPP = g++
-CC = gcc
+CXX = $(shell wx-config --cxx)

 Penguin: penguin.o trackball.o lw.o
 	$(CPP) -o Penguin \
@@ -26,7 +26,7 @@ lw.o: lw.cpp
 	$(CPP) `wx-config --cxxflags` -I../../gtk -c lw.cpp

 trackball.o: trackball.c
-	$(CC) `wx-config --cxxflags` -I../../gtk -c trackball.c
+	$(CXX) `wx-config --cxxflags` -I../../gtk -c trackball.c

 clean: 
 	rm -f *.o Penguin
--- a/samples/png/makefile.unx
+++ b/samples/png/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = pngdemo

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/printing/makefile.unx
+++ b/samples/printing/makefile.unx
@@ -13,16 +13,16 @@
 # under Linux.
 #

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = printing

 $(PROGRAM): $(PROGRAM).o
-	$(CC) -o $(PROGRAM) \
+	$(CXX) -o $(PROGRAM) \
 	$(PROGRAM).o `wx-config --libs`

 $(PROGRAM).o: $(PROGRAM).cpp
-	$(CC) `wx-config --cxxflags` -c $(PROGRAM).cpp
+	$(CXX) `wx-config --cxxflags` -c $(PROGRAM).cpp

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/proplist/makefile.unx
+++ b/samples/proplist/makefile.unx
@@ -1,7 +1,7 @@
 # Purpose: makefile for proplist example (Unix)
 # Created: 2000-03-15

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = proplist

@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean:
 	rm -f *.o $(PROGRAM)
--- a/samples/propsize/makefile.unx
+++ b/samples/propsize/makefile.unx
@@ -1,7 +1,7 @@
 # Purpose: makefile for propsize example (Unix)
 # Created: 2000-03-14

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = propsize

@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean:
 	rm -f *.o $(PROGRAM)
--- a/samples/resource/makefile.unx
+++ b/samples/resource/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = resource

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/richedit/makefile.unx
+++ b/samples/richedit/makefile.unx
@@ -2,7 +2,7 @@
 # Created: 2000-03-14
 # hand hacked from template file by Ron <ron@debian.org>

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = wxLayout

@@ -13,10 +13,10 @@ OBJECTS = $(PROGRAM).o kbList.o wxllist.o wxlparser.o wxlwindow.o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 $(PROGRAM): $(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 	
 clean:
 	rm -f *.o $(PROGRAM)
--- a/samples/rotate/makefile.unx
+++ b/samples/rotate/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = rotate

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/sashtest/makefile.unx
+++ b/samples/sashtest/makefile.unx
@@ -1,7 +1,7 @@
 # Purpose: makefile for sashtest example (Unix)
 # Created: 2000-03-14

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = sashtest

@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean:
 	rm -f *.o $(PROGRAM)
--- a/samples/scroll/makefile.unx
+++ b/samples/scroll/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = scroll

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/scrollsub/makefile.unx
+++ b/samples/scrollsub/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = scrollsub

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/sockets/makefile.unx
+++ b/samples/sockets/makefile.unx
@@ -2,7 +2,7 @@
 # Created: 2000-03-14
 # hand hacked from template file by Ron <ron@debian.org>

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAMS = client server

@@ -11,15 +11,15 @@ PROGRAMS = client server
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all: $(PROGRAMS)

 client: client.o
-	$(CC) -o $@ $< `wx-config --libs`
+	$(CXX) -o $@ $< `wx-config --libs`

 server: server.o
-	$(CC) -o $@ $< `wx-config --libs`
+	$(CXX) -o $@ $< `wx-config --libs`

 clean:
 	rm -f *.o $(PROGRAMS)
--- a/samples/splitter/makefile.unx
+++ b/samples/splitter/makefile.unx
@@ -1,7 +1,7 @@
 # Purpose: makefile for splitter example (Unix)
 # Created: 2000-03-15

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = splitter

@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean:
 	rm -f *.o $(PROGRAM)
--- a/samples/statbar/makefile.unx
+++ b/samples/statbar/makefile.unx
@@ -1,7 +1,7 @@
 # Purpose: makefile for statbar example (Unix)
 # Created: 2000-02-04

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = statbar

@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean:
 	rm -f *.o $(PROGRAM)
--- a/samples/tab/makefile.unx
+++ b/samples/tab/makefile.unx
@@ -1,7 +1,7 @@
 # Purpose: makefile for tab example (Unix)
 # Created: 2000-03-15

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = tab

@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean:
 	rm -f *.o $(PROGRAM)
--- a/samples/text/makefile.unx
+++ b/samples/text/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = text

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean: 
 	rm -f *.o $(PROGRAM)
--- a/samples/thread/makefile.unx
+++ b/samples/thread/makefile.unx
@@ -1,7 +1,7 @@
 # Purpose: makefile for thread example (Unix)
 # Created: 2000-03-15

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = thread

@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean:
 	rm -f *.o $(PROGRAM)
--- a/samples/toolbar/makefile.unx
+++ b/samples/toolbar/makefile.unx
@@ -1,7 +1,7 @@
 # Purpose: makefile for toolbar example (Unix)
 # Created: 2000-03-14

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = toolbar

@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean:
 	rm -f *.o $(PROGRAM)
--- a/samples/treectrl/makefile.unx
+++ b/samples/treectrl/makefile.unx
@@ -1,7 +1,7 @@
 # Purpose: makefile for treectrl example (Unix)
 # Created: 2000-03-15

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = treectrl

@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean:
 	rm -f *.o $(PROGRAM)
--- a/samples/treelay/makefile.unx
+++ b/samples/treelay/makefile.unx
@@ -1,7 +1,7 @@
 # Purpose: makefile for treelay example (Unix)
 # Created: 2000-03-15

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = treelay

@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean:
 	rm -f *.o $(PROGRAM)
--- a/samples/typetest/makefile.unx
+++ b/samples/typetest/makefile.unx
@@ -1,7 +1,7 @@
 # Purpose: makefile for typetest example (Unix)
 # Created: 2000-03-14

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = typetest

@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean:
 	rm -f *.o $(PROGRAM)
--- a/samples/validate/makefile.unx
+++ b/samples/validate/makefile.unx
@@ -1,7 +1,7 @@
 # Purpose: makefile for validate example (Unix)
 # Created: 2000-03-14

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = validate

@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean:
 	rm -f *.o $(PROGRAM)
--- a/samples/wizard/makefile.unx
+++ b/samples/wizard/makefile.unx
@@ -1,7 +1,7 @@
 # Purpose: makefile for wizard example (Unix)
 # Created: 2000-03-15

-CC = gcc
+CXX = $(shell wx-config --cxx)

 PROGRAM = wizard

@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp

 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<

 all:    $(PROGRAM)

 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 clean:
 	rm -f *.o $(PROGRAM)