Makefile updates

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

View File

@@ -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! # 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/dirdlgg.o \
src/generic/fontdlgg.o \ src/generic/fontdlgg.o \
src/generic/gridg.o \ src/generic/gridg.o \
src/generic/helphtml.o \
src/generic/helpwxht.o \
src/generic/imaglist.o \ src/generic/imaglist.o \
src/generic/laywin.o \ src/generic/laywin.o \
src/generic/listctrl.o \ src/generic/listctrl.o \
@@ -727,6 +729,8 @@ MOTIF_GENERICOBJS = \
src/generic/dirdlgg.o \ src/generic/dirdlgg.o \
src/generic/fontdlgg.o \ src/generic/fontdlgg.o \
src/generic/gridg.o \ src/generic/gridg.o \
src/generic/helphtml.o \
src/generic/helpwxht.o \
src/generic/helpxlp.o \ src/generic/helpxlp.o \
src/generic/imaglist.o \ src/generic/imaglist.o \
src/generic/laywin.o \ src/generic/laywin.o \

View File

@@ -2728,7 +2728,11 @@ AC_OUTPUT([
samples/validate/Makefile samples/validate/Makefile
samples/wxpoem/Makefile samples/wxpoem/Makefile
samples/wxsocket/Makefile samples/wxsocket/Makefile
samples/html/Makefile
samples/html/about/Makefile samples/html/about/Makefile
samples/html/help/Makefile
samples/html/printing/Makefile
samples/html/test/Makefile
], ],
[ [
chmod +x wx-config chmod +x wx-config

View File

@@ -59,6 +59,8 @@ dcpsg.cpp G U
dirdlgg.cpp G 16 dirdlgg.cpp G 16
fontdlgg.cpp G G fontdlgg.cpp G G
gridg.cpp G gridg.cpp G
helphtml.cpp G G
helpwxht.cpp G G
helpxlp.cpp G G,R helpxlp.cpp G G,R
imaglist.cpp G 16 imaglist.cpp G 16
laywin.cpp G laywin.cpp G

View File

@@ -3,7 +3,6 @@
# #
all: all:
cp -u -r @top_srcdir@/samples ..
cd bombs; make cd bombs; make
cd checklst; make cd checklst; make
cd config; make cd config; make

View File

@@ -11,8 +11,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/bombs
VPATH = :$(top_srcdir)/samples/bombs
PROGRAM=bombs PROGRAM=bombs

View File

@@ -11,8 +11,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/caret
VPATH = :$(top_srcdir)/samples/caret
PROGRAM=caret PROGRAM=caret

View File

@@ -11,8 +11,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/checklst
VPATH = :$(top_srcdir)/samples/checklst
PROGRAM=checklst PROGRAM=checklst

View File

@@ -11,8 +11,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/config
VPATH = :$(top_srcdir)/samples/config
PROGRAM=conftest PROGRAM=conftest

View File

@@ -11,8 +11,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/controls
VPATH = :$(top_srcdir)/samples/controls
PROGRAM=controls PROGRAM=controls

View File

@@ -11,8 +11,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/samples/dialogs
VPATH = :$(top_srcdir)/samples/dialogs
PROGRAM=dialogs PROGRAM=dialogs

View File

@@ -11,8 +11,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/dnd
VPATH = :$(top_srcdir)/samples/dnd
PROGRAM=dnd PROGRAM=dnd

View File

@@ -11,8 +11,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/docview
VPATH = :$(top_srcdir)/samples/docview
PROGRAM=docview PROGRAM=docview

View File

@@ -11,8 +11,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/docvwmdi
VPATH = :$(top_srcdir)/samples/docvwmdi
PROGRAM=docview PROGRAM=docview

View File

@@ -11,8 +11,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/drawing
VPATH = :$(top_srcdir)/samples/drawing
PROGRAM=drawing PROGRAM=drawing

View File

@@ -11,8 +11,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/dynamic
VPATH = :$(top_srcdir)/samples/dynamic
PROGRAM=dynamic PROGRAM=dynamic

10
samples/html/Makefile.in Normal file
View File

@@ -0,0 +1,10 @@
#
# Makefile : Builds html samples for Unix.
#
all:
cd about; make
clean:
cd about; make clean

View File

@@ -11,8 +11,10 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../../.. top_builddir = ../../..
program_dir = samples/html/about
VPATH = :$(top_srcdir)/samples/html/about DATADIRS = data
DATAFILES = data/about.htm data/logo.png
PROGRAM=about PROGRAM=about

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -11,8 +11,9 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/image
VPATH = :$(top_srcdir)/samples/image DATAFILES = horse.png horse.jpg horse.bmp horse.gif
PROGRAM=image PROGRAM=image

View File

@@ -11,8 +11,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/layout
VPATH = :$(top_srcdir)/samples/layout
PROGRAM=layout PROGRAM=layout

View File

@@ -11,8 +11,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/listctrl
VPATH = :$(top_srcdir)/samples/listctrl
PROGRAM=listtest PROGRAM=listtest

View File

@@ -11,8 +11,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/mdi
VPATH = :$(top_srcdir)/samples/mdi
PROGRAM=mdi PROGRAM=mdi

View File

@@ -11,8 +11,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/minifram
VPATH = :$(top_srcdir)/samples/minifram
PROGRAM=test PROGRAM=test

View File

@@ -11,8 +11,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/minimal
VPATH = :$(top_srcdir)/samples/minimal
PROGRAM=minimal PROGRAM=minimal

View File

@@ -11,8 +11,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/notebook
VPATH = :$(top_srcdir)/samples/notebook
PROGRAM=test PROGRAM=test

View File

@@ -11,8 +11,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/printing
VPATH = :$(top_srcdir)/samples/printing
PROGRAM=printing PROGRAM=printing

View File

@@ -11,8 +11,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/sashtest
VPATH = :$(top_srcdir)/samples/sashtest
PROGRAM=sashtest PROGRAM=sashtest

View File

@@ -11,8 +11,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/scroll
VPATH = :$(top_srcdir)/samples/scroll
PROGRAM=scroll PROGRAM=scroll

View File

@@ -11,8 +11,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/splitter
VPATH = :$(top_srcdir)/samples/splitter
PROGRAM=test PROGRAM=test

View File

@@ -11,8 +11,9 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/text
VPATH = :$(top_srcdir)/samples/text DATAFILES = text.cpp
PROGRAM=controls PROGRAM=controls

View File

@@ -11,8 +11,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/thread
VPATH = :$(top_srcdir)/samples/thread
PROGRAM=test PROGRAM=test

View File

@@ -11,8 +11,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/toolbar
VPATH = :$(top_srcdir)/samples/toolbar
PROGRAM=test PROGRAM=test

View File

@@ -11,8 +11,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/treectrl
VPATH = :$(top_srcdir)/samples/treectrl
PROGRAM=treetest PROGRAM=treetest

View File

@@ -11,8 +11,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/typetest
VPATH = :$(top_srcdir)/samples/typetest
PROGRAM=typetest PROGRAM=typetest

View File

@@ -11,8 +11,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/validate
VPATH = :$(top_srcdir)/samples/validate
PROGRAM=validate PROGRAM=validate

View File

@@ -11,8 +11,9 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/wxpoem
VPATH = :$(top_srcdir)/samples/wxpoem DATAFILES = wxpoem.txt wxpoem.dat
PROGRAM=wxpoem PROGRAM=wxpoem

View File

@@ -11,7 +11,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/wxsocket
VPATH = :$(top_srcdir)/samples/wxsocket VPATH = :$(top_srcdir)/samples/wxsocket
# Clears all default suffixes # Clears all default suffixes

View File

@@ -12,13 +12,27 @@
.cxx.o : .cxx.o :
$(CC) -c $(CPPFLAGS) -o $@ $< $(CC) -c $(CPPFLAGS) -o $@ $<
VPATH = :$(top_srcdir)/$(program_dir)
# Set defaults from configure # Set defaults from configure
include $(top_builddir)/src/make.env include $(top_builddir)/src/make.env
all: $(PROGRAM) all: $(PROGRAM) install_dirs install_data
$(PROGRAM): $(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(PROGRAM): $(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@
$(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(LDLIBS) $(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: clean:
rm -f $(OBJECTS) $(PROGRAM) core rm -f $(OBJECTS) $(PROGRAM) core