Makefile updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-08-14 11:14:39 +00:00
parent 549c6f67f9
commit b1683d3899
46 changed files with 140 additions and 90 deletions
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@

 #
-# This file was automatically generated by tmake at 10:05, 1999/08/14
+# This file was automatically generated by tmake at 11:55, 1999/08/14
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!

 #
@@ -558,6 +558,8 @@ GTK_GENERICOBJS = \
 		src/generic/dirdlgg.o \
 		src/generic/fontdlgg.o \
 		src/generic/gridg.o \
+		src/generic/helphtml.o \
+		src/generic/helpwxht.o \
 		src/generic/imaglist.o \
 		src/generic/laywin.o \
 		src/generic/listctrl.o \
@@ -727,6 +729,8 @@ MOTIF_GENERICOBJS = \
 		src/generic/dirdlgg.o \
 		src/generic/fontdlgg.o \
 		src/generic/gridg.o \
+		src/generic/helphtml.o \
+		src/generic/helpwxht.o \
 		src/generic/helpxlp.o \
 		src/generic/imaglist.o \
 		src/generic/laywin.o \
--- a/configure.in
+++ b/configure.in
@@ -2728,7 +2728,11 @@ AC_OUTPUT([
 	    samples/validate/Makefile
 	    samples/wxpoem/Makefile
 	    samples/wxsocket/Makefile
+	    samples/html/Makefile
 	    samples/html/about/Makefile
+	    samples/html/help/Makefile
+	    samples/html/printing/Makefile
+	    samples/html/test/Makefile
          ],
          [
            chmod +x wx-config
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -59,6 +59,8 @@ dcpsg.cpp	G	U
 dirdlgg.cpp	G	16
 fontdlgg.cpp	G	G
 gridg.cpp	G
+helphtml.cpp	G	G
+helpwxht.cpp	G	G
 helpxlp.cpp	G	G,R
 imaglist.cpp	G	16
 laywin.cpp	G
--- a/samples/Makefile.in
+++ b/samples/Makefile.in
@@ -3,7 +3,6 @@
 #

 all:
-	cp -u -r @top_srcdir@/samples ..
 	cd bombs; make
 	cd checklst; make
 	cd config; make
--- a/samples/bombs/Makefile.in
+++ b/samples/bombs/Makefile.in
@@ -11,8 +11,7 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../..
-
-VPATH = :$(top_srcdir)/samples/bombs
+program_dir = samples/bombs

 PROGRAM=bombs

--- a/samples/caret/Makefile.in
+++ b/samples/caret/Makefile.in
@@ -11,8 +11,7 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../..
-
-VPATH = :$(top_srcdir)/samples/caret
+program_dir = samples/caret

 PROGRAM=caret

--- a/samples/checklst/Makefile.in
+++ b/samples/checklst/Makefile.in
@@ -11,8 +11,7 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../..
-
-VPATH = :$(top_srcdir)/samples/checklst
+program_dir = samples/checklst

 PROGRAM=checklst

--- a/samples/config/Makefile.in
+++ b/samples/config/Makefile.in
@@ -11,8 +11,7 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../..
-
-VPATH = :$(top_srcdir)/samples/config
+program_dir = samples/config

 PROGRAM=conftest

--- a/samples/controls/Makefile.in
+++ b/samples/controls/Makefile.in
@@ -11,8 +11,7 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../..
-
-VPATH = :$(top_srcdir)/samples/controls
+program_dir = samples/controls

 PROGRAM=controls

--- a/samples/dialogs/Makefile.in
+++ b/samples/dialogs/Makefile.in
@@ -11,8 +11,7 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../..
-
-VPATH = :$(top_srcdir)/samples/dialogs
+program_dir = samples/samples/dialogs

 PROGRAM=dialogs

--- a/samples/dnd/Makefile.in
+++ b/samples/dnd/Makefile.in
@@ -11,8 +11,7 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../..
-
-VPATH = :$(top_srcdir)/samples/dnd
+program_dir = samples/dnd

 PROGRAM=dnd

--- a/samples/docview/Makefile.in
+++ b/samples/docview/Makefile.in
@@ -11,8 +11,7 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../..
-
-VPATH = :$(top_srcdir)/samples/docview
+program_dir = samples/docview

 PROGRAM=docview

--- a/samples/docvwmdi/Makefile.in
+++ b/samples/docvwmdi/Makefile.in
@@ -11,8 +11,7 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../..
-
-VPATH = :$(top_srcdir)/samples/docvwmdi
+program_dir = samples/docvwmdi

 PROGRAM=docview

--- a/samples/drawing/Makefile.in
+++ b/samples/drawing/Makefile.in
@@ -11,8 +11,7 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../..
-
-VPATH = :$(top_srcdir)/samples/drawing
+program_dir = samples/drawing

 PROGRAM=drawing

--- a/samples/dynamic/Makefile.in
+++ b/samples/dynamic/Makefile.in
@@ -11,8 +11,7 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../..
-
-VPATH = :$(top_srcdir)/samples/dynamic
+program_dir = samples/dynamic

 PROGRAM=dynamic

--- a/samples/html/Makefile.in
+++ b/samples/html/Makefile.in
@@ -0,0 +1,10 @@
+#
+# Makefile : Builds html samples for Unix.
+#
+
+all:
+	cd about; make
+
+clean:
+	cd about; make clean
+
--- a/samples/html/about/Makefile.in
+++ b/samples/html/about/Makefile.in
@@ -11,8 +11,10 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../../..
+program_dir = samples/html/about

-VPATH = :$(top_srcdir)/samples/html/about
+DATADIRS = data
+DATAFILES = data/about.htm data/logo.png

 PROGRAM=about

--- a/samples/html/help/.cvsignore
+++ b/samples/html/help/.cvsignore
@@ -1 +0,0 @@
-Makefile.in
--- a/samples/html/help/Makefile.am
+++ b/samples/html/help/Makefile.am
@@ -1,9 +0,0 @@
-AUTOMAKE_OPTIONS = 1.3 no-dependencies
-
-SUFFIXES = .cpp
-
-DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
-
-noinst_PROGRAMS = help
-
-help_SOURCES = help.cpp
--- a/samples/html/help/Makefile.in
+++ b/samples/html/help/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/help
+
+PROGRAM=help
+
+OBJECTS=$(PROGRAM).o
+
+include ../../../src/makeprog.env
+
--- a/samples/html/printing/.cvsignore
+++ b/samples/html/printing/.cvsignore
@@ -1 +0,0 @@
-Makefile.in
--- a/samples/html/printing/Makefile.am
+++ b/samples/html/printing/Makefile.am
@@ -1,9 +0,0 @@
-AUTOMAKE_OPTIONS = 1.3 no-dependencies
-
-SUFFIXES = .cpp
-
-DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
-
-noinst_PROGRAMS = printing
-
-printing_SOURCES = printing.cpp
--- a/samples/html/printing/Makefile.in
+++ b/samples/html/printing/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 printing example (UNIX).
+
+top_srcdir = @top_srcdir@
+top_builddir = ../../..
+
+VPATH = :$(top_srcdir)/samples/html/printing
+
+PROGRAM=printing
+
+OBJECTS=$(PROGRAM).o
+
+include ../../../src/makeprog.env
+
--- a/samples/html/test/.cvsignore
+++ b/samples/html/test/.cvsignore
@@ -1 +0,0 @@
-Makefile.in
--- a/samples/html/test/Makefile.am
+++ b/samples/html/test/Makefile.am
@@ -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
--- a/samples/html/test/Makefile.in
+++ b/samples/html/test/Makefile.in
@@ -0,0 +1,24 @@
+#
+# File:		Makefile.in
+# Author:	Julian Smart
+# Created:	1998
+# Updated:	
+# Copyright:	(c) 1998 Julian Smart
+#
+# "%W% %G%"
+#
+# Makefile for html test example (UNIX).
+
+top_srcdir = @top_srcdir@
+top_builddir = ../../..
+program_dir = samples/html/test
+
+PROGRAM=test
+
+OBJECTS=$(PROGRAM).o
+
+DATAFILES=f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp \
+    tables.htm test.htm
+
+include ../../../src/makeprog.env
+
--- a/samples/image/Makefile.in
+++ b/samples/image/Makefile.in
@@ -11,8 +11,9 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../..
+program_dir = samples/image

-VPATH = :$(top_srcdir)/samples/image
+DATAFILES = horse.png horse.jpg horse.bmp horse.gif

 PROGRAM=image

--- a/samples/layout/Makefile.in
+++ b/samples/layout/Makefile.in
@@ -11,8 +11,7 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../..
-
-VPATH = :$(top_srcdir)/samples/layout
+program_dir = samples/layout

 PROGRAM=layout

--- a/samples/listctrl/Makefile.in
+++ b/samples/listctrl/Makefile.in
@@ -11,8 +11,7 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../..
-
-VPATH = :$(top_srcdir)/samples/listctrl
+program_dir = samples/listctrl

 PROGRAM=listtest

--- a/samples/mdi/Makefile.in
+++ b/samples/mdi/Makefile.in
@@ -11,8 +11,7 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../..
-
-VPATH = :$(top_srcdir)/samples/mdi
+program_dir = samples/mdi

 PROGRAM=mdi

--- a/samples/minifram/Makefile.in
+++ b/samples/minifram/Makefile.in
@@ -11,8 +11,7 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../..
-
-VPATH = :$(top_srcdir)/samples/minifram
+program_dir = samples/minifram

 PROGRAM=test

--- a/samples/minimal/Makefile.in
+++ b/samples/minimal/Makefile.in
@@ -11,8 +11,7 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../..
-
-VPATH = :$(top_srcdir)/samples/minimal
+program_dir = samples/minimal

 PROGRAM=minimal

--- a/samples/notebook/Makefile.in
+++ b/samples/notebook/Makefile.in
@@ -11,8 +11,7 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../..
-
-VPATH = :$(top_srcdir)/samples/notebook
+program_dir = samples/notebook

 PROGRAM=test

--- a/samples/printing/Makefile.in
+++ b/samples/printing/Makefile.in
@@ -11,8 +11,7 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../..
-
-VPATH = :$(top_srcdir)/samples/printing
+program_dir = samples/printing

 PROGRAM=printing

--- a/samples/sashtest/Makefile.in
+++ b/samples/sashtest/Makefile.in
@@ -11,8 +11,7 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../..
-
-VPATH = :$(top_srcdir)/samples/sashtest
+program_dir = samples/sashtest

 PROGRAM=sashtest

--- a/samples/scroll/Makefile.in
+++ b/samples/scroll/Makefile.in
@@ -11,8 +11,7 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../..
-
-VPATH = :$(top_srcdir)/samples/scroll
+program_dir = samples/scroll

 PROGRAM=scroll

--- a/samples/splitter/Makefile.in
+++ b/samples/splitter/Makefile.in
@@ -11,8 +11,7 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../..
-
-VPATH = :$(top_srcdir)/samples/splitter
+program_dir = samples/splitter

 PROGRAM=test

--- a/samples/text/Makefile.in
+++ b/samples/text/Makefile.in
@@ -11,8 +11,9 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../..
+program_dir = samples/text

-VPATH = :$(top_srcdir)/samples/text
+DATAFILES = text.cpp

 PROGRAM=controls

--- a/samples/thread/Makefile.in
+++ b/samples/thread/Makefile.in
@@ -11,8 +11,7 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../..
-
-VPATH = :$(top_srcdir)/samples/thread
+program_dir = samples/thread

 PROGRAM=test

--- a/samples/toolbar/Makefile.in
+++ b/samples/toolbar/Makefile.in
@@ -11,8 +11,7 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../..
-
-VPATH = :$(top_srcdir)/samples/toolbar
+program_dir = samples/toolbar

 PROGRAM=test

--- a/samples/treectrl/Makefile.in
+++ b/samples/treectrl/Makefile.in
@@ -11,8 +11,7 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../..
-
-VPATH = :$(top_srcdir)/samples/treectrl
+program_dir = samples/treectrl

 PROGRAM=treetest

--- a/samples/typetest/Makefile.in
+++ b/samples/typetest/Makefile.in
@@ -11,8 +11,7 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../..
-
-VPATH = :$(top_srcdir)/samples/typetest
+program_dir = samples/typetest

 PROGRAM=typetest

--- a/samples/validate/Makefile.in
+++ b/samples/validate/Makefile.in
@@ -11,8 +11,7 @@

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

 PROGRAM=validate

--- a/samples/wxpoem/Makefile.in
+++ b/samples/wxpoem/Makefile.in
@@ -11,8 +11,9 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../..
+program_dir = samples/wxpoem

-VPATH = :$(top_srcdir)/samples/wxpoem
+DATAFILES = wxpoem.txt wxpoem.dat

 PROGRAM=wxpoem

--- a/samples/wxsocket/Makefile.in
+++ b/samples/wxsocket/Makefile.in
@@ -11,7 +11,7 @@

 top_srcdir = @top_srcdir@
 top_builddir = ../..
-
+program_dir = samples/wxsocket
 VPATH = :$(top_srcdir)/samples/wxsocket

 # Clears all default suffixes
--- a/src/makeprog.env.in
+++ b/src/makeprog.env.in
@@ -12,13 +12,27 @@
 .cxx.o :
 	$(CC) -c $(CPPFLAGS) -o $@ $<

+VPATH = :$(top_srcdir)/$(program_dir)
+
 # Set defaults from configure
 include $(top_builddir)/src/make.env

-all:    $(PROGRAM)
+all:    $(PROGRAM) install_dirs install_data

 $(PROGRAM):	$(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@
 	$(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(LDLIBS)

+install_dirs:
+	@list='$(DATADIRS)'; for p in $$list; do \
+	  mkdir -p $(top_builddir)/$(program_dir)/$$p; \
+	done
+	
+install_data:
+	@list='$(DATAFILES)'; for p in $$list; do \
+	  if test ! -e $(top_builddir)/$(program_dir)/Makefile.in; then \
+	     cp -u $(top_srcdir)/$(program_dir)/$$p $(top_builddir)/$(program_dir)/$$p; \
+	  fi; \
+	done
+
 clean:
 	rm -f $(OBJECTS) $(PROGRAM) core