update from Jonas for 2.5.1 (patch 901921)

[wxWidgets.git] / samples / grid / makefile.unx

diff --git a/samples/grid/makefile.unx b/samples/grid/makefile.unx
index 3c5fee199ed08b734a466d4314c0f5068847b680..b0bb5f0ebe71efc9ef8b4e3c7406a950372a1684 100644 (file)
--- a/samples/grid/makefile.unx
+++ b/samples/grid/makefile.unx
@@ -1,19 +1,7 @@
-#
-# File:                Makefile for samples
-# Author:      Robert Roebling
-# Created:     1999
-# Updated:     
-# Copyright:   (c) 1998 Robert Roebling
-#
-# This makefile requires a Unix version of wxWindows
-# to be installed on your system. This is most often
-# done typing "make install" when using the complete
-# sources of wxWindows or by installing the two
-# RPM packages wxGTK.XXX.rpm and wxGTK-devel.XXX.rpm
-# under Linux.
-#
-
-CC = gcc
+# Purpose: makefile for grid example (Unix)
+# Created: 2000-03-15
+
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = grid
 
@@ -24,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:     .o .cpp
 
 .cpp.o :
-       $(CC) -c `wx-config --cflags` -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: 
+clean:
        rm -f *.o $(PROGRAM)