More samples makefiles

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-08-14 09:41:49 +00:00
parent 8fe0578285
commit 549c6f67f9
46 changed files with 191 additions and 144 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/samples/html/.cvsignore
+++ b/samples/html/.cvsignore
@@ -1 +0,0 @@
-Makefile.in
--- a/samples/html/Makefile.am
+++ b/samples/html/Makefile.am
@@ -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
-
--- a/samples/html/about/.cvsignore
+++ b/samples/html/about/.cvsignore
@@ -1 +0,0 @@
-Makefile.in
--- a/samples/html/about/Makefile.am
+++ b/samples/html/about/Makefile.am
@@ -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
--- a/samples/html/about/Makefile.in
+++ 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
+
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/samples/validate/.cvsignore
+++ b/samples/validate/.cvsignore
@@ -1,2 +1 @@
-Makefile.in

--- a/samples/validate/Makefile.am
+++ b/samples/validate/Makefile.am
@@ -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
--- a/samples/validate/makefile.unx
+++ b/samples/validate/makefile.unx
@@ -9,6 +9,11 @@
 #
 # Makefile for validate example (UNIX).

+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
+VPATH = :$(top_srcdir)/samples/validate
+
 PROGRAM=validate

 OBJECTS=$(PROGRAM).o
--- a/samples/wxpoem/.cvsignore
+++ b/samples/wxpoem/.cvsignore
@@ -1,2 +1 @@
-Makefile.in

--- a/samples/wxpoem/Makefile.am
+++ b/samples/wxpoem/Makefile.am
@@ -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
--- a/samples/wxpoem/makefile.unx
+++ b/samples/wxpoem/makefile.unx
@@ -9,6 +9,11 @@
 #
 # Makefile for wxPoem example (UNIX).

+top_srcdir = @top_srcdir@
+top_builddir = ../..
+
+VPATH = :$(top_srcdir)/samples/wxpoem
+
 PROGRAM=wxpoem

 OBJECTS=$(PROGRAM).o
--- a/samples/wxsocket/.cvsignore
+++ b/samples/wxsocket/.cvsignore
@@ -1,2 +1 @@
-Makefile.in

--- a/samples/wxsocket/Makefile.am
+++ b/samples/wxsocket/Makefile.am
@@ -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
--- a/samples/wxsocket/Makefile.in
+++ 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
+