More samples makefiles

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

diff --git a/Makefile.in b/Makefile.in
index bf2436fd47fd348f91e89a0975d7f42b556ca5d3..ded8678b9cd3a3fa2bd31dbf7e3266d4fbd8863f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,8 @@
 
 #
-# This file was automatically generated by tmake at 15:55, 1999/08/13
+# This file was automatically generated by tmake at 10:05, 1999/08/14
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
-# -----> Is this true, where is it? I had to make lots of changes here to get
-#        it to work! KB
+
 #
 # File:     makefile.unx
 # Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
@@ -67,7 +66,7 @@ top_builddir = .
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL@ # what is this supposed to be?
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -559,9 +558,6 @@ GTK_GENERICOBJS = \
                src/generic/dirdlgg.o \
                src/generic/fontdlgg.o \
                src/generic/gridg.o \
-               src/generic/helphtml.o \
-               src/generic/helpwxht.o \
-               src/generic/helpext.o \
                src/generic/imaglist.o \
                src/generic/laywin.o \
                src/generic/listctrl.o \
@@ -731,10 +727,7 @@ MOTIF_GENERICOBJS = \
                src/generic/dirdlgg.o \
                src/generic/fontdlgg.o \
                src/generic/gridg.o \
-               src/generic/helphtml.o \
                src/generic/helpxlp.o \
-               src/generic/helpwxht.o \
-               src/generic/helpext.o \
                src/generic/imaglist.o \
                src/generic/laywin.o \
                src/generic/listctrl.o \
@@ -899,8 +892,6 @@ MSW_GENERICOBJS = \
                src/generic/choicdgg.o \
                src/generic/dirdlgg.o \
                src/generic/gridg.o \
-               src/generic/helphtml.o \
-               src/generic/helpwxht.o \
                src/generic/laywin.o \
                src/generic/numdlgg.o \
                src/generic/panelg.o \
@@ -1202,19 +1193,19 @@ REQUIRED_DIRS = ./lib ./src ./src/common ./src/gtk ./src/motif ./src/msw \
 all:    $(REQUIRED_DIRS) $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@
 
 $(REQUIRED_DIRS):      $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h
-       @if test ! -d ./lib; then mkdir ./lib; fi
-       @if test ! -d ./src; then mkdir ./src; fi
-       @if test ! -d ./src/common; then mkdir ./src/common; fi
-       @if test ! -d ./src/msw; then mkdir ./src/msw; fi
-       @if test ! -d ./src/gtk; then mkdir ./src/gtk; fi
-       @if test ! -d ./src/motif; then mkdir ./src/motif; fi
-       @if test ! -d ./src/motif/xmcombo; then mkdir ./src/motif/xmcombo; fi
-       @if test ! -d ./src/generic; then mkdir ./src/generic; fi
-       @if test ! -d ./src/unix; then mkdir ./src/unix; fi
-       @if test ! -d ./src/html; then mkdir ./src/html; fi
-       @if test ! -d ./src/png; then mkdir ./src/png; fi
-       @if test ! -d ./src/jpeg; then mkdir ./src/jpeg; fi
-       @if test ! -d ./src/zlib; then mkdir ./src/zlib; fi
+       mkdir -p ./lib
+       mkdir -p ./src
+       mkdir -p ./src/common
+       mkdir -p ./src/msw
+       mkdir -p ./src/gtk
+       mkdir -p ./src/motif
+       mkdir -p ./src/motif/xmcombo
+       mkdir -p ./src/generic
+       mkdir -p ./src/unix
+       mkdir -p ./src/html
+       mkdir -p ./src/png
+       mkdir -p ./src/jpeg
+       mkdir -p ./src/zlib
 
 @WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
        $(AR) $(AROPTIONS) ./lib/$@ $(OBJECTS)
@@ -1222,7 +1213,7 @@ $(REQUIRED_DIRS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDI
 
 @WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
        $(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
-
+       
 CREATE_LINKS:  ./lib/@WX_TARGET_LIBRARY@
        @if test -e ./lib/@WX_LIBRARY_LINK1@; then rm -f ./lib/@WX_LIBRARY_LINK1@; fi
        @if test -e ./lib/@WX_LIBRARY_LINK2@; then rm -f ./lib/@WX_LIBRARY_LINK2@; fi
@@ -1230,7 +1221,7 @@ CREATE_LINKS:  ./lib/@WX_TARGET_LIBRARY@
        $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK1@
        $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@
        $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@
-
+       
 CREATE_INSTALLED_LINKS:  $(libdir)/@WX_TARGET_LIBRARY@
        @if test -e $(libdir)/@WX_LIBRARY_LINK1@; then rm -f $(libdir)/@WX_LIBRARY_LINK1@; fi
        @if test -e $(libdir)/@WX_LIBRARY_LINK2@; then rm -f $(libdir)/@WX_LIBRARY_LINK2@; fi
@@ -1238,7 +1229,7 @@ CREATE_INSTALLED_LINKS:  $(libdir)/@WX_TARGET_LIBRARY@
        $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK1@
        $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK2@
        $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK3@
-
+       
 $(OBJECTS):    $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h
 
 parser.o:    parser.c lexer.c
@@ -1267,33 +1258,30 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
        @echo " Installing wxWindows..."
        @echo " "
 
-       $(INSTALL) -d $(bindir)
-       $(INSTALL) -d $(libdir)
-       $(INSTALL) -d $(libdir)/wx
-       $(INSTALL) -d $(libdir)/wx/include
-       $(INSTALL) -d $(libdir)/wx/include/wx
-       $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@
-
        $(INSTALL_SCRIPT) $(top_builddir)/wx-config $(bindir)/wx-config
        $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
-
+       
+       @mkdir -p $(libdir)/wx
+       @mkdir -p $(libdir)/wx/include
+       @mkdir -p $(libdir)/wx/include/wx
+       @mkdir -p $(libdir)/wx/include/wx/@TOOLKIT_DIR@
        $(INSTALL_DATA) $(top_builddir)/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
-
-       $(INSTALL) -d $(includedir)/wx
-       $(INSTALL) -d $(includedir)/wx/msw
-       $(INSTALL) -d $(includedir)/wx/gtk
-       $(INSTALL) -d $(includedir)/wx/motif
-       $(INSTALL) -d $(includedir)/wx/html
-       $(INSTALL) -d $(includedir)/wx/protocol
-       $(INSTALL) -d $(includedir)/wx/unix
-       $(INSTALL) -d $(includedir)/wx/generic
+       
+       @mkdir -p $(includedir)/wx
+       @mkdir -p $(includedir)/wx/msw
+       @mkdir -p $(includedir)/wx/gtk
+       @mkdir -p $(includedir)/wx/motif
+       @mkdir -p $(includedir)/wx/html
+       @mkdir -p $(includedir)/wx/protocol
+       @mkdir -p $(includedir)/wx/unix
+       @mkdir -p $(includedir)/wx/generic
        @list='$(HEADERS)'; for p in $$list; do \
          $(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \
          echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
        done
-
+       
 write_message:
-       echo " "
+       @echo " "
        @echo " The installation of wxWindows is finished.  On certain"
        @echo " platforms (e.g. Linux, Solaris) you'll now have to run"
        @echo " ldconfig if you installed a shared library."

diff --git a/configure.in b/configure.in
index 0cb0a3d49ec88273bafaa73618c15d8b99cb6014..7d051d6dbf5d706fee3e44c00634d667d672f6bf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2725,6 +2725,10 @@ AC_OUTPUT([
            samples/toolbar/Makefile
            samples/treectrl/Makefile
            samples/typetest/Makefile
+           samples/validate/Makefile
+           samples/wxpoem/Makefile
+           samples/wxsocket/Makefile
+           samples/html/about/Makefile
           ],
           [
             chmod +x wx-config

diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t
index 2a1a2b4cea1822213ea0b0ba051ba8db3171efbf..312eef8eee32b4659a15da07f546beb851577aa0 100644 (file)
--- a/distrib/msw/tmake/unx.t
+++ b/distrib/msw/tmake/unx.t
@@ -403,19 +403,19 @@ REQUIRED_DIRS = ./lib ./src ./src/common ./src/gtk ./src/motif ./src/msw \
 all:    $(REQUIRED_DIRS) $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@
 
 $(REQUIRED_DIRS):      $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h
-       @if test ! -d ./lib; then mkdir ./lib; fi
-       @if test ! -d ./src; then mkdir ./src; fi
-       @if test ! -d ./src/common; then mkdir ./src/common; fi
-       @if test ! -d ./src/msw; then mkdir ./src/msw; fi
-       @if test ! -d ./src/gtk; then mkdir ./src/gtk; fi
-       @if test ! -d ./src/motif; then mkdir ./src/motif; fi
-       @if test ! -d ./src/motif/xmcombo; then mkdir ./src/motif/xmcombo; fi
-       @if test ! -d ./src/generic; then mkdir ./src/generic; fi
-       @if test ! -d ./src/unix; then mkdir ./src/unix; fi
-       @if test ! -d ./src/html; then mkdir ./src/html; fi
-       @if test ! -d ./src/png; then mkdir ./src/png; fi
-       @if test ! -d ./src/jpeg; then mkdir ./src/jpeg; fi
-       @if test ! -d ./src/zlib; then mkdir ./src/zlib; fi
+       mkdir -p ./lib
+       mkdir -p ./src
+       mkdir -p ./src/common
+       mkdir -p ./src/msw
+       mkdir -p ./src/gtk
+       mkdir -p ./src/motif
+       mkdir -p ./src/motif/xmcombo
+       mkdir -p ./src/generic
+       mkdir -p ./src/unix
+       mkdir -p ./src/html
+       mkdir -p ./src/png
+       mkdir -p ./src/jpeg
+       mkdir -p ./src/zlib
 
 @WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
        $(AR) $(AROPTIONS) ./lib/$@ $(OBJECTS)
@@ -471,20 +471,20 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
        $(INSTALL_SCRIPT) $(top_builddir)/wx-config $(bindir)/wx-config
        $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
        
-       @if test ! -d $(libdir)/wx; then mkdir $(libdir)/wx; fi
-       @if test ! -d $(libdir)/wx/include; then mkdir $(libdir)/wx/include; fi
-       @if test ! -d $(libdir)/wx/include/wx; then mkdir $(libdir)/wx/include/wx; fi
-       @if test ! -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@; then mkdir $(libdir)/wx/include/wx/@TOOLKIT_DIR@; fi
+       @mkdir -p $(libdir)/wx
+       @mkdir -p $(libdir)/wx/include
+       @mkdir -p $(libdir)/wx/include/wx
+       @mkdir -p $(libdir)/wx/include/wx/@TOOLKIT_DIR@
        $(INSTALL_DATA) $(top_builddir)/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
        
-       @if test ! -d $(includedir)/wx; then mkdir $(includedir)/wx; fi
-       @if test ! -d $(includedir)/wx/msw; then mkdir $(includedir)/wx/msw; fi
-       @if test ! -d $(includedir)/wx/gtk; then mkdir $(includedir)/wx/gtk; fi
-       @if test ! -d $(includedir)/wx/motif; then mkdir $(includedir)/wx/motif; fi
-       @if test ! -d $(includedir)/wx/html; then mkdir $(includedir)/wx/html; fi
-       @if test ! -d $(includedir)/wx/protocol; then mkdir $(includedir)/wx/protocol; fi
-       @if test ! -d $(includedir)/wx/unix; then mkdir $(includedir)/wx/unix; fi
-       @if test ! -d $(includedir)/wx/generic; then mkdir $(includedir)/wx/generic; fi
+       @mkdir -p $(includedir)/wx
+       @mkdir -p $(includedir)/wx/msw
+       @mkdir -p $(includedir)/wx/gtk
+       @mkdir -p $(includedir)/wx/motif
+       @mkdir -p $(includedir)/wx/html
+       @mkdir -p $(includedir)/wx/protocol
+       @mkdir -p $(includedir)/wx/unix
+       @mkdir -p $(includedir)/wx/generic
        @list='$(HEADERS)'; for p in $$list; do \
          $(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \
          echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \

diff --git a/samples/bombs/Makefile.in b/samples/bombs/Makefile.in
index a502d5da53c64d2c93ebb686647cdf4eaac3edb4..2ceb45aa779e181358274b79ba082cd2c7256951 100644 (file)
--- a/samples/bombs/Makefile.in
+++ b/samples/bombs/Makefile.in
@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/bombs
+
 PROGRAM=bombs
 
 OBJECTS = bombs.o bombs1.o game.o

diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in
index 8643c701834964cd9fa77a0507d2f93d7feefb00..3d9142b1f0e00082cc8fa5d2e9ffd47e7b0fe0dc 100644 (file)
--- a/samples/caret/Makefile.in
+++ b/samples/caret/Makefile.in
@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/caret
+
 PROGRAM=caret
 
 OBJECTS=$(PROGRAM).o

diff --git a/samples/checklst/Makefile.in b/samples/checklst/Makefile.in
index 4bc8493433cd3c86fd28a706fc4f5031a1eb151a..389f8e145b25f6707349d5cf4df8b835ce63ce3a 100644 (file)
--- a/samples/checklst/Makefile.in
+++ b/samples/checklst/Makefile.in
@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/checklst
+
 PROGRAM=checklst
 
 OBJECTS=$(PROGRAM).o

diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in
index a0b7361ec536573351330a76b0a2753b55941e46..11bec9ebb47bc501b1137d47664e805d6160f7b2 100644 (file)
--- a/samples/config/Makefile.in
+++ b/samples/config/Makefile.in
@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/config
+
 PROGRAM=conftest
 
 OBJECTS=$(PROGRAM).o

diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in
index 5ae328b70d2f89e452a24c45fc530b24d4490fb5..399c4875194949f51afb2c11c06a7bd4c44533b5 100644 (file)
--- a/samples/controls/Makefile.in
+++ b/samples/controls/Makefile.in
@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/controls
+
 PROGRAM=controls
 
 OBJECTS=$(PROGRAM).o

diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in
index 66cc206f5f9e1591f2e530dc70ce99fda5ac3760..4a642b7c808793c0c122db2599c21a0aca51c4eb 100644 (file)
--- a/samples/dialogs/Makefile.in
+++ b/samples/dialogs/Makefile.in
@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/dialogs
+
 PROGRAM=dialogs
 
 OBJECTS=$(PROGRAM).o

diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in
index 737359f3fef97efc568390be6c643bb865a5716a..880af4d078d1f37fc783a3e5896d97b8cb6d9808 100644 (file)
--- a/samples/dnd/Makefile.in
+++ b/samples/dnd/Makefile.in
@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/dnd
+
 PROGRAM=dnd
 
 OBJECTS=$(PROGRAM).o

diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in
index b9d38717e3a004ae568561ba44a86660df49f1b6..156000b2adbe0e2982737a0995e935c7df019f3d 100644 (file)
--- a/samples/docview/Makefile.in
+++ b/samples/docview/Makefile.in
@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/docview
+
 PROGRAM=docview
 
 OBJECTS=$(PROGRAM).o doc.o view.o

diff --git a/samples/docvwmdi/Makefile.in b/samples/docvwmdi/Makefile.in
index 8cf0cfdc72203cffc8249563cd211d439ee7a927..e1df03d8cede6e43b1c66fe698063fa626b424ac 100644 (file)
--- a/samples/docvwmdi/Makefile.in
+++ b/samples/docvwmdi/Makefile.in
@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/docvwmdi
+
 PROGRAM=docview
 
 OBJECTS=$(PROGRAM).o doc.o view.o

diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in
index 3ea05ff32cbb05b4822f6522cbce1f44e0218571..49de1b97fdbb4a7395b93c288bcb5acc3d7bb416 100644 (file)
--- a/samples/drawing/Makefile.in
+++ b/samples/drawing/Makefile.in
@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/drawing
+
 PROGRAM=drawing
 
 OBJECTS=$(PROGRAM).o

diff --git a/samples/dynamic/Makefile.in b/samples/dynamic/Makefile.in
index 9705a972b873ba24e3c600b08896e08158e340fe..11715ad0a1f1a3a1ad94ede9cea936bbbd6acd32 100644 (file)
--- a/samples/dynamic/Makefile.in
+++ b/samples/dynamic/Makefile.in
@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/dynamic
+
 PROGRAM=dynamic
 
 OBJECTS=$(PROGRAM).o

diff --git a/samples/html/.cvsignore b/samples/html/.cvsignore
index 70845e08eb0b807b1022dc47cd27e67f726d4a0f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/samples/html/.cvsignore
+++ b/samples/html/.cvsignore
@@ -1 +0,0 @@
-Makefile.in

diff --git a/samples/html/Makefile.am b/samples/html/Makefile.am
deleted file mode 100644 (file)
index 6eee574..0000000
--- a/samples/html/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-## Purpose: The automake makefile for wxHTML samples
-## Author:  VS
-## Version: $Id$
-##
-## Process this file with automake to produce Makefile.in
-
-SUBDIRS = about help printing test virtual widget zip
-

diff --git a/samples/html/about/.cvsignore b/samples/html/about/.cvsignore
index 70845e08eb0b807b1022dc47cd27e67f726d4a0f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/samples/html/about/.cvsignore
+++ b/samples/html/about/.cvsignore
@@ -1 +0,0 @@
-Makefile.in

diff --git a/samples/html/about/Makefile.am b/samples/html/about/Makefile.am
deleted file mode 100644 (file)
index 56e4183..0000000
--- a/samples/html/about/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-AUTOMAKE_OPTIONS = 1.3 no-dependencies
-
-SUFFIXES = .cpp
-
-DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
-
-noinst_PROGRAMS = about
-
-about_SOURCES = about.cpp

diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in
new file mode 100644 (file)
index 0000000..a4f19d5
--- /dev/null
+++ b/samples/html/about/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/about
+
+PROGRAM=about
+
+OBJECTS=$(PROGRAM).o
+
+include ../../../src/makeprog.env
+

diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in
index 0ed0d7bd3de4da250865a14df225ea6e2c0906a6..043239a72a9fd1bd2d6f39503c2d368ecfdc5264 100644 (file)
--- a/samples/image/Makefile.in
+++ b/samples/image/Makefile.in
@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/image
+
 PROGRAM=image
 
 OBJECTS=$(PROGRAM).o

diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in
index 30d7f330457e9bf667cc867f11f96713282d40c0..64ea755d4158405d76f03ebc0e86e23dec63d40a 100644 (file)
--- a/samples/layout/Makefile.in
+++ b/samples/layout/Makefile.in
@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/layout
+
 PROGRAM=layout
 
 OBJECTS=$(PROGRAM).o

diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in
index 0024e9608ffb0e686a8c88346647e2d40b7e1553..1a6fb6c18e1d71628dccc68f9d731229ac047a0d 100644 (file)
--- a/samples/listctrl/Makefile.in
+++ b/samples/listctrl/Makefile.in
@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/listctrl
+
 PROGRAM=listtest
 
 OBJECTS=$(PROGRAM).o

diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in
index b3ec46662bc0fe872fb07a1f6d4e106e1f0aaab9..148d0aa9b12ac01dd4514bc497945e04e531f026 100644 (file)
--- a/samples/mdi/Makefile.in
+++ b/samples/mdi/Makefile.in
@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/mdi
+
 PROGRAM=mdi
 
 OBJECTS=$(PROGRAM).o

diff --git a/samples/minifram/Makefile.in b/samples/minifram/Makefile.in
index 0e0ce03472adab9cae60932b9dca2f5652e24ea0..6675e56f6968053aff3dfffae9b53cfbf391228c 100644 (file)
--- a/samples/minifram/Makefile.in
+++ b/samples/minifram/Makefile.in
@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/minifram
+
 PROGRAM=test
 
 OBJECTS=$(PROGRAM).o

diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in
index d005a1ee85187b31bc797323f852869096176c88..6c3e5374a7c75b7da00073f647b1ba644d4cb4a9 100644 (file)
--- a/samples/minimal/Makefile.in
+++ b/samples/minimal/Makefile.in
@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/minimal
+
 PROGRAM=minimal
 
 OBJECTS=$(PROGRAM).o

diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in
index 6cb90efc3d4e1472f15395fa4979c8dfb60e384e..b80dbaa37ed7176ce5f720e1e236edbc71bf988c 100644 (file)
--- a/samples/notebook/Makefile.in
+++ b/samples/notebook/Makefile.in
@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/notebook
+
 PROGRAM=test
 
 OBJECTS=$(PROGRAM).o

diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in
index b5c0d51ace9936dbfe1f5e4273703b741d6ce3b8..30c2bcbc03303fb4001a10312f40b68910950159 100644 (file)
--- a/samples/printing/Makefile.in
+++ b/samples/printing/Makefile.in
@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/printing
+
 PROGRAM=printing
 
 OBJECTS=$(PROGRAM).o

diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in
index c54949ede8d485eafa035f887b4b905385f123a1..83f69c1a6d641c98592971d3a1069386a0bd87e3 100644 (file)
--- a/samples/sashtest/Makefile.in
+++ b/samples/sashtest/Makefile.in
@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/sashtest
+
 PROGRAM=sashtest
 
 OBJECTS=$(PROGRAM).o

diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in
index 7a2e94e2080b2948f153ec1b96a11e91bdf12914..ccde687e65c6442605afed2e5d0c7f04840970dc 100644 (file)
--- a/samples/scroll/Makefile.in
+++ b/samples/scroll/Makefile.in
@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/scroll
+
 PROGRAM=scroll
 
 OBJECTS=$(PROGRAM).o

diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in
index 4ab0aea22789efe6c12773cb7900e65ef139b012..db05a9b6819de2e8a67a8c69734f1ae13b330dba 100644 (file)
--- a/samples/splitter/Makefile.in
+++ b/samples/splitter/Makefile.in
@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/splitter
+
 PROGRAM=test
 
 OBJECTS=$(PROGRAM).o

diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in
index f0a4715d75fce27d7b630ac2d8915d756090ef30..5030837fae5597241993f2d0fe9017c1ebb63ed2 100644 (file)
--- a/samples/text/Makefile.in
+++ b/samples/text/Makefile.in
@@ -7,11 +7,13 @@
 #
 # "%W% %G%"
 #
-# Makefile for controls example (UNIX).
+# Makefile for text example (UNIX).
 
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/text
+
 PROGRAM=controls
 
 OBJECTS=$(PROGRAM).o

diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in
index c5e925a5b9a90666240509028e2fe0898d4dbf01..86146e170bc2a59a5d29f94f47ca38899497226c 100644 (file)
--- a/samples/thread/Makefile.in
+++ b/samples/thread/Makefile.in
@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/thread
+
 PROGRAM=test
 
 OBJECTS=$(PROGRAM).o

diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in
index 0e0ce03472adab9cae60932b9dca2f5652e24ea0..4f891b483af20fb14e69ef50d926c2bbcadc99f4 100644 (file)
--- a/samples/toolbar/Makefile.in
+++ b/samples/toolbar/Makefile.in
@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/toolbar
+
 PROGRAM=test
 
 OBJECTS=$(PROGRAM).o

diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in
index df8080f5dca739b1f7fbe47ef4df038e2e896bc8..112c0a3be80b32e84be35cf84234999bb01050db 100644 (file)
--- a/samples/treectrl/Makefile.in
+++ b/samples/treectrl/Makefile.in
@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/treectrl
+
 PROGRAM=treetest
 
 OBJECTS=$(PROGRAM).o

diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in
index 2cc3a6bab2d844a79de2ed5457fcfe33e7d03da4..a4f4236ced9a8922a8715fc4d3706156eb4f2b5f 100644 (file)
--- a/samples/typetest/Makefile.in
+++ b/samples/typetest/Makefile.in
@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/typetest
+
 PROGRAM=typetest
 
 OBJECTS=$(PROGRAM).o

diff --git a/samples/validate/.cvsignore b/samples/validate/.cvsignore
index f5eaa1a85937ad3c039965403e248ee9192db378..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- a/samples/validate/.cvsignore
+++ b/samples/validate/.cvsignore
@@ -1,2 +1 @@
-Makefile.in
 

diff --git a/samples/validate/Makefile.am b/samples/validate/Makefile.am
deleted file mode 100644 (file)
index 15d4679..0000000
--- a/samples/validate/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-AUTOMAKE_OPTIONS = 1.3 no-dependencies
-
-SUFFIXES = .cpp
-
-DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
-
-noinst_PROGRAMS = validate
-
-validate_SOURCES = validate.cpp

diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in
new file mode 100644 (file)
index 0000000..e26b4df
--- /dev/null
+++ b/samples/validate/Makefile.in
@@ -0,0 +1,22 @@
+#
+# File:                makefile.unx
+# Author:      Julian Smart
+# Created:     1998
+# Updated:     
+# Copyright:   (c) 1998 Julian Smart
+#
+# "%W% %G%"
+#
+# Makefile for validate example (UNIX).
+
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
+VPATH = :$(top_srcdir)/samples/validate
+
+PROGRAM=validate
+
+OBJECTS=$(PROGRAM).o
+
+include ../../src/makeprog.env
+

diff --git a/samples/validate/makefile.unx b/samples/validate/makefile.unx
deleted file mode 100644 (file)
index fd12e5b..0000000
--- a/samples/validate/makefile.unx
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# File:                makefile.unx
-# Author:      Julian Smart
-# Created:     1998
-# Updated:     
-# Copyright:   (c) 1998 Julian Smart
-#
-# "%W% %G%"
-#
-# Makefile for validate example (UNIX).
-
-PROGRAM=validate
-
-OBJECTS=$(PROGRAM).o
-
-include ../../src/makeprog.env
-

diff --git a/samples/wxpoem/.cvsignore b/samples/wxpoem/.cvsignore
index f5eaa1a85937ad3c039965403e248ee9192db378..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- a/samples/wxpoem/.cvsignore
+++ b/samples/wxpoem/.cvsignore
@@ -1,2 +1 @@
-Makefile.in
 

diff --git a/samples/wxpoem/Makefile.am b/samples/wxpoem/Makefile.am
deleted file mode 100644 (file)
index 707a243..0000000
--- a/samples/wxpoem/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-AUTOMAKE_OPTIONS = 1.3 no-dependencies
-
-SUFFIXES = .cpp
-
-DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
-
-noinst_PROGRAMS = wxpoem
-
-wxpoem_SOURCES = wxpoem.cpp
-
-# create a link to the file needed to run the sample
-all-local:
-       @if [ ! -e wxpoem.dat ]; then ln -s $(srcdir)/wxpoem.dat wxpoem.dat; fi

diff --git a/samples/wxpoem/Makefile.in b/samples/wxpoem/Makefile.in
new file mode 100644 (file)
index 0000000..d33bec9
--- /dev/null
+++ b/samples/wxpoem/Makefile.in
@@ -0,0 +1,22 @@
+#
+# File:                makefile.unx
+# Author:      Julian Smart
+# Created:     1998
+# Updated:     
+# Copyright:   (c) 1998 Julian Smart
+#
+# "%W% %G%"
+#
+# Makefile for wxPoem example (UNIX).
+
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
+VPATH = :$(top_srcdir)/samples/wxpoem
+
+PROGRAM=wxpoem
+
+OBJECTS=$(PROGRAM).o
+
+include ../../src/makeprog.env
+

diff --git a/samples/wxpoem/makefile.unx b/samples/wxpoem/makefile.unx
deleted file mode 100644 (file)
index 6135be9..0000000
--- a/samples/wxpoem/makefile.unx
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# File:                makefile.unx
-# Author:      Julian Smart
-# Created:     1998
-# Updated:     
-# Copyright:   (c) 1998 Julian Smart
-#
-# "%W% %G%"
-#
-# Makefile for wxPoem example (UNIX).
-
-PROGRAM=wxpoem
-
-OBJECTS=$(PROGRAM).o
-
-include ../../src/makeprog.env
-

diff --git a/samples/wxsocket/.cvsignore b/samples/wxsocket/.cvsignore
index f5eaa1a85937ad3c039965403e248ee9192db378..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- a/samples/wxsocket/.cvsignore
+++ b/samples/wxsocket/.cvsignore
@@ -1,2 +1 @@
-Makefile.in
 

diff --git a/samples/wxsocket/Makefile.am b/samples/wxsocket/Makefile.am
deleted file mode 100644 (file)
index bb48e08..0000000
--- a/samples/wxsocket/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-AUTOMAKE_OPTIONS = 1.3 no-dependencies
-
-SUFFIXES = .cpp
-
-DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
-
-noinst_PROGRAMS = client server
-
-client_SOURCES = client.cpp
-server_SOURCES = server.cpp

diff --git a/samples/wxsocket/Makefile.in b/samples/wxsocket/Makefile.in
new file mode 100644 (file)
index 0000000..1f8542f
--- /dev/null
+++ b/samples/wxsocket/Makefile.in
@@ -0,0 +1,36 @@
+#
+# File:                Makefile.in
+# Author:      Julian Smart
+# Created:     1998
+# Updated:     
+# Copyright:   (c) 1998 Julian Smart
+#
+# "%W% %G%"
+#
+# Makefile for wxsocket example (UNIX).
+
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
+VPATH = :$(top_srcdir)/samples/wxsocket
+
+# Clears all default suffixes
+.SUFFIXES:     .o .cpp .c .cxx
+
+.cpp.o :
+       $(CC) -c $(CPPFLAGS) -o $@ $<
+
+# Set defaults from configure
+include ../../src/make.env
+
+all:   client server
+
+client:        client.o ../../lib/@WX_TARGET_LIBRARY@
+       $(CC) $(LDFLAGS) -o client client.o $(LDLIBS)
+
+server:        server.o ../../lib/@WX_TARGET_LIBRARY@
+       $(CC) $(LDFLAGS) -o server server.o $(LDLIBS)
+
+clean:
+       rm -f $(OBJECTS) $(PROGRAM) core
+

diff --git a/src/makelib.env.in b/src/makelib.env.in
index c3372e14b18f00c1eaee4bf1b29f705ccd1cd330..8d7873bdf4f00722cf67ee9937dfc7960908c08b 100644 (file)
--- a/src/makelib.env.in
+++ b/src/makelib.env.in
@@ -1,8 +1,5 @@
 # Makes a library in Unix (Motif)
 
-# Replace this with your own path if necessary
-WXDIR       = $(WXWIN)
-
 # Clears all default suffixes
 .SUFFIXES:     .o .cpp .c .cxx
 
@@ -15,11 +12,7 @@ WXDIR       = $(WXWIN)
 .cxx.o :
        $(CC) -c $(CPPFLAGS) -o $@ $<
 
-# this is for using the samples in ../samples/xxxxx
-pretop_srcdir = @top_srcdir@
-top_srcdir = ../$(pretop_srcdir)
-top_builddir = ../..
-include ../../src/make.env
+include $(top_builddir)/src/make.env
 
 all:    $(LIBTARGET).a
 

diff --git a/src/makeprog.env.in b/src/makeprog.env.in
index 667568137ce04af1681581c14292fe777abc1d99..f3b63f6e1171504fa4f6fa2779fcb5ea6311ecdb 100644 (file)
--- a/src/makeprog.env.in
+++ b/src/makeprog.env.in
@@ -1,8 +1,5 @@
 # Make environment for making samples on Unix
 
-# Replace this with your own path if necessary
-WXDIR       = $(WXWIN)
-
 # Clears all default suffixes
 .SUFFIXES:     .o .cpp .c .cxx
 
@@ -15,15 +12,12 @@ WXDIR       = $(WXWIN)
 .cxx.o :
        $(CC) -c $(CPPFLAGS) -o $@ $<
 
-# this is for using the samples in ../samples/xxxxx
-pretop_srcdir = @top_srcdir@
-top_srcdir = ../$(pretop_srcdir)
-top_builddir = ../..
-include ../../src/make.env
+# Set defaults from configure
+include $(top_builddir)/src/make.env
 
 all:    $(PROGRAM)
 
-$(PROGRAM):    $(OBJECTS) ../../lib/@WX_TARGET_LIBRARY@
+$(PROGRAM):    $(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@
        $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(LDLIBS)
 
 clean: