More samples makefiles

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

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
+	mkdir -p ./lib
-	@if test ! -d ./src; then mkdir ./src; fi
+	mkdir -p ./src
-	@if test ! -d ./src/common; then mkdir ./src/common; fi
+	mkdir -p ./src/common
-	@if test ! -d ./src/msw; then mkdir ./src/msw; fi
+	mkdir -p ./src/msw
-	@if test ! -d ./src/gtk; then mkdir ./src/gtk; fi
+	mkdir -p ./src/gtk
-	@if test ! -d ./src/motif; then mkdir ./src/motif; fi
+	mkdir -p ./src/motif
-	@if test ! -d ./src/motif/xmcombo; then mkdir ./src/motif/xmcombo; fi
+	mkdir -p ./src/motif/xmcombo
-	@if test ! -d ./src/generic; then mkdir ./src/generic; fi
+	mkdir -p ./src/generic
-	@if test ! -d ./src/unix; then mkdir ./src/unix; fi
+	mkdir -p ./src/unix
-	@if test ! -d ./src/html; then mkdir ./src/html; fi
+	mkdir -p ./src/html
-	@if test ! -d ./src/png; then mkdir ./src/png; fi
+	mkdir -p ./src/png
-	@if test ! -d ./src/jpeg; then mkdir ./src/jpeg; fi
+	mkdir -p ./src/jpeg
-	@if test ! -d ./src/zlib; then mkdir ./src/zlib; fi
+	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
+	@mkdir -p $(includedir)/wx
-	$(INSTALL) -d $(includedir)/wx/msw
+	@mkdir -p $(includedir)/wx/msw
-	$(INSTALL) -d $(includedir)/wx/gtk
+	@mkdir -p $(includedir)/wx/gtk
-	$(INSTALL) -d $(includedir)/wx/motif
+	@mkdir -p $(includedir)/wx/motif
-	$(INSTALL) -d $(includedir)/wx/html
+	@mkdir -p $(includedir)/wx/html
-	$(INSTALL) -d $(includedir)/wx/protocol
+	@mkdir -p $(includedir)/wx/protocol
-	$(INSTALL) -d $(includedir)/wx/unix
+	@mkdir -p $(includedir)/wx/unix
-	$(INSTALL) -d $(includedir)/wx/generic
+	@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."

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

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
+	mkdir -p ./lib
-	@if test ! -d ./src; then mkdir ./src; fi
+	mkdir -p ./src
-	@if test ! -d ./src/common; then mkdir ./src/common; fi
+	mkdir -p ./src/common
-	@if test ! -d ./src/msw; then mkdir ./src/msw; fi
+	mkdir -p ./src/msw
-	@if test ! -d ./src/gtk; then mkdir ./src/gtk; fi
+	mkdir -p ./src/gtk
-	@if test ! -d ./src/motif; then mkdir ./src/motif; fi
+	mkdir -p ./src/motif
-	@if test ! -d ./src/motif/xmcombo; then mkdir ./src/motif/xmcombo; fi
+	mkdir -p ./src/motif/xmcombo
-	@if test ! -d ./src/generic; then mkdir ./src/generic; fi
+	mkdir -p ./src/generic
-	@if test ! -d ./src/unix; then mkdir ./src/unix; fi
+	mkdir -p ./src/unix
-	@if test ! -d ./src/html; then mkdir ./src/html; fi
+	mkdir -p ./src/html
-	@if test ! -d ./src/png; then mkdir ./src/png; fi
+	mkdir -p ./src/png
-	@if test ! -d ./src/jpeg; then mkdir ./src/jpeg; fi
+	mkdir -p ./src/jpeg
-	@if test ! -d ./src/zlib; then mkdir ./src/zlib; fi
+	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
+	@mkdir -p $(libdir)/wx
-	@if test ! -d $(libdir)/wx/include; then mkdir $(libdir)/wx/include; fi
+	@mkdir -p $(libdir)/wx/include
-	@if test ! -d $(libdir)/wx/include/wx; then mkdir $(libdir)/wx/include/wx; fi
+	@mkdir -p $(libdir)/wx/include/wx
-	@if test ! -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@; then mkdir $(libdir)/wx/include/wx/@TOOLKIT_DIR@; fi
+	@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
+	@mkdir -p $(includedir)/wx
-	@if test ! -d $(includedir)/wx/msw; then mkdir $(includedir)/wx/msw; fi
+	@mkdir -p $(includedir)/wx/msw
-	@if test ! -d $(includedir)/wx/gtk; then mkdir $(includedir)/wx/gtk; fi
+	@mkdir -p $(includedir)/wx/gtk
-	@if test ! -d $(includedir)/wx/motif; then mkdir $(includedir)/wx/motif; fi
+	@mkdir -p $(includedir)/wx/motif
-	@if test ! -d $(includedir)/wx/html; then mkdir $(includedir)/wx/html; fi
+	@mkdir -p $(includedir)/wx/html
-	@if test ! -d $(includedir)/wx/protocol; then mkdir $(includedir)/wx/protocol; fi
+	@mkdir -p $(includedir)/wx/protocol
-	@if test ! -d $(includedir)/wx/unix; then mkdir $(includedir)/wx/unix; fi
+	@mkdir -p $(includedir)/wx/unix
-	@if test ! -d $(includedir)/wx/generic; then mkdir $(includedir)/wx/generic; fi
+	@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"; \

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

samples/caret/Makefile.in

@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/caret
+
 PROGRAM=caret
 
 OBJECTS=$(PROGRAM).o

samples/checklst/Makefile.in

@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/checklst
+
 PROGRAM=checklst
 
 OBJECTS=$(PROGRAM).o

samples/config/Makefile.in

@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/config
+
 PROGRAM=conftest
 
 OBJECTS=$(PROGRAM).o

samples/controls/Makefile.in

@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/controls
+
 PROGRAM=controls
 
 OBJECTS=$(PROGRAM).o

samples/dialogs/Makefile.in

@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/dialogs
+
 PROGRAM=dialogs
 
 OBJECTS=$(PROGRAM).o

samples/dnd/Makefile.in

@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/dnd
+
 PROGRAM=dnd
 
 OBJECTS=$(PROGRAM).o

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

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

samples/drawing/Makefile.in

@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/drawing
+
 PROGRAM=drawing
 
 OBJECTS=$(PROGRAM).o

samples/dynamic/Makefile.in

@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/dynamic
+
 PROGRAM=dynamic
 
 OBJECTS=$(PROGRAM).o

samples/html/.cvsignore

@@ -1 +0,0 @@
-Makefile.in

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
-

samples/html/about/.cvsignore

@@ -1 +0,0 @@
-Makefile.in

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

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
+

samples/image/Makefile.in

@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/image
+
 PROGRAM=image
 
 OBJECTS=$(PROGRAM).o

samples/layout/Makefile.in

@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/layout
+
 PROGRAM=layout
 
 OBJECTS=$(PROGRAM).o

samples/listctrl/Makefile.in

@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/listctrl
+
 PROGRAM=listtest
 
 OBJECTS=$(PROGRAM).o

samples/mdi/Makefile.in

@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/mdi
+
 PROGRAM=mdi
 
 OBJECTS=$(PROGRAM).o

samples/minifram/Makefile.in

@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/minifram
+
 PROGRAM=test
 
 OBJECTS=$(PROGRAM).o

samples/minimal/Makefile.in

@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/minimal
+
 PROGRAM=minimal
 
 OBJECTS=$(PROGRAM).o

samples/notebook/Makefile.in

@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/notebook
+
 PROGRAM=test
 
 OBJECTS=$(PROGRAM).o

samples/printing/Makefile.in

@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/printing
+
 PROGRAM=printing
 
 OBJECTS=$(PROGRAM).o

samples/sashtest/Makefile.in

@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/sashtest
+
 PROGRAM=sashtest
 
 OBJECTS=$(PROGRAM).o

samples/scroll/Makefile.in

@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/scroll
+
 PROGRAM=scroll
 
 OBJECTS=$(PROGRAM).o

samples/splitter/Makefile.in

@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/splitter
+
 PROGRAM=test
 
 OBJECTS=$(PROGRAM).o

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

samples/thread/Makefile.in

@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/thread
+
 PROGRAM=test
 
 OBJECTS=$(PROGRAM).o

samples/toolbar/Makefile.in

@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/toolbar
+
 PROGRAM=test
 
 OBJECTS=$(PROGRAM).o

samples/treectrl/Makefile.in

@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/treectrl
+
 PROGRAM=treetest
 
 OBJECTS=$(PROGRAM).o

samples/typetest/Makefile.in

@@ -12,6 +12,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 
+VPATH = :$(top_srcdir)/samples/typetest
+
 PROGRAM=typetest
 
 OBJECTS=$(PROGRAM).o

samples/validate/.cvsignore

@@ -1,2 +1 @@
-Makefile.in
 

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

samples/validate/Makefile.in

@@ -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

samples/wxpoem/.cvsignore

@@ -1,2 +1 @@
-Makefile.in
 

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

samples/wxpoem/Makefile.in

@@ -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

samples/wxsocket/.cvsignore

@@ -1,2 +1 @@
-Makefile.in
 

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

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
+

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
+include $(top_builddir)/src/make.env
-pretop_srcdir = @top_srcdir@
-top_srcdir = ../$(pretop_srcdir)
-top_builddir = ../..
-include ../../src/make.env
 
 all:    $(LIBTARGET).a
 

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
+# Set defaults from configure
-pretop_srcdir = @top_srcdir@
+include $(top_builddir)/src/make.env
-top_srcdir = ../$(pretop_srcdir)
-top_builddir = ../..
-include ../../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: