diff --git a/Makefile.in b/Makefile.in index ded8678b9c..c74ae9c87a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ # -# This file was automatically generated by tmake at 10:05, 1999/08/14 +# This file was automatically generated by tmake at 11:55, 1999/08/14 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T! # @@ -558,6 +558,8 @@ GTK_GENERICOBJS = \ src/generic/dirdlgg.o \ src/generic/fontdlgg.o \ src/generic/gridg.o \ + src/generic/helphtml.o \ + src/generic/helpwxht.o \ src/generic/imaglist.o \ src/generic/laywin.o \ src/generic/listctrl.o \ @@ -727,6 +729,8 @@ MOTIF_GENERICOBJS = \ src/generic/dirdlgg.o \ src/generic/fontdlgg.o \ src/generic/gridg.o \ + src/generic/helphtml.o \ + src/generic/helpwxht.o \ src/generic/helpxlp.o \ src/generic/imaglist.o \ src/generic/laywin.o \ diff --git a/configure.in b/configure.in index 7d051d6dbf..2b9c2f17ad 100644 --- a/configure.in +++ b/configure.in @@ -2728,7 +2728,11 @@ AC_OUTPUT([ samples/validate/Makefile samples/wxpoem/Makefile samples/wxsocket/Makefile + samples/html/Makefile samples/html/about/Makefile + samples/html/help/Makefile + samples/html/printing/Makefile + samples/html/test/Makefile ], [ chmod +x wx-config diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index 2d1360424b..2f1719d6f1 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -59,6 +59,8 @@ dcpsg.cpp G U dirdlgg.cpp G 16 fontdlgg.cpp G G gridg.cpp G +helphtml.cpp G G +helpwxht.cpp G G helpxlp.cpp G G,R imaglist.cpp G 16 laywin.cpp G diff --git a/samples/Makefile.in b/samples/Makefile.in index 80f1032767..0ae941813c 100644 --- a/samples/Makefile.in +++ b/samples/Makefile.in @@ -3,7 +3,6 @@ # all: - cp -u -r @top_srcdir@/samples .. cd bombs; make cd checklst; make cd config; make diff --git a/samples/bombs/Makefile.in b/samples/bombs/Makefile.in index 2ceb45aa77..90ec3d1ea5 100644 --- a/samples/bombs/Makefile.in +++ b/samples/bombs/Makefile.in @@ -11,8 +11,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. - -VPATH = :$(top_srcdir)/samples/bombs +program_dir = samples/bombs PROGRAM=bombs diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in index 3d9142b1f0..24a3b23fe3 100644 --- a/samples/caret/Makefile.in +++ b/samples/caret/Makefile.in @@ -11,8 +11,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. - -VPATH = :$(top_srcdir)/samples/caret +program_dir = samples/caret PROGRAM=caret diff --git a/samples/checklst/Makefile.in b/samples/checklst/Makefile.in index 389f8e145b..fec63478bb 100644 --- a/samples/checklst/Makefile.in +++ b/samples/checklst/Makefile.in @@ -11,8 +11,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. - -VPATH = :$(top_srcdir)/samples/checklst +program_dir = samples/checklst PROGRAM=checklst diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in index 11bec9ebb4..f3f1c97904 100644 --- a/samples/config/Makefile.in +++ b/samples/config/Makefile.in @@ -11,8 +11,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. - -VPATH = :$(top_srcdir)/samples/config +program_dir = samples/config PROGRAM=conftest diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in index 399c487519..dd63f87470 100644 --- a/samples/controls/Makefile.in +++ b/samples/controls/Makefile.in @@ -11,8 +11,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. - -VPATH = :$(top_srcdir)/samples/controls +program_dir = samples/controls PROGRAM=controls diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in index 4a642b7c80..63a8b4ce34 100644 --- a/samples/dialogs/Makefile.in +++ b/samples/dialogs/Makefile.in @@ -11,8 +11,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. - -VPATH = :$(top_srcdir)/samples/dialogs +program_dir = samples/samples/dialogs PROGRAM=dialogs diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in index 880af4d078..7c88bd2be8 100644 --- a/samples/dnd/Makefile.in +++ b/samples/dnd/Makefile.in @@ -11,8 +11,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. - -VPATH = :$(top_srcdir)/samples/dnd +program_dir = samples/dnd PROGRAM=dnd diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in index 156000b2ad..da2e9cb69b 100644 --- a/samples/docview/Makefile.in +++ b/samples/docview/Makefile.in @@ -11,8 +11,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. - -VPATH = :$(top_srcdir)/samples/docview +program_dir = samples/docview PROGRAM=docview diff --git a/samples/docvwmdi/Makefile.in b/samples/docvwmdi/Makefile.in index e1df03d8ce..e81864e8e6 100644 --- a/samples/docvwmdi/Makefile.in +++ b/samples/docvwmdi/Makefile.in @@ -11,8 +11,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. - -VPATH = :$(top_srcdir)/samples/docvwmdi +program_dir = samples/docvwmdi PROGRAM=docview diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in index 49de1b97fd..840117f610 100644 --- a/samples/drawing/Makefile.in +++ b/samples/drawing/Makefile.in @@ -11,8 +11,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. - -VPATH = :$(top_srcdir)/samples/drawing +program_dir = samples/drawing PROGRAM=drawing diff --git a/samples/dynamic/Makefile.in b/samples/dynamic/Makefile.in index 11715ad0a1..41692e7ae0 100644 --- a/samples/dynamic/Makefile.in +++ b/samples/dynamic/Makefile.in @@ -11,8 +11,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. - -VPATH = :$(top_srcdir)/samples/dynamic +program_dir = samples/dynamic PROGRAM=dynamic diff --git a/samples/html/Makefile.in b/samples/html/Makefile.in new file mode 100644 index 0000000000..f23a6a2937 --- /dev/null +++ b/samples/html/Makefile.in @@ -0,0 +1,10 @@ +# +# Makefile : Builds html samples for Unix. +# + +all: + cd about; make + +clean: + cd about; make clean + diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in index a4f19d5c72..bb935c9cd9 100644 --- a/samples/html/about/Makefile.in +++ b/samples/html/about/Makefile.in @@ -11,8 +11,10 @@ top_srcdir = @top_srcdir@ top_builddir = ../../.. +program_dir = samples/html/about -VPATH = :$(top_srcdir)/samples/html/about +DATADIRS = data +DATAFILES = data/about.htm data/logo.png PROGRAM=about diff --git a/samples/html/help/.cvsignore b/samples/html/help/.cvsignore index 70845e08eb..e69de29bb2 100644 --- a/samples/html/help/.cvsignore +++ b/samples/html/help/.cvsignore @@ -1 +0,0 @@ -Makefile.in diff --git a/samples/html/help/Makefile.am b/samples/html/help/Makefile.am deleted file mode 100644 index 99eba9fb57..0000000000 --- a/samples/html/help/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -AUTOMAKE_OPTIONS = 1.3 no-dependencies - -SUFFIXES = .cpp - -DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) - -noinst_PROGRAMS = help - -help_SOURCES = help.cpp diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in new file mode 100644 index 0000000000..e976a8eba4 --- /dev/null +++ b/samples/html/help/Makefile.in @@ -0,0 +1,22 @@ +# +# File: Makefile.in +# Author: Julian Smart +# Created: 1998 +# Updated: +# Copyright: (c) 1998 Julian Smart +# +# "%W% %G%" +# +# Makefile for html about example (UNIX). + +top_srcdir = @top_srcdir@ +top_builddir = ../../.. + +VPATH = :$(top_srcdir)/samples/html/help + +PROGRAM=help + +OBJECTS=$(PROGRAM).o + +include ../../../src/makeprog.env + diff --git a/samples/html/printing/.cvsignore b/samples/html/printing/.cvsignore index 70845e08eb..e69de29bb2 100644 --- a/samples/html/printing/.cvsignore +++ b/samples/html/printing/.cvsignore @@ -1 +0,0 @@ -Makefile.in diff --git a/samples/html/printing/Makefile.am b/samples/html/printing/Makefile.am deleted file mode 100644 index 73aa8ade60..0000000000 --- a/samples/html/printing/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -AUTOMAKE_OPTIONS = 1.3 no-dependencies - -SUFFIXES = .cpp - -DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) - -noinst_PROGRAMS = printing - -printing_SOURCES = printing.cpp diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in new file mode 100644 index 0000000000..133be35a8d --- /dev/null +++ b/samples/html/printing/Makefile.in @@ -0,0 +1,22 @@ +# +# File: Makefile.in +# Author: Julian Smart +# Created: 1998 +# Updated: +# Copyright: (c) 1998 Julian Smart +# +# "%W% %G%" +# +# Makefile for html printing example (UNIX). + +top_srcdir = @top_srcdir@ +top_builddir = ../../.. + +VPATH = :$(top_srcdir)/samples/html/printing + +PROGRAM=printing + +OBJECTS=$(PROGRAM).o + +include ../../../src/makeprog.env + diff --git a/samples/html/test/.cvsignore b/samples/html/test/.cvsignore index 70845e08eb..e69de29bb2 100644 --- a/samples/html/test/.cvsignore +++ b/samples/html/test/.cvsignore @@ -1 +0,0 @@ -Makefile.in diff --git a/samples/html/test/Makefile.am b/samples/html/test/Makefile.am deleted file mode 100644 index 3631656b63..0000000000 --- a/samples/html/test/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -AUTOMAKE_OPTIONS = 1.3 no-dependencies - -SUFFIXES = .cpp - -DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) - -noinst_PROGRAMS = test - -test_SOURCES = test.cpp diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in new file mode 100644 index 0000000000..9bdf5dca4f --- /dev/null +++ b/samples/html/test/Makefile.in @@ -0,0 +1,24 @@ +# +# File: Makefile.in +# Author: Julian Smart +# Created: 1998 +# Updated: +# Copyright: (c) 1998 Julian Smart +# +# "%W% %G%" +# +# Makefile for html test example (UNIX). + +top_srcdir = @top_srcdir@ +top_builddir = ../../.. +program_dir = samples/html/test + +PROGRAM=test + +OBJECTS=$(PROGRAM).o + +DATAFILES=f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp \ + tables.htm test.htm + +include ../../../src/makeprog.env + diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in index 043239a72a..e2c29b50d4 100644 --- a/samples/image/Makefile.in +++ b/samples/image/Makefile.in @@ -11,8 +11,9 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. +program_dir = samples/image -VPATH = :$(top_srcdir)/samples/image +DATAFILES = horse.png horse.jpg horse.bmp horse.gif PROGRAM=image diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in index 64ea755d41..9019372202 100644 --- a/samples/layout/Makefile.in +++ b/samples/layout/Makefile.in @@ -11,8 +11,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. - -VPATH = :$(top_srcdir)/samples/layout +program_dir = samples/layout PROGRAM=layout diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in index 1a6fb6c18e..cbd5f71cdb 100644 --- a/samples/listctrl/Makefile.in +++ b/samples/listctrl/Makefile.in @@ -11,8 +11,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. - -VPATH = :$(top_srcdir)/samples/listctrl +program_dir = samples/listctrl PROGRAM=listtest diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in index 148d0aa9b1..80dc8e0dd8 100644 --- a/samples/mdi/Makefile.in +++ b/samples/mdi/Makefile.in @@ -11,8 +11,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. - -VPATH = :$(top_srcdir)/samples/mdi +program_dir = samples/mdi PROGRAM=mdi diff --git a/samples/minifram/Makefile.in b/samples/minifram/Makefile.in index 6675e56f69..2594aa62a4 100644 --- a/samples/minifram/Makefile.in +++ b/samples/minifram/Makefile.in @@ -11,8 +11,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. - -VPATH = :$(top_srcdir)/samples/minifram +program_dir = samples/minifram PROGRAM=test diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in index 6c3e5374a7..238098a209 100644 --- a/samples/minimal/Makefile.in +++ b/samples/minimal/Makefile.in @@ -11,8 +11,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. - -VPATH = :$(top_srcdir)/samples/minimal +program_dir = samples/minimal PROGRAM=minimal diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in index b80dbaa37e..e0a1dcc68c 100644 --- a/samples/notebook/Makefile.in +++ b/samples/notebook/Makefile.in @@ -11,8 +11,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. - -VPATH = :$(top_srcdir)/samples/notebook +program_dir = samples/notebook PROGRAM=test diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in index 30c2bcbc03..83c5c2b65a 100644 --- a/samples/printing/Makefile.in +++ b/samples/printing/Makefile.in @@ -11,8 +11,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. - -VPATH = :$(top_srcdir)/samples/printing +program_dir = samples/printing PROGRAM=printing diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in index 83f69c1a6d..6cbf666d9d 100644 --- a/samples/sashtest/Makefile.in +++ b/samples/sashtest/Makefile.in @@ -11,8 +11,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. - -VPATH = :$(top_srcdir)/samples/sashtest +program_dir = samples/sashtest PROGRAM=sashtest diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in index ccde687e65..7964583714 100644 --- a/samples/scroll/Makefile.in +++ b/samples/scroll/Makefile.in @@ -11,8 +11,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. - -VPATH = :$(top_srcdir)/samples/scroll +program_dir = samples/scroll PROGRAM=scroll diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in index db05a9b681..c1c15a3691 100644 --- a/samples/splitter/Makefile.in +++ b/samples/splitter/Makefile.in @@ -11,8 +11,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. - -VPATH = :$(top_srcdir)/samples/splitter +program_dir = samples/splitter PROGRAM=test diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in index 5030837fae..52eaf8abd2 100644 --- a/samples/text/Makefile.in +++ b/samples/text/Makefile.in @@ -11,8 +11,9 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. +program_dir = samples/text -VPATH = :$(top_srcdir)/samples/text +DATAFILES = text.cpp PROGRAM=controls diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in index 86146e170b..1202c026a5 100644 --- a/samples/thread/Makefile.in +++ b/samples/thread/Makefile.in @@ -11,8 +11,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. - -VPATH = :$(top_srcdir)/samples/thread +program_dir = samples/thread PROGRAM=test diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in index 4f891b483a..9ae0fa71c7 100644 --- a/samples/toolbar/Makefile.in +++ b/samples/toolbar/Makefile.in @@ -11,8 +11,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. - -VPATH = :$(top_srcdir)/samples/toolbar +program_dir = samples/toolbar PROGRAM=test diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in index 112c0a3be8..3a1ed1bbd3 100644 --- a/samples/treectrl/Makefile.in +++ b/samples/treectrl/Makefile.in @@ -11,8 +11,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. - -VPATH = :$(top_srcdir)/samples/treectrl +program_dir = samples/treectrl PROGRAM=treetest diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in index a4f4236ced..1a786bbb13 100644 --- a/samples/typetest/Makefile.in +++ b/samples/typetest/Makefile.in @@ -11,8 +11,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. - -VPATH = :$(top_srcdir)/samples/typetest +program_dir = samples/typetest PROGRAM=typetest diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in index e26b4dfb55..f487d44c37 100644 --- a/samples/validate/Makefile.in +++ b/samples/validate/Makefile.in @@ -11,8 +11,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. - -VPATH = :$(top_srcdir)/samples/validate +program_dir = samples/validate PROGRAM=validate diff --git a/samples/wxpoem/Makefile.in b/samples/wxpoem/Makefile.in index d33bec9e01..eed47362b9 100644 --- a/samples/wxpoem/Makefile.in +++ b/samples/wxpoem/Makefile.in @@ -11,8 +11,9 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. +program_dir = samples/wxpoem -VPATH = :$(top_srcdir)/samples/wxpoem +DATAFILES = wxpoem.txt wxpoem.dat PROGRAM=wxpoem diff --git a/samples/wxsocket/Makefile.in b/samples/wxsocket/Makefile.in index 1f8542f0ba..96af3cf06c 100644 --- a/samples/wxsocket/Makefile.in +++ b/samples/wxsocket/Makefile.in @@ -11,7 +11,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. - +program_dir = samples/wxsocket VPATH = :$(top_srcdir)/samples/wxsocket # Clears all default suffixes diff --git a/src/makeprog.env.in b/src/makeprog.env.in index f3b63f6e11..9ae88ae94a 100644 --- a/src/makeprog.env.in +++ b/src/makeprog.env.in @@ -12,13 +12,27 @@ .cxx.o : $(CC) -c $(CPPFLAGS) -o $@ $< +VPATH = :$(top_srcdir)/$(program_dir) + # Set defaults from configure include $(top_builddir)/src/make.env -all: $(PROGRAM) +all: $(PROGRAM) install_dirs install_data $(PROGRAM): $(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(LDLIBS) +install_dirs: + @list='$(DATADIRS)'; for p in $$list; do \ + mkdir -p $(top_builddir)/$(program_dir)/$$p; \ + done + +install_data: + @list='$(DATAFILES)'; for p in $$list; do \ + if test ! -e $(top_builddir)/$(program_dir)/Makefile.in; then \ + cp -u $(top_srcdir)/$(program_dir)/$$p $(top_builddir)/$(program_dir)/$$p; \ + fi; \ + done + clean: rm -f $(OBJECTS) $(PROGRAM) core