More smaple makefiles

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

diff --git a/configure.in b/configure.in
index 7002888c7d1ea2fdc53f682c1b8f383865bbfa73..b2301bdf828808c86c3607a2ed52294f1c45d9af 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2703,6 +2703,19 @@ AC_OUTPUT([
             samples/checklst/Makefile
             samples/config/Makefile
             samples/controls/Makefile
+           samples/dialogs/Makefile
+           samples/docview/Makefile
+           samples/docvwmdi/Makefile
+           samples/dnd/Makefile
+           samples/drawing/Makefile
+           samples/dynamic/Makefile
+           samples/image/Makefile
+           samples/layout/Makefile
+           samples/listctrl/Makefile
+           samples/mdi/Makefile
+           samples/minifram/Makefile
+           samples/minimal/Makefile
+           samples/notebook/Makefile
             samples/printing/Makefile
           ],
           [

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

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

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

diff --git a/samples/dialogs/makefile.unx b/samples/dialogs/makefile.unx
deleted file mode 100644 (file)
index b144f19..0000000
--- a/samples/dialogs/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 dialogs example (UNIX).
-
-PROGRAM=dialogs
-
-OBJECTS=$(PROGRAM).o
-
-include ../../src/makeprog.env
-

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

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

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

diff --git a/samples/dnd/makefile.unx b/samples/dnd/makefile.unx
deleted file mode 100644 (file)
index ffbb397..0000000
--- a/samples/dnd/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 dnd example (UNIX).
-
-PROGRAM=dnd
-
-OBJECTS=$(PROGRAM).o
-
-include ../../src/makeprog.env
-

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

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

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

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

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

diff --git a/samples/docvwmdi/Makefile.am b/samples/docvwmdi/Makefile.am
deleted file mode 100644 (file)
index e35fdf0..0000000
--- a/samples/docvwmdi/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-AUTOMAKE_OPTIONS = 1.3 no-dependencies
-
-SUFFIXES = .cpp
-
-DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
-
-noinst_PROGRAMS = docview
-
-docview_SOURCES = docview.cpp doc.cpp view.cpp

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

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

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

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

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

diff --git a/samples/drawing/makefile.unx b/samples/drawing/makefile.unx
deleted file mode 100644 (file)
index 9b1b4e0..0000000
--- a/samples/drawing/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 drawing example (UNIX).
-
-PROGRAM=drawing
-
-OBJECTS=$(PROGRAM).o
-
-include ../../src/makeprog.env
-

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

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

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

diff --git a/samples/dynamic/makefile.unx b/samples/dynamic/makefile.unx
deleted file mode 100644 (file)
index c4c52d7..0000000
--- a/samples/dynamic/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 dynamic example (UNIX).
-
-PROGRAM=dynamic
-
-OBJECTS=$(PROGRAM).o
-
-include ../../src/makeprog.env
-

diff --git a/samples/image/.cvsignore b/samples/image/.cvsignore
index 4b34ba88ecb7c3f32ffbac22e65af8711487c827..f7a0c2541b976a702e16ea6ba6a93a5cebaf43ef 100644 (file)
--- a/samples/image/.cvsignore
+++ b/samples/image/.cvsignore
@@ -1,3 +1,2 @@
-Makefile.in
 test.png
 

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

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

diff --git a/samples/image/makefile.unx b/samples/image/makefile.unx
deleted file mode 100644 (file)
index 3612350..0000000
--- a/samples/image/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 image example (UNIX).
-
-PROGRAM=image
-
-OBJECTS=$(PROGRAM).o
-
-include ../../src/makeprog.env
-

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

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

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

diff --git a/samples/layout/makefile.unx b/samples/layout/makefile.unx
deleted file mode 100644 (file)
index ff2edfa..0000000
--- a/samples/layout/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 layout example (UNIX).
-
-PROGRAM=layout
-
-OBJECTS=$(PROGRAM).o
-
-include ../../src/makeprog.env
-

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

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

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

diff --git a/samples/listctrl/makefile.unx b/samples/listctrl/makefile.unx
deleted file mode 100644 (file)
index a94e6cb..0000000
--- a/samples/listctrl/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 listctrl example (UNIX).
-
-PROGRAM=listtest
-
-OBJECTS=$(PROGRAM).o
-
-include ../../src/makeprog.env
-

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

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

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

diff --git a/samples/mdi/makefile.unx b/samples/mdi/makefile.unx
deleted file mode 100644 (file)
index 4c904e4..0000000
--- a/samples/mdi/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 mdi example (UNIX).
-
-PROGRAM=mdi
-
-OBJECTS=$(PROGRAM).o
-
-include ../../src/makeprog.env
-

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

diff --git a/samples/minifram/Makefile.am b/samples/minifram/Makefile.am
deleted file mode 100644 (file)
index 3631656..0000000
--- a/samples/minifram/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/minifram/Makefile.in b/samples/minifram/Makefile.in
new file mode 100644 (file)
index 0000000..0e0ce03
--- /dev/null
+++ b/samples/minifram/Makefile.in
@@ -0,0 +1,21 @@
+#
+# File:                makefile.unx
+# Author:      Julian Smart
+# Created:     1998
+# Updated:     
+# Copyright:   (c) 1998 Julian Smart
+#
+# "%W% %G%"
+#
+# Makefile for toolbar example (UNIX).
+
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
+PROGRAM=test
+
+OBJECTS=$(PROGRAM).o
+
+include ../../src/makeprog.env
+
+

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

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

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

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

diff --git a/samples/minimal/makefile.unx b/samples/minimal/makefile.unx
deleted file mode 100644 (file)
index 6e0b9ca..0000000
--- a/samples/minimal/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 minimal example (UNIX).
-
-PROGRAM=minimal
-
-OBJECTS=$(PROGRAM).o
-
-include ../../src/makeprog.env
-

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

diff --git a/samples/notebook/Makefile.am b/samples/notebook/Makefile.am
deleted file mode 100644 (file)
index 3631656..0000000
--- a/samples/notebook/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/notebook/Makefile.in b/samples/notebook/Makefile.in
new file mode 100644 (file)
index 0000000..6cb90ef
--- /dev/null
+++ b/samples/notebook/Makefile.in
@@ -0,0 +1,20 @@
+#
+# File:                makefile.unx
+# Author:      Julian Smart
+# Created:     1998
+# Updated:     
+# Copyright:   (c) 1998 Julian Smart
+#
+# "%W% %G%"
+#
+# Makefile for notebook example (UNIX).
+
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
+PROGRAM=test
+
+OBJECTS=$(PROGRAM).o
+
+include ../../src/makeprog.env
+

diff --git a/samples/notebook/makefile.unx b/samples/notebook/makefile.unx
deleted file mode 100644 (file)
index a3f7618..0000000
--- a/samples/notebook/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 notebook example (UNIX).
-
-PROGRAM=test
-
-OBJECTS=$(PROGRAM).o
-
-include ../../src/makeprog.env
-

diff --git a/src/make.env.in b/src/make.env.in
index 720d554abba3e1bbf8653631b9129e67c5f32ba0..c3127caccbb5ac343b05aa7f1421919c08aa8be3 100644 (file)
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -63,8 +63,8 @@ SHARED_LD   = @SHARED_LD@
 ########################### Flags #################################
 
 CFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CFLAGS@
-CPPFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CXXFLAGS@
+CPPFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@
 PICFLAGS = @PIC_FLAG@
-
+LDFLAGS = @LDFLAGS@