1) wxHTML now outputs unrecognized entities verbosely

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

diff --git a/samples/layout/makefile.unx b/samples/layout/makefile.unx
index 3f9aad0ac210b6b26854e3d9dca08eb8897df222..fabb56fd284261941427f9a3a954f3b69e5f3fab 100644 (file)
--- a/samples/layout/makefile.unx
+++ b/samples/layout/makefile.unx
@@ -1,76 +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 layout example (UNIX).
 
-WXDIR = ../..
+CC = gcc
 
-# All common UNIX compiler flags and options are now in
-# this central makefile.
-include $(WXDIR)/src/make.env
+PROGRAM = layout
 
-OBJECTS=$(OBJDIR)/layout.$(OBJSUFF)
+OBJECTS = $(PROGRAM).o
 
-.SUFFIXES:
+# implementation
 
-all:   $(OBJDIR) layout$(GUISUFFIX)
+.SUFFIXES:     .o .cpp
 
-wxmotif:
-       cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx motif
+.cpp.o :
+       $(CC) -c `wx-config --cflags` -o $@ $<
 
-wxxview:
-       cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx xview
+all:    $(PROGRAM)
 
-wxhp:
-       cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx hp
-
-# For SGI, include -lPW on your LDLIBS
-motif: wxmotif
-       $(MAKE) -f makefile.unx all 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=
-
-xview: wxxview
-       $(MAKE) -f makefile.unx GUI=-Dwx_xview GUISUFFIX=_ol CC=$(CC) OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)' LDLIBS='$(XVIEWLDLIBS)'
-
-hp:    wxhp
-       $(MAKE) -f makefile.unx GUI=-Dwx_motif GUISUFFIX=_hp CC=CC OPT='' DEBUG='$(DEBUG)' WARN='-w' \
-           XINCLUDE='$(HPXINCLUDE)' \
-           XLIB='$(HPXLIB)' \
-           XVIEW_LINK='' \
-           LDLIBS='$(HPLDLIBS)'
-
-$(OBJDIR):
-       mkdir $(OBJDIR)
-
-layout$(GUISUFFIX): $(OBJDIR)/layout.$(OBJSUFF) $(WXLIB)
-       $(CC) $(LDFLAGS) -o layout$(GUISUFFIX) $(OBJDIR)/layout.$(OBJSUFF) $(XVIEW_LINK) $(LDLIBS)
-
-$(OBJDIR)/layout.$(OBJSUFF):        layout.$(SRCSUFF) layout.h
-       $(CC) -c $(CPPFLAGS) -o $@ layout.$(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) layout$(GUISUFFIX) core
-
-wxclean_ol:
-       cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx clean_ol
-
-wxclean_motif:
-       cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx clean_motif
-
-wxclean_hp:
-       cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx clean_hp
+$(PROGRAM):    $(OBJECTS)
+       $(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
+clean: 
+       rm -f *.o $(PROGRAM)