always let the multiline text control process the Enter key presses

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

diff --git a/samples/docview/makefile.unx b/samples/docview/makefile.unx
index bbdccc3fc454db50068aea8ca21ad26dfef644ec..9af3b76a7ea0913494a5585dad8bc0aad8df1df1 100644 (file)
--- a/samples/docview/makefile.unx
+++ b/samples/docview/makefile.unx
@@ -1,64 +1,35 @@
 #
-# File:                makefile.unx
-# Author:      Julian Smart
-# Created:     1993
+# File:                Makefile for samples
+# Author:      Robert Roebling
+# Created:     1999
 # Updated:     
-# Copyright:   (c) 1993, AIAI, University of Edinburgh
+# Copyright:   (c) 1998 Robert Roebling
 #
-# "%W% %G%"
+# 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.
 #
-# Makefile for docview example (UNIX).
 
-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 = docview
 
-OBJECTS = $(OBJDIR)/docview.$(OBJSUFF) $(OBJDIR)/view.$(OBJSUFF) $(OBJDIR)/doc.$(OBJSUFF)
+OBJECTS = $(PROGRAM).o view.o doc.o
 
-.SUFFIXES:
+# implementation
 
-all:    $(OBJDIR) wx$(GUISUFFIX) docview$(GUISUFFIX)
+.SUFFIXES:     .o .cpp
 
-wx_motif:
-       cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx motif
+.cpp.o :
+       $(CXX) -c `wx-config --cxxflags` -o $@ $<
 
-wx_ol:
-       cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx xview
-motif:
-       $(MAKE) -f makefile.unx GUISUFFIX=_motif GUI=-Dwx_motif GUISUFFIX=_motif OPT='$(OPT)' LDLIBS='$(MOTIFLDLIBS)' OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)' XVIEW_LINK=
+all:    $(PROGRAM)
 
-xview:
-       $(MAKE) -f makefile.unx GUI=-Dwx_xview GUISUFFIX=_ol CC=$(CC) OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)'
+$(PROGRAM):    $(OBJECTS)
+       $(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
-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)
-
-docview$(GUISUFFIX): $(OBJECTS) $(WXLIB)
-       $(CC) $(LDFLAGS) -o docview$(GUISUFFIX) $(OBJECTS) $(XVIEW_LINK) $(LDLIBS)
-
-$(OBJDIR)/docview.$(OBJSUFF):        docview.$(SRCSUFF) docview.h doc.h view.h
-       $(CC) -c $(CPPFLAGS) -o $@ docview.$(SRCSUFF)
-
-$(OBJDIR)/doc.$(OBJSUFF):        doc.$(SRCSUFF) doc.h
-       $(CC) -c $(CPPFLAGS) -o $@ doc.$(SRCSUFF)
-
-$(OBJDIR)/view.$(OBJSUFF):        view.$(SRCSUFF) view.h
-       $(CC) -c $(CPPFLAGS) -o $@ view.$(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) docview$(GUISUFFIX) core
+clean: 
+       rm -f *.o $(PROGRAM)