somehow this got missed on the last commit..

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

diff --git a/samples/thread/makefile.unx b/samples/thread/makefile.unx
index 121e691519cfaf4245f11ab3b3dfb63621ff17bd..2604c437aee5e23bd9906624c1d24f8b1f43b1c8 100644 (file)
--- a/samples/thread/makefile.unx
+++ b/samples/thread/makefile.unx
@@ -1,58 +1,23 @@
-#
-# File:                makefile.unx
-# Author:      Julian Smart
-# Created:     1993
-# Updated:     
-# Copyright:   (c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile for thread example (UNIX).
+# Purpose: makefile for thread example (Unix)
+# Created: 2000-03-15

 
 

-WXDIR = ../..
+CXX = $(shell wx-config --cxx)

 
 

-# All common UNIX compiler flags and options are now in
-# this central makefile.
-include $(WXDIR)/src/make.env
+PROGRAM = thread

 
 

-OBJECTS = $(OBJDIR)/test.$(OBJSUFF)
+OBJECTS = $(PROGRAM).o

 
 

-.SUFFIXES:
+# implementation

 
 

-all:    $(OBJDIR) test$(GUISUFFIX)
+.SUFFIXES:     .o .cpp

 
 

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

 
 

+all:    $(PROGRAM)

 
 

-motif:
-       $(MAKE) -f makefile.unx GUISUFFIX=_motif GUI=-Dwx_motif GUISUFFIX=_motif OPT='$(OPT)' LDLIBS='$(MOTIFLDLIBS)' WXLIB=$(WXDIR)/lib/libwx_motif.a  OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)' XVIEW_LINK=
+$(PROGRAM):    $(OBJECTS)
+       $(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`

 
 

-xview:
-       cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx xview
-       $(MAKE) -f makefile.unx GUI=-Dwx_xview GUISUFFIX=_ol CC=$(CC) OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)'
-
-hp:
-       cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx hp
-       $(MAKE) -f makefile.unx GUI=-Dwx_motif GUISUFFIX=_hp CC=CC DEBUG='$(DEBUG)' WARN='-w' \
-         XINCLUDE='$(HPXINCLUDE)' XLIB='$(HPXLIB)' XVIEW_LINK='' LDLIBS='$(HPLDLIBS)'
-
-$(OBJDIR):
-       mkdir $(OBJDIR)
-
-test$(GUISUFFIX):      $(OBJDIR)/test.$(OBJSUFF) $(WXLIB)
-       $(CC) $(LDFLAGS) -o test$(GUISUFFIX) $(OBJDIR)/test.$(OBJSUFF) $(XVIEW_LINK) $(LDLIBS)
-
-$(OBJDIR)/test.$(OBJSUFF):     test.$(SRCSUFF)
-       $(CC) -c $(CPPFLAGS) -o $@ test.$(SRCSUFF)
-
-clean_motif:
-       $(MAKE) -f makefile.unx GUISUFFIX=_motif cleanany
-
-clean_ol:
-       $(MAKE) -f makefile.unx GUISUFFIX=_ol cleanany
-
-clean_hp:
-       $(MAKE) -f makefile.unx GUISUFFIX=_hp cleanany
-
-cleanany:
-       rm -f $(OBJECTS) test$(GUISUFFIX) core
+clean:
+       rm -f *.o $(PROGRAM)