A few tweaks and cleanups

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

diff --git a/samples/config/makefile.unx b/samples/config/makefile.unx
index fd8e0e5b1ebf896ef087ba569d4129d4dd4896c7..b79e2978846735d65915c7e69767e88b875a1449 100644 (file)
--- a/samples/config/makefile.unx
+++ b/samples/config/makefile.unx
@@ -13,16 +13,23 @@
 # under Linux.
 #
 
 # under Linux.
 #
 

-CC = gcc
-

 PROGRAM = config
 
 PROGRAM = config
 

-$(PROGRAM): $(PROGRAM).o
-       $(CC) -o $(PROGRAM) \
-       $(PROGRAM).o `wx-config --libs`
+CXX = $(shell wx-config --cxx)
+
+OBJECTS = $(PROGRAM).o
+
+# implementation
+
+.SUFFIXES:     .o .cpp
+
+.cpp.o :
+       $(CXX) -c `wx-config --cxxflags` -o $@ $<
+
+all:    $(PROGRAM)

 
 

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

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