Starting to update the tarball and rpm spec files for 2.5. Mostly

[wxWidgets.git] / contrib / samples / ogl / ogledit / makefile.unx

diff --git a/contrib/samples/ogl/ogledit/makefile.unx b/contrib/samples/ogl/ogledit/makefile.unx
index 31b223db53e024ac8ac6fd3a980fa8cc0f99a675..9972f16aee0dfbec65402f4392f9ab01771cd41a 100644 (file)
--- a/contrib/samples/ogl/ogledit/makefile.unx
+++ b/contrib/samples/ogl/ogledit/makefile.unx
@@ -1,20 +1,38 @@
 #
-# File:                makefile.unx
+# File:                Makefile
 # Author:      Julian Smart
-# Created:     1998
+# Created:     1999
 # Updated:     
-# Copyright:   (c) 1998 Julian Smart
+# Copyright:   (c) 2000 Julian Smart
 #
-# "%W% %G%"
+# Makefile for OGL demo (GTK version)
 #
-# Makefile for OGLEdit example (UNIX).
+# This makefile requires wxWindows/GTK to be 
+# installed (possibly using "make install")
+# on your system.
+#
+
+CXX = $(shell wx-config --cxx)
+WXCONFIG=../../../../wx-config
+WXINCLUDE=-I../../../../include -I../../../include
+WXLIB=-L../../../../lib -L../../../src/ogl
+
+OBJECTS=ogledit.o palette.o doc.o view.o
+
+ogledit: $(OBJECTS)
+       $(CXX) -o ogledit $(OBJECTS) `$(WXCONFIG) --libs` $(WXLIB) -logl
 
-PROGRAM=ogledit
+ogledit.o: ogledit.cpp
+       $(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c ogledit.cpp
 
-OBJECTS=$(PROGRAM).o doc.o view.o palette.o
+palette.o: palette.cpp
+       $(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c palette.cpp
 
-# EXTRACPPFLAGS=-I$(WXDIR)/contrib/include
-EXTRALDLIBS=-logl$(GUISUFFIX)
+doc.o: doc.cpp
+       $(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c doc.cpp
 
-include ../../../../src/makeprog.env
+view.o: view.cpp
+       $(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c view.cpp
 
+clean: 
+       rm -f *.o ogledit