Makefile fixes

  Added resource sample (segvs)
  Added functions to menu, mdi, frame, dialog, window
    that were missing e.g. in wxPython

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

diff --git a/samples/config/.cvsignore b/samples/config/.cvsignore
index 4daa84b813bc1c017fa8d226e233a2b3f1905a48..7957c412169679bb2eccea94b77186fa52bde6b5 100644 (file)
--- a/samples/config/.cvsignore
+++ b/samples/config/.cvsignore
@@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
\ No newline at end of file

diff --git a/samples/config/Makefile b/samples/config/Makefile
index 027d82ae19872319aee4ed130e8596da7cc039d6..1a249aa73ced54a160cd6917b369c9e8dc4b3b78 100644 (file)
--- a/samples/config/Makefile
+++ b/samples/config/Makefile
@@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

diff --git a/samples/controls/.cvsignore b/samples/controls/.cvsignore
index 4daa84b813bc1c017fa8d226e233a2b3f1905a48..7957c412169679bb2eccea94b77186fa52bde6b5 100644 (file)
--- a/samples/controls/.cvsignore
+++ b/samples/controls/.cvsignore
@@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
\ No newline at end of file

diff --git a/samples/controls/Makefile b/samples/controls/Makefile
index 027d82ae19872319aee4ed130e8596da7cc039d6..1a249aa73ced54a160cd6917b369c9e8dc4b3b78 100644 (file)
--- a/samples/controls/Makefile
+++ b/samples/controls/Makefile
@@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in
index 5654689bb07fc485018a14a136780710a1b5ba8e..f011b493a7be227ba17e7f78566df19a922ac391 100644 (file)
--- a/samples/controls/Makefile.in
+++ b/samples/controls/Makefile.in
@@ -7,7 +7,7 @@ OS=@OS@
 RULE=bin
 
 # define library name
-BIN_TARGET=test
+BIN_TARGET=controls
 # define library sources
 BIN_SRC=\
 controls.cpp

diff --git a/samples/dialogs/.cvsignore b/samples/dialogs/.cvsignore
index 4daa84b813bc1c017fa8d226e233a2b3f1905a48..7957c412169679bb2eccea94b77186fa52bde6b5 100644 (file)
--- a/samples/dialogs/.cvsignore
+++ b/samples/dialogs/.cvsignore
@@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
\ No newline at end of file

diff --git a/samples/dialogs/Makefile b/samples/dialogs/Makefile
index 027d82ae19872319aee4ed130e8596da7cc039d6..1a249aa73ced54a160cd6917b369c9e8dc4b3b78 100644 (file)
--- a/samples/dialogs/Makefile
+++ b/samples/dialogs/Makefile
@@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

diff --git a/samples/dnd/.cvsignore b/samples/dnd/.cvsignore
index 4337eb7ac0cf926a334ba752ab967511a11cfc44..7957c412169679bb2eccea94b77186fa52bde6b5 100644 (file)
--- a/samples/dnd/.cvsignore
+++ b/samples/dnd/.cvsignore
@@ -1,3 +1,3 @@
 Linux
 linux-gnu
-linux-gnu
+linux
\ No newline at end of file

diff --git a/samples/dnd/Makefile b/samples/dnd/Makefile
index 027d82ae19872319aee4ed130e8596da7cc039d6..1a249aa73ced54a160cd6917b369c9e8dc4b3b78 100644 (file)
--- a/samples/dnd/Makefile
+++ b/samples/dnd/Makefile
@@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

diff --git a/samples/docview/.cvsignore b/samples/docview/.cvsignore
index 4daa84b813bc1c017fa8d226e233a2b3f1905a48..7957c412169679bb2eccea94b77186fa52bde6b5 100644 (file)
--- a/samples/docview/.cvsignore
+++ b/samples/docview/.cvsignore
@@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
\ No newline at end of file

diff --git a/samples/docview/Makefile b/samples/docview/Makefile
index 027d82ae19872319aee4ed130e8596da7cc039d6..1a249aa73ced54a160cd6917b369c9e8dc4b3b78 100644 (file)
--- a/samples/docview/Makefile
+++ b/samples/docview/Makefile
@@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

diff --git a/samples/docvwmdi/.cvsignore b/samples/docvwmdi/.cvsignore
index 4daa84b813bc1c017fa8d226e233a2b3f1905a48..7957c412169679bb2eccea94b77186fa52bde6b5 100644 (file)
--- a/samples/docvwmdi/.cvsignore
+++ b/samples/docvwmdi/.cvsignore
@@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
\ No newline at end of file

diff --git a/samples/docvwmdi/Makefile b/samples/docvwmdi/Makefile
index 027d82ae19872319aee4ed130e8596da7cc039d6..1a249aa73ced54a160cd6917b369c9e8dc4b3b78 100644 (file)
--- a/samples/docvwmdi/Makefile
+++ b/samples/docvwmdi/Makefile
@@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

diff --git a/samples/dynamic/.cvsignore b/samples/dynamic/.cvsignore
index 4daa84b813bc1c017fa8d226e233a2b3f1905a48..7957c412169679bb2eccea94b77186fa52bde6b5 100644 (file)
--- a/samples/dynamic/.cvsignore
+++ b/samples/dynamic/.cvsignore
@@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
\ No newline at end of file

diff --git a/samples/dynamic/Makefile b/samples/dynamic/Makefile
index 027d82ae19872319aee4ed130e8596da7cc039d6..1a249aa73ced54a160cd6917b369c9e8dc4b3b78 100644 (file)
--- a/samples/dynamic/Makefile
+++ b/samples/dynamic/Makefile
@@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

diff --git a/samples/dynamic/Makefile.in b/samples/dynamic/Makefile.in
index 13d042e5efd36ec7b9702729730456f2da7916f8..ad872ffe11279d5b5e063ef270ea39b4cc2204e8 100644 (file)
--- a/samples/dynamic/Makefile.in
+++ b/samples/dynamic/Makefile.in
@@ -7,7 +7,7 @@ OS=@OS@
 RULE=bin
 
 # define library name
-BIN_TARGET=test
+BIN_TARGET=dynamic
 # define library sources
 BIN_SRC=\
 minimal.cpp

diff --git a/samples/forty/.cvsignore b/samples/forty/.cvsignore
index 4daa84b813bc1c017fa8d226e233a2b3f1905a48..7957c412169679bb2eccea94b77186fa52bde6b5 100644 (file)
--- a/samples/forty/.cvsignore
+++ b/samples/forty/.cvsignore
@@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
\ No newline at end of file

diff --git a/samples/forty/Makefile b/samples/forty/Makefile
index 027d82ae19872319aee4ed130e8596da7cc039d6..1a249aa73ced54a160cd6917b369c9e8dc4b3b78 100644 (file)
--- a/samples/forty/Makefile
+++ b/samples/forty/Makefile
@@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

diff --git a/samples/grid/.cvsignore b/samples/grid/.cvsignore
index 4daa84b813bc1c017fa8d226e233a2b3f1905a48..7957c412169679bb2eccea94b77186fa52bde6b5 100644 (file)
--- a/samples/grid/.cvsignore
+++ b/samples/grid/.cvsignore
@@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
\ No newline at end of file

diff --git a/samples/grid/Makefile b/samples/grid/Makefile
index 027d82ae19872319aee4ed130e8596da7cc039d6..1a249aa73ced54a160cd6917b369c9e8dc4b3b78 100644 (file)
--- a/samples/grid/Makefile
+++ b/samples/grid/Makefile
@@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in
index fd1b9963fa889379c2e895655f2177acd5b74ad8..6b9f1fdd092cf37db18b79617a83311bf7261c1c 100644 (file)
--- a/samples/grid/Makefile.in
+++ b/samples/grid/Makefile.in
@@ -7,7 +7,7 @@ OS=@OS@
 RULE=bin
 
 # define library name
-BIN_TARGET=test
+BIN_TARGET=grid
 # define library sources
 BIN_SRC=\
 test.cpp

diff --git a/samples/internat/.cvsignore b/samples/internat/.cvsignore
index 4daa84b813bc1c017fa8d226e233a2b3f1905a48..7957c412169679bb2eccea94b77186fa52bde6b5 100644 (file)
--- a/samples/internat/.cvsignore
+++ b/samples/internat/.cvsignore
@@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
\ No newline at end of file

diff --git a/samples/internat/Makefile b/samples/internat/Makefile
index 027d82ae19872319aee4ed130e8596da7cc039d6..1a249aa73ced54a160cd6917b369c9e8dc4b3b78 100644 (file)
--- a/samples/internat/Makefile
+++ b/samples/internat/Makefile
@@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in
index 774cdbd7789daf0d21cc0804f6a145625504511c..551d016327a46b1b5eaf2e75612be288867dd046 100644 (file)
--- a/samples/internat/Makefile.in
+++ b/samples/internat/Makefile.in
@@ -7,7 +7,7 @@ OS=@OS@
 RULE=bin
 
 # define library name
-BIN_TARGET=test
+BIN_TARGET=internat
 # define library sources
 BIN_SRC=\
 internat.cpp

diff --git a/samples/layout/.cvsignore b/samples/layout/.cvsignore
index 4daa84b813bc1c017fa8d226e233a2b3f1905a48..7957c412169679bb2eccea94b77186fa52bde6b5 100644 (file)
--- a/samples/layout/.cvsignore
+++ b/samples/layout/.cvsignore
@@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
\ No newline at end of file

diff --git a/samples/layout/Makefile b/samples/layout/Makefile
index 027d82ae19872319aee4ed130e8596da7cc039d6..1a249aa73ced54a160cd6917b369c9e8dc4b3b78 100644 (file)
--- a/samples/layout/Makefile
+++ b/samples/layout/Makefile
@@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in
index 65e4932f02db388c09f284246dff5a172c1e2c75..fff7673056c8638e5e0995fe096d5e8ab33c916d 100644 (file)
--- a/samples/layout/Makefile.in
+++ b/samples/layout/Makefile.in
@@ -7,7 +7,7 @@ OS=@OS@
 RULE=bin
 
 # define library name
-BIN_TARGET=test
+BIN_TARGET=layout
 # define library sources
 BIN_SRC=\
 layout.cpp

diff --git a/samples/mdi/.cvsignore b/samples/mdi/.cvsignore
index 4daa84b813bc1c017fa8d226e233a2b3f1905a48..7957c412169679bb2eccea94b77186fa52bde6b5 100644 (file)
--- a/samples/mdi/.cvsignore
+++ b/samples/mdi/.cvsignore
@@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
\ No newline at end of file

diff --git a/samples/mdi/Makefile b/samples/mdi/Makefile
index 027d82ae19872319aee4ed130e8596da7cc039d6..1a249aa73ced54a160cd6917b369c9e8dc4b3b78 100644 (file)
--- a/samples/mdi/Makefile
+++ b/samples/mdi/Makefile
@@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in
index d7dab468aab9c3a7eebbd6f7320b0ae43a535c77..c5b3853e3bb8d1e932510de48a4fd6b7a83564e5 100644 (file)
--- a/samples/mdi/Makefile.in
+++ b/samples/mdi/Makefile.in
@@ -7,7 +7,7 @@ OS=@OS@
 RULE=bin
 
 # define library name
-BIN_TARGET=test
+BIN_TARGET=mdi
 # define library sources
 BIN_SRC=\
 mdi.cpp

diff --git a/samples/mdi/bitmaps/preview.xpm b/samples/mdi/bitmaps/preview.xpm
new file mode 100644 (file)
index 0000000..0dfdca4
--- /dev/null
+++ b/samples/mdi/bitmaps/preview.xpm
@@ -0,0 +1,26 @@
+/* XPM */
+static char *preview_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 5 1",
+"  c Black",
+". c None",
+"X c Gray100",
+"o c #808080",
+"O c Cyan",
+/* pixels */
+"         .......",
+" XXXXXXX  ......",
+" XXXXXXX . .....",
+" XXXXXXX    ....",
+" XXXXXXXXXX ....",
+" XXXXXXX    ....",
+" XXXXXX o..o ...",
+" XXXXX oOO.oo ..",
+" XXXXX .O..o. ..",
+" XXXXX ....o. ..",
+" XXXXX o..Ooo ..",
+" XXXXXX o..o o..",
+" XXXXXXX    o  .",
+" XXXXXXXXXX .   ",
+"            ..  "
+};

diff --git a/samples/memcheck/.cvsignore b/samples/memcheck/.cvsignore
new file mode 100644 (file)
index 0000000..7957c41
--- /dev/null
+++ b/samples/memcheck/.cvsignore
@@ -0,0 +1,3 @@
+Linux
+linux-gnu
+linux
\ No newline at end of file

diff --git a/samples/memcheck/Makefile b/samples/memcheck/Makefile
new file mode 100644 (file)
index 0000000..1a249aa
--- /dev/null
+++ b/samples/memcheck/Makefile
@@ -0,0 +1 @@
+include ../../install/unix/setup/general/makeapp

diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in
new file mode 100644 (file)
index 0000000..35bce0c
--- /dev/null
+++ b/samples/memcheck/Makefile.in
@@ -0,0 +1,26 @@
+# WXXT base directory
+WXBASEDIR=@WXBASEDIR@
+
+# set the OS type for compilation
+OS=@OS@
+# compile a library only
+RULE=bin
+
+# define library name
+BIN_TARGET=memcheck
+# define library sources
+BIN_SRC=\
+memcheck.cpp
+
+#define library objects
+BIN_OBJ=\
+memcheck.o
+
+# additional things needed to link
+BIN_LINK=
+
+# additional things needed to compile
+ADD_COMPILE=
+
+# include the definitions now
+include ../../../template.mak

diff --git a/samples/minimal/.cvsignore b/samples/minimal/.cvsignore
index 4daa84b813bc1c017fa8d226e233a2b3f1905a48..7957c412169679bb2eccea94b77186fa52bde6b5 100644 (file)
--- a/samples/minimal/.cvsignore
+++ b/samples/minimal/.cvsignore
@@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
\ No newline at end of file

diff --git a/samples/minimal/Makefile b/samples/minimal/Makefile
index 027d82ae19872319aee4ed130e8596da7cc039d6..1a249aa73ced54a160cd6917b369c9e8dc4b3b78 100644 (file)
--- a/samples/minimal/Makefile
+++ b/samples/minimal/Makefile
@@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in
index 13d042e5efd36ec7b9702729730456f2da7916f8..b2ab5ad739cbda58cf196c43f728367e3098ec1b 100644 (file)
--- a/samples/minimal/Makefile.in
+++ b/samples/minimal/Makefile.in
@@ -7,7 +7,7 @@ OS=@OS@
 RULE=bin
 
 # define library name
-BIN_TARGET=test
+BIN_TARGET=minimal
 # define library sources
 BIN_SRC=\
 minimal.cpp

diff --git a/samples/png/.cvsignore b/samples/png/.cvsignore
index 4daa84b813bc1c017fa8d226e233a2b3f1905a48..7957c412169679bb2eccea94b77186fa52bde6b5 100644 (file)
--- a/samples/png/.cvsignore
+++ b/samples/png/.cvsignore
@@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
\ No newline at end of file

diff --git a/samples/png/Makefile b/samples/png/Makefile
index 027d82ae19872319aee4ed130e8596da7cc039d6..1a249aa73ced54a160cd6917b369c9e8dc4b3b78 100644 (file)
--- a/samples/png/Makefile
+++ b/samples/png/Makefile
@@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

diff --git a/samples/png/Makefile.in b/samples/png/Makefile.in
index 4bd9898e0afd8be69405af6be7208b6462985a13..c05f6878698acc98beed5571f858ca22ddaf1741 100644 (file)
--- a/samples/png/Makefile.in
+++ b/samples/png/Makefile.in
@@ -7,7 +7,7 @@ OS=@OS@
 RULE=bin
 
 # define library name
-BIN_TARGET=test
+BIN_TARGET=pngdemo
 # define library sources
 BIN_SRC=\
 pngdemo.cpp

diff --git a/samples/printing/.cvsignore b/samples/printing/.cvsignore
index 4daa84b813bc1c017fa8d226e233a2b3f1905a48..7957c412169679bb2eccea94b77186fa52bde6b5 100644 (file)
--- a/samples/printing/.cvsignore
+++ b/samples/printing/.cvsignore
@@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
\ No newline at end of file

diff --git a/samples/printing/Makefile b/samples/printing/Makefile
index 027d82ae19872319aee4ed130e8596da7cc039d6..1a249aa73ced54a160cd6917b369c9e8dc4b3b78 100644 (file)
--- a/samples/printing/Makefile
+++ b/samples/printing/Makefile
@@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in
index 96b25e414e2f0184582c87b3998ad802eefce7da..253013ac4720802c13130f5d63524c564c497c9b 100644 (file)
--- a/samples/printing/Makefile.in
+++ b/samples/printing/Makefile.in
@@ -7,7 +7,7 @@ OS=@OS@
 RULE=bin
 
 # define library name
-BIN_TARGET=TEST
+BIN_TARGET=printing
 # define library sources
 BIN_SRC=\
 printing.cpp

diff --git a/samples/resource/.cvsignore b/samples/resource/.cvsignore
new file mode 100644 (file)
index 0000000..7957c41
--- /dev/null
+++ b/samples/resource/.cvsignore
@@ -0,0 +1,3 @@
+Linux
+linux-gnu
+linux
\ No newline at end of file

diff --git a/samples/resource/Makefile b/samples/resource/Makefile
new file mode 100644 (file)
index 0000000..1a249aa
--- /dev/null
+++ b/samples/resource/Makefile
@@ -0,0 +1 @@
+include ../../install/unix/setup/general/makeapp

diff --git a/samples/resource/Makefile.in b/samples/resource/Makefile.in
new file mode 100644 (file)
index 0000000..c0251fd
--- /dev/null
+++ b/samples/resource/Makefile.in
@@ -0,0 +1,26 @@
+# WXXT base directory
+WXBASEDIR=@WXBASEDIR@
+
+# set the OS type for compilation
+OS=@OS@
+# compile a library only
+RULE=bin
+
+# define library name
+BIN_TARGET=resource
+# define library sources
+BIN_SRC=\
+resource.cpp
+
+#define library objects
+BIN_OBJ=\
+resource.o
+
+# additional things needed to link
+BIN_LINK=
+
+# additional things needed to compile
+ADD_COMPILE=
+
+# include the definitions now
+include ../../../template.mak

diff --git a/samples/splitter/.cvsignore b/samples/splitter/.cvsignore
index 4daa84b813bc1c017fa8d226e233a2b3f1905a48..7957c412169679bb2eccea94b77186fa52bde6b5 100644 (file)
--- a/samples/splitter/.cvsignore
+++ b/samples/splitter/.cvsignore
@@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
\ No newline at end of file

diff --git a/samples/splitter/Makefile b/samples/splitter/Makefile
index 027d82ae19872319aee4ed130e8596da7cc039d6..1a249aa73ced54a160cd6917b369c9e8dc4b3b78 100644 (file)
--- a/samples/splitter/Makefile
+++ b/samples/splitter/Makefile
@@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in
index fd1b9963fa889379c2e895655f2177acd5b74ad8..522773e6cb3f39636df8c3dc0eeb6323b8f76423 100644 (file)
--- a/samples/splitter/Makefile.in
+++ b/samples/splitter/Makefile.in
@@ -7,7 +7,7 @@ OS=@OS@
 RULE=bin
 
 # define library name
-BIN_TARGET=test
+BIN_TARGET=splitter
 # define library sources
 BIN_SRC=\
 test.cpp

diff --git a/samples/tab/.cvsignore b/samples/tab/.cvsignore
index 4daa84b813bc1c017fa8d226e233a2b3f1905a48..7957c412169679bb2eccea94b77186fa52bde6b5 100644 (file)
--- a/samples/tab/.cvsignore
+++ b/samples/tab/.cvsignore
@@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
\ No newline at end of file

diff --git a/samples/tab/Makefile b/samples/tab/Makefile
index 027d82ae19872319aee4ed130e8596da7cc039d6..1a249aa73ced54a160cd6917b369c9e8dc4b3b78 100644 (file)
--- a/samples/tab/Makefile
+++ b/samples/tab/Makefile
@@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

diff --git a/samples/tab/Makefile.in b/samples/tab/Makefile.in
index fd1b9963fa889379c2e895655f2177acd5b74ad8..3684cd27fafcc9470947c2ba154590c0a6ed16cd 100644 (file)
--- a/samples/tab/Makefile.in
+++ b/samples/tab/Makefile.in
@@ -7,7 +7,7 @@ OS=@OS@
 RULE=bin
 
 # define library name
-BIN_TARGET=test
+BIN_TARGET=tab
 # define library sources
 BIN_SRC=\
 test.cpp

diff --git a/samples/thread/.cvsignore b/samples/thread/.cvsignore
index 4daa84b813bc1c017fa8d226e233a2b3f1905a48..7957c412169679bb2eccea94b77186fa52bde6b5 100644 (file)
--- a/samples/thread/.cvsignore
+++ b/samples/thread/.cvsignore
@@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
\ No newline at end of file

diff --git a/samples/thread/Makefile b/samples/thread/Makefile
index 027d82ae19872319aee4ed130e8596da7cc039d6..1a249aa73ced54a160cd6917b369c9e8dc4b3b78 100644 (file)
--- a/samples/thread/Makefile
+++ b/samples/thread/Makefile
@@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in
index 237f2030f70d746d14ac3ee12d5f6f43d3de2aec..127fbc82ed79cf761cf935d280e65bd397ac093c 100644 (file)
--- a/samples/thread/Makefile.in
+++ b/samples/thread/Makefile.in
@@ -7,7 +7,7 @@ OS=@OS@
 RULE=bin
 
 # define library name
-BIN_TARGET=test
+BIN_TARGET=thread
 # define library sources
 BIN_SRC=\
 test.cpp

diff --git a/samples/toolbar/.cvsignore b/samples/toolbar/.cvsignore
index 4daa84b813bc1c017fa8d226e233a2b3f1905a48..7957c412169679bb2eccea94b77186fa52bde6b5 100644 (file)
--- a/samples/toolbar/.cvsignore
+++ b/samples/toolbar/.cvsignore
@@ -1,2 +1,3 @@
 Linux
 linux-gnu
+linux
\ No newline at end of file

diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in
index fd1b9963fa889379c2e895655f2177acd5b74ad8..9e9b1b68eb38e8e318ab9ad9f665c675142fb2ee 100644 (file)
--- a/samples/toolbar/Makefile.in
+++ b/samples/toolbar/Makefile.in
@@ -7,7 +7,7 @@ OS=@OS@
 RULE=bin
 
 # define library name
-BIN_TARGET=test
+BIN_TARGET=toolbar
 # define library sources
 BIN_SRC=\
 test.cpp

diff --git a/samples/treectrl/.cvsignore b/samples/treectrl/.cvsignore
new file mode 100644 (file)
index 0000000..7957c41
--- /dev/null
+++ b/samples/treectrl/.cvsignore
@@ -0,0 +1,3 @@
+Linux
+linux-gnu
+linux
\ No newline at end of file

diff --git a/samples/treectrl/Makefile b/samples/treectrl/Makefile
new file mode 100644 (file)
index 0000000..1a249aa
--- /dev/null
+++ b/samples/treectrl/Makefile
@@ -0,0 +1 @@
+include ../../install/unix/setup/general/makeapp

diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in
new file mode 100644 (file)
index 0000000..8f09105
--- /dev/null
+++ b/samples/treectrl/Makefile.in
@@ -0,0 +1,26 @@
+# WXXT base directory
+WXBASEDIR=@WXBASEDIR@
+
+# set the OS type for compilation
+OS=@OS@
+# compile a library only
+RULE=bin
+
+# define library name
+BIN_TARGET=treetest
+# define library sources
+BIN_SRC=\
+treetest.cpp
+
+#define library objects
+BIN_OBJ=\
+treetest.o
+
+# additional things needed to link
+BIN_LINK=
+
+# additional things needed to compile
+ADD_COMPILE=
+
+# include the definitions now
+include ../../../template.mak

diff --git a/samples/validate/.cvsignore b/samples/validate/.cvsignore
new file mode 100644 (file)
index 0000000..7957c41
--- /dev/null
+++ b/samples/validate/.cvsignore
@@ -0,0 +1,3 @@
+Linux
+linux-gnu
+linux
\ No newline at end of file