Makefile updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index ded8678b9cd3a3fa2bd31dbf7e3266d4fbd8863f..c74ae9c87abedbd2b72cb7b5931770ec0e51f0b1 100644 (file)
--- 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 7d051d6dbf5d706fee3e44c00634d667d672f6bf..2b9c2f17ad29e0db80433c6740180df537f1c4ae 100644 (file)
--- 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 2d1360424be56a40abaecbd9a7c5e2a5aee63985..2f1719d6f17f4cf438425971c22753126cc0425d 100644 (file)
--- 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 80f1032767656f1e6a8db43cbb24c9f30647bf29..0ae941813c49eb21f22842ea064681b47a2ecb0c 100644 (file)
--- 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 2ceb45aa779e181358274b79ba082cd2c7256951..90ec3d1ea59db1041d96642974549bce75c87926 100644 (file)
--- 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 3d9142b1f0e00082cc8fa5d2e9ffd47e7b0fe0dc..24a3b23fe3b6af21b610e499ab8667dd35a6ded1 100644 (file)
--- 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 389f8e145b25f6707349d5cf4df8b835ce63ce3a..fec63478bb3c1bc69b9a92868dbb359b80e089f2 100644 (file)
--- 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 11bec9ebb47bc501b1137d47664e805d6160f7b2..f3f1c9790467e69ad62b53f408d20c1a486e5d90 100644 (file)
--- 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 399c4875194949f51afb2c11c06a7bd4c44533b5..dd63f87470b4be6a02cb9ceeeb44629910b5b718 100644 (file)
--- 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 4a642b7c808793c0c122db2599c21a0aca51c4eb..63a8b4ce34d09f9462f5b616da2cb3307e5a0194 100644 (file)
--- 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 880af4d078d1f37fc783a3e5896d97b8cb6d9808..7c88bd2be8dafcae69db6b5dd2325390e798d262 100644 (file)
--- 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 156000b2adbe0e2982737a0995e935c7df019f3d..da2e9cb69b9daafd598e2665077444a7ca1a04ba 100644 (file)
--- 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 e1df03d8cede6e43b1c66fe698063fa626b424ac..e81864e8e6acd259b8eff139f69593d4e5e21137 100644 (file)
--- 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 49de1b97fdbb4a7395b93c288bcb5acc3d7bb416..840117f610b41bcb723e9ebad85750e2a0691b10 100644 (file)
--- 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 11715ad0a1f1a3a1ad94ede9cea936bbbd6acd32..41692e7ae0a7eecf926f44bf6c6463459e2eff13 100644 (file)
--- 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 (file)
index 0000000..f23a6a2
--- /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 a4f19d5c7253dce45a53b4ae8881625a2c2a6529..bb935c9cd9ac92fbf84253e5b0cf5cd84a477474 100644 (file)
--- 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 70845e08eb0b807b1022dc47cd27e67f726d4a0f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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 (file)
index 99eba9f..0000000
--- 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 (file)
index 0000000..e976a8e
--- /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 70845e08eb0b807b1022dc47cd27e67f726d4a0f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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 (file)
index 73aa8ad..0000000
--- 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 (file)
index 0000000..133be35
--- /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 70845e08eb0b807b1022dc47cd27e67f726d4a0f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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 (file)
index 3631656..0000000
--- 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 (file)
index 0000000..9bdf5dc
--- /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 043239a72a9fd1bd2d6f39503c2d368ecfdc5264..e2c29b50d4f9c79c512194e388e80fd05ef09e6e 100644 (file)
--- 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 64ea755d4158405d76f03ebc0e86e23dec63d40a..9019372202a4d0ec69016384d1e4f590158d9993 100644 (file)
--- 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 1a6fb6c18e1d71628dccc68f9d731229ac047a0d..cbd5f71cdb6208c58662bde2a470c41ea15b00a3 100644 (file)
--- 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 148d0aa9b12ac01dd4514bc497945e04e531f026..80dc8e0dd8150e545c2a40d36f8dfa19b7fd22d1 100644 (file)
--- 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 6675e56f6968053aff3dfffae9b53cfbf391228c..2594aa62a4a4c62ff81c5442e6f65299cb03d039 100644 (file)
--- 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 6c3e5374a7c75b7da00073f647b1ba644d4cb4a9..238098a209fecdca0417ee0ba9973bf20261334b 100644 (file)
--- 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 b80dbaa37ed7176ce5f720e1e236edbc71bf988c..e0a1dcc68cfa966fdccf7ace5f8a77b2bd0541f0 100644 (file)
--- 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 30c2bcbc03303fb4001a10312f40b68910950159..83c5c2b65ad74d0bab803bae6095176627de2312 100644 (file)
--- 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 83f69c1a6d641c98592971d3a1069386a0bd87e3..6cbf666d9d974f8dbfc10307910bc1bc56fd7e99 100644 (file)
--- 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 ccde687e65c6442605afed2e5d0c7f04840970dc..7964583714ad056978917ce21a8dbb137c9c28e3 100644 (file)
--- 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 db05a9b6819de2e8a67a8c69734f1ae13b330dba..c1c15a3691d3f3e3fddafdd37faacc23af5f3aeb 100644 (file)
--- 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 5030837fae5597241993f2d0fe9017c1ebb63ed2..52eaf8abd2ee1605ce5b1187c4d521fc74e2b59b 100644 (file)
--- 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 86146e170bc2a59a5d29f94f47ca38899497226c..1202c026a5cfa06dc6e7b5d55dfc4b617ecb0d08 100644 (file)
--- 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 4f891b483af20fb14e69ef50d926c2bbcadc99f4..9ae0fa71c7ec63a8710f6fca392b94cd4bb898e3 100644 (file)
--- 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 112c0a3be80b32e84be35cf84234999bb01050db..3a1ed1bbd3aa41a8dfaff3b48995471ef77b0faa 100644 (file)
--- 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 a4f4236ced9a8922a8715fc4d3706156eb4f2b5f..1a786bbb1337d5563554f8774dc1107730e26569 100644 (file)
--- 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 e26b4dfb55f2e6c49048e65775283c698156354b..f487d44c37ff6638990ed5a464dd8190791e2990 100644 (file)
--- 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 d33bec9e01ceaf138adbfa06ee24907b0de5766f..eed47362b99d759fb71ca202d5d1e05d62e8731e 100644 (file)
--- 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 1f8542f0bab5aa491b2639c6409f9481e05704ab..96af3cf06ca01589320f1790530275b80cae09a5 100644 (file)
--- 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 f3b63f6e1171504fa4f6fa2779fcb5ea6311ecdb..9ae88ae94ac8f932a80549b4fc23ffa292ad7cb5 100644 (file)
--- 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