From a8efa9e391fef95b760af6fc5ba6813c6487d5be Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Fri, 13 Aug 1999 18:54:54 +0000 Subject: [PATCH] More smaple makefiles git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure.in | 13 +++++++++++++ samples/dialogs/.cvsignore | 1 - samples/dialogs/Makefile.am | 9 --------- samples/dialogs/{makefile.unx => Makefile.in} | 3 +++ samples/dnd/.cvsignore | 1 - samples/dnd/Makefile.am | 9 --------- samples/dnd/{makefile.unx => Makefile.in} | 3 +++ samples/docview/.cvsignore | 1 - samples/docview/Makefile.am | 9 --------- samples/docview/{makefile.unx => Makefile.in} | 3 +++ samples/docvwmdi/.cvsignore | 1 - samples/docvwmdi/Makefile.am | 9 --------- samples/docvwmdi/{makefile.unx => Makefile.in} | 3 +++ samples/drawing/.cvsignore | 1 - samples/drawing/Makefile.am | 9 --------- samples/drawing/{makefile.unx => Makefile.in} | 3 +++ samples/dynamic/.cvsignore | 1 - samples/dynamic/Makefile.am | 9 --------- samples/dynamic/{makefile.unx => Makefile.in} | 3 +++ samples/image/.cvsignore | 1 - samples/image/Makefile.am | 9 --------- samples/image/{makefile.unx => Makefile.in} | 3 +++ samples/layout/.cvsignore | 1 - samples/layout/Makefile.am | 9 --------- samples/layout/{makefile.unx => Makefile.in} | 3 +++ samples/listctrl/.cvsignore | 1 - samples/listctrl/Makefile.am | 9 --------- samples/listctrl/{makefile.unx => Makefile.in} | 3 +++ samples/mdi/.cvsignore | 1 - samples/mdi/Makefile.am | 9 --------- samples/mdi/{makefile.unx => Makefile.in} | 3 +++ samples/minifram/.cvsignore | 1 - samples/minifram/Makefile.am | 9 --------- samples/minifram/{makefile.unx => Makefile.in} | 3 +++ samples/minimal/.cvsignore | 1 - samples/minimal/Makefile.am | 9 --------- samples/minimal/{makefile.unx => Makefile.in} | 3 +++ samples/notebook/.cvsignore | 1 - samples/notebook/Makefile.am | 9 --------- samples/notebook/{makefile.unx => Makefile.in} | 3 +++ src/make.env.in | 4 ++-- 41 files changed, 54 insertions(+), 132 deletions(-) delete mode 100644 samples/dialogs/Makefile.am rename samples/dialogs/{makefile.unx => Makefile.in} (83%) delete mode 100644 samples/dnd/Makefile.am rename samples/dnd/{makefile.unx => Makefile.in} (82%) delete mode 100644 samples/docview/Makefile.am rename samples/docview/{makefile.unx => Makefile.in} (83%) delete mode 100644 samples/docvwmdi/Makefile.am rename samples/docvwmdi/{makefile.unx => Makefile.in} (83%) delete mode 100644 samples/drawing/Makefile.am rename samples/drawing/{makefile.unx => Makefile.in} (83%) delete mode 100644 samples/dynamic/Makefile.am rename samples/dynamic/{makefile.unx => Makefile.in} (83%) delete mode 100644 samples/image/Makefile.am rename samples/image/{makefile.unx => Makefile.in} (82%) delete mode 100644 samples/layout/Makefile.am rename samples/layout/{makefile.unx => Makefile.in} (83%) delete mode 100644 samples/listctrl/Makefile.am rename samples/listctrl/{makefile.unx => Makefile.in} (83%) delete mode 100644 samples/mdi/Makefile.am rename samples/mdi/{makefile.unx => Makefile.in} (82%) delete mode 100644 samples/minifram/Makefile.am rename samples/minifram/{makefile.unx => Makefile.in} (83%) delete mode 100644 samples/minimal/Makefile.am rename samples/minimal/{makefile.unx => Makefile.in} (83%) delete mode 100644 samples/notebook/Makefile.am rename samples/notebook/{makefile.unx => Makefile.in} (83%) diff --git a/configure.in b/configure.in index 7002888c7d..b2301bdf82 100644 --- a/configure.in +++ b/configure.in @@ -2703,6 +2703,19 @@ AC_OUTPUT([ samples/checklst/Makefile samples/config/Makefile samples/controls/Makefile + samples/dialogs/Makefile + samples/docview/Makefile + samples/docvwmdi/Makefile + samples/dnd/Makefile + samples/drawing/Makefile + samples/dynamic/Makefile + samples/image/Makefile + samples/layout/Makefile + samples/listctrl/Makefile + samples/mdi/Makefile + samples/minifram/Makefile + samples/minimal/Makefile + samples/notebook/Makefile samples/printing/Makefile ], [ diff --git a/samples/dialogs/.cvsignore b/samples/dialogs/.cvsignore index f5eaa1a859..8b13789179 100644 --- a/samples/dialogs/.cvsignore +++ b/samples/dialogs/.cvsignore @@ -1,2 +1 @@ -Makefile.in diff --git a/samples/dialogs/Makefile.am b/samples/dialogs/Makefile.am deleted file mode 100644 index a439fae089..0000000000 --- a/samples/dialogs/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -AUTOMAKE_OPTIONS = 1.3 no-dependencies - -SUFFIXES = .cpp - -DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) - -noinst_PROGRAMS = dialogs - -dialogs_SOURCES = dialogs.cpp diff --git a/samples/dialogs/makefile.unx b/samples/dialogs/Makefile.in similarity index 83% rename from samples/dialogs/makefile.unx rename to samples/dialogs/Makefile.in index b144f19701..66cc206f5f 100644 --- a/samples/dialogs/makefile.unx +++ b/samples/dialogs/Makefile.in @@ -9,6 +9,9 @@ # # Makefile for dialogs example (UNIX). +top_srcdir = @top_srcdir@ +top_builddir = ../.. + PROGRAM=dialogs OBJECTS=$(PROGRAM).o diff --git a/samples/dnd/.cvsignore b/samples/dnd/.cvsignore index f5eaa1a859..8b13789179 100644 --- a/samples/dnd/.cvsignore +++ b/samples/dnd/.cvsignore @@ -1,2 +1 @@ -Makefile.in diff --git a/samples/dnd/Makefile.am b/samples/dnd/Makefile.am deleted file mode 100644 index 4f5a745581..0000000000 --- a/samples/dnd/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -AUTOMAKE_OPTIONS = 1.3 no-dependencies - -SUFFIXES = .cpp - -DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) - -noinst_PROGRAMS = dnd - -dnd_SOURCES = dnd.cpp diff --git a/samples/dnd/makefile.unx b/samples/dnd/Makefile.in similarity index 82% rename from samples/dnd/makefile.unx rename to samples/dnd/Makefile.in index ffbb3975d5..737359f3fe 100644 --- a/samples/dnd/makefile.unx +++ b/samples/dnd/Makefile.in @@ -9,6 +9,9 @@ # # Makefile for dnd example (UNIX). +top_srcdir = @top_srcdir@ +top_builddir = ../.. + PROGRAM=dnd OBJECTS=$(PROGRAM).o diff --git a/samples/docview/.cvsignore b/samples/docview/.cvsignore index f5eaa1a859..8b13789179 100644 --- a/samples/docview/.cvsignore +++ b/samples/docview/.cvsignore @@ -1,2 +1 @@ -Makefile.in diff --git a/samples/docview/Makefile.am b/samples/docview/Makefile.am deleted file mode 100644 index e35fdf02dd..0000000000 --- a/samples/docview/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -AUTOMAKE_OPTIONS = 1.3 no-dependencies - -SUFFIXES = .cpp - -DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) - -noinst_PROGRAMS = docview - -docview_SOURCES = docview.cpp doc.cpp view.cpp diff --git a/samples/docview/makefile.unx b/samples/docview/Makefile.in similarity index 83% rename from samples/docview/makefile.unx rename to samples/docview/Makefile.in index e49d7b7335..b9d38717e3 100644 --- a/samples/docview/makefile.unx +++ b/samples/docview/Makefile.in @@ -9,6 +9,9 @@ # # Makefile for docview example (UNIX). +top_srcdir = @top_srcdir@ +top_builddir = ../.. + PROGRAM=docview OBJECTS=$(PROGRAM).o doc.o view.o diff --git a/samples/docvwmdi/.cvsignore b/samples/docvwmdi/.cvsignore index f5eaa1a859..8b13789179 100644 --- a/samples/docvwmdi/.cvsignore +++ b/samples/docvwmdi/.cvsignore @@ -1,2 +1 @@ -Makefile.in diff --git a/samples/docvwmdi/Makefile.am b/samples/docvwmdi/Makefile.am deleted file mode 100644 index e35fdf02dd..0000000000 --- a/samples/docvwmdi/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -AUTOMAKE_OPTIONS = 1.3 no-dependencies - -SUFFIXES = .cpp - -DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) - -noinst_PROGRAMS = docview - -docview_SOURCES = docview.cpp doc.cpp view.cpp diff --git a/samples/docvwmdi/makefile.unx b/samples/docvwmdi/Makefile.in similarity index 83% rename from samples/docvwmdi/makefile.unx rename to samples/docvwmdi/Makefile.in index 7b3a448e48..8cf0cfdc72 100644 --- a/samples/docvwmdi/makefile.unx +++ b/samples/docvwmdi/Makefile.in @@ -9,6 +9,9 @@ # # Makefile for docvwmdi example (UNIX). +top_srcdir = @top_srcdir@ +top_builddir = ../.. + PROGRAM=docview OBJECTS=$(PROGRAM).o doc.o view.o diff --git a/samples/drawing/.cvsignore b/samples/drawing/.cvsignore index f5eaa1a859..8b13789179 100644 --- a/samples/drawing/.cvsignore +++ b/samples/drawing/.cvsignore @@ -1,2 +1 @@ -Makefile.in diff --git a/samples/drawing/Makefile.am b/samples/drawing/Makefile.am deleted file mode 100644 index 4970113252..0000000000 --- a/samples/drawing/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -AUTOMAKE_OPTIONS = 1.3 no-dependencies - -SUFFIXES = .cpp - -DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) - -noinst_PROGRAMS = drawing - -drawing_SOURCES = drawing.cpp diff --git a/samples/drawing/makefile.unx b/samples/drawing/Makefile.in similarity index 83% rename from samples/drawing/makefile.unx rename to samples/drawing/Makefile.in index 9b1b4e058a..3ea05ff32c 100644 --- a/samples/drawing/makefile.unx +++ b/samples/drawing/Makefile.in @@ -9,6 +9,9 @@ # # Makefile for drawing example (UNIX). +top_srcdir = @top_srcdir@ +top_builddir = ../.. + PROGRAM=drawing OBJECTS=$(PROGRAM).o diff --git a/samples/dynamic/.cvsignore b/samples/dynamic/.cvsignore index f5eaa1a859..8b13789179 100644 --- a/samples/dynamic/.cvsignore +++ b/samples/dynamic/.cvsignore @@ -1,2 +1 @@ -Makefile.in diff --git a/samples/dynamic/Makefile.am b/samples/dynamic/Makefile.am deleted file mode 100644 index f346b4b333..0000000000 --- a/samples/dynamic/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -AUTOMAKE_OPTIONS = 1.3 no-dependencies - -SUFFIXES = .cpp - -DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) - -noinst_PROGRAMS = dynamic - -dynamic_SOURCES = dynamic.cpp diff --git a/samples/dynamic/makefile.unx b/samples/dynamic/Makefile.in similarity index 83% rename from samples/dynamic/makefile.unx rename to samples/dynamic/Makefile.in index c4c52d7f6e..9705a972b8 100644 --- a/samples/dynamic/makefile.unx +++ b/samples/dynamic/Makefile.in @@ -9,6 +9,9 @@ # # Makefile for dynamic example (UNIX). +top_srcdir = @top_srcdir@ +top_builddir = ../.. + PROGRAM=dynamic OBJECTS=$(PROGRAM).o diff --git a/samples/image/.cvsignore b/samples/image/.cvsignore index 4b34ba88ec..f7a0c2541b 100644 --- a/samples/image/.cvsignore +++ b/samples/image/.cvsignore @@ -1,3 +1,2 @@ -Makefile.in test.png diff --git a/samples/image/Makefile.am b/samples/image/Makefile.am deleted file mode 100644 index 8583c07d9a..0000000000 --- a/samples/image/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -AUTOMAKE_OPTIONS = 1.3 no-dependencies - -SUFFIXES = .cpp - -DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) - -noinst_PROGRAMS = image - -image_SOURCES = image.cpp diff --git a/samples/image/makefile.unx b/samples/image/Makefile.in similarity index 82% rename from samples/image/makefile.unx rename to samples/image/Makefile.in index 361235090f..0ed0d7bd3d 100644 --- a/samples/image/makefile.unx +++ b/samples/image/Makefile.in @@ -9,6 +9,9 @@ # # Makefile for image example (UNIX). +top_srcdir = @top_srcdir@ +top_builddir = ../.. + PROGRAM=image OBJECTS=$(PROGRAM).o diff --git a/samples/layout/.cvsignore b/samples/layout/.cvsignore index f5eaa1a859..8b13789179 100644 --- a/samples/layout/.cvsignore +++ b/samples/layout/.cvsignore @@ -1,2 +1 @@ -Makefile.in diff --git a/samples/layout/Makefile.am b/samples/layout/Makefile.am deleted file mode 100644 index 9841ed0f74..0000000000 --- a/samples/layout/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -AUTOMAKE_OPTIONS = 1.3 no-dependencies - -SUFFIXES = .cpp - -DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) - -noinst_PROGRAMS = layout - -layout_SOURCES = layout.cpp diff --git a/samples/layout/makefile.unx b/samples/layout/Makefile.in similarity index 83% rename from samples/layout/makefile.unx rename to samples/layout/Makefile.in index ff2edfa6ce..30d7f33045 100644 --- a/samples/layout/makefile.unx +++ b/samples/layout/Makefile.in @@ -9,6 +9,9 @@ # # Makefile for layout example (UNIX). +top_srcdir = @top_srcdir@ +top_builddir = ../.. + PROGRAM=layout OBJECTS=$(PROGRAM).o diff --git a/samples/listctrl/.cvsignore b/samples/listctrl/.cvsignore index f5eaa1a859..8b13789179 100644 --- a/samples/listctrl/.cvsignore +++ b/samples/listctrl/.cvsignore @@ -1,2 +1 @@ -Makefile.in diff --git a/samples/listctrl/Makefile.am b/samples/listctrl/Makefile.am deleted file mode 100644 index 3af03416f4..0000000000 --- a/samples/listctrl/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -AUTOMAKE_OPTIONS = 1.3 no-dependencies - -SUFFIXES = .cpp - -DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) - -noinst_PROGRAMS = listtest - -listtest_SOURCES = listtest.cpp diff --git a/samples/listctrl/makefile.unx b/samples/listctrl/Makefile.in similarity index 83% rename from samples/listctrl/makefile.unx rename to samples/listctrl/Makefile.in index a94e6cb31d..0024e9608f 100644 --- a/samples/listctrl/makefile.unx +++ b/samples/listctrl/Makefile.in @@ -9,6 +9,9 @@ # # Makefile for listctrl example (UNIX). +top_srcdir = @top_srcdir@ +top_builddir = ../.. + PROGRAM=listtest OBJECTS=$(PROGRAM).o diff --git a/samples/mdi/.cvsignore b/samples/mdi/.cvsignore index f5eaa1a859..8b13789179 100644 --- a/samples/mdi/.cvsignore +++ b/samples/mdi/.cvsignore @@ -1,2 +1 @@ -Makefile.in diff --git a/samples/mdi/Makefile.am b/samples/mdi/Makefile.am deleted file mode 100644 index 26ebada631..0000000000 --- a/samples/mdi/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -AUTOMAKE_OPTIONS = 1.3 no-dependencies - -SUFFIXES = .cpp - -DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) - -noinst_PROGRAMS = mdi - -mdi_SOURCES = mdi.cpp diff --git a/samples/mdi/makefile.unx b/samples/mdi/Makefile.in similarity index 82% rename from samples/mdi/makefile.unx rename to samples/mdi/Makefile.in index 4c904e4c6f..b3ec46662b 100644 --- a/samples/mdi/makefile.unx +++ b/samples/mdi/Makefile.in @@ -9,6 +9,9 @@ # # Makefile for mdi example (UNIX). +top_srcdir = @top_srcdir@ +top_builddir = ../.. + PROGRAM=mdi OBJECTS=$(PROGRAM).o diff --git a/samples/minifram/.cvsignore b/samples/minifram/.cvsignore index f5eaa1a859..8b13789179 100644 --- a/samples/minifram/.cvsignore +++ b/samples/minifram/.cvsignore @@ -1,2 +1 @@ -Makefile.in diff --git a/samples/minifram/Makefile.am b/samples/minifram/Makefile.am deleted file mode 100644 index 3631656b63..0000000000 --- a/samples/minifram/Makefile.am +++ /dev/null @@ -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 diff --git a/samples/minifram/makefile.unx b/samples/minifram/Makefile.in similarity index 83% rename from samples/minifram/makefile.unx rename to samples/minifram/Makefile.in index 0b249d4c88..0e0ce03472 100644 --- a/samples/minifram/makefile.unx +++ b/samples/minifram/Makefile.in @@ -9,6 +9,9 @@ # # Makefile for toolbar example (UNIX). +top_srcdir = @top_srcdir@ +top_builddir = ../.. + PROGRAM=test OBJECTS=$(PROGRAM).o diff --git a/samples/minimal/.cvsignore b/samples/minimal/.cvsignore index f5eaa1a859..8b13789179 100644 --- a/samples/minimal/.cvsignore +++ b/samples/minimal/.cvsignore @@ -1,2 +1 @@ -Makefile.in diff --git a/samples/minimal/Makefile.am b/samples/minimal/Makefile.am deleted file mode 100644 index f783fc23a8..0000000000 --- a/samples/minimal/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -AUTOMAKE_OPTIONS = 1.3 no-dependencies - -SUFFIXES = .cpp - -DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) - -noinst_PROGRAMS = minimal - -minimal_SOURCES = minimal.cpp diff --git a/samples/minimal/makefile.unx b/samples/minimal/Makefile.in similarity index 83% rename from samples/minimal/makefile.unx rename to samples/minimal/Makefile.in index 6e0b9cac43..d005a1ee85 100644 --- a/samples/minimal/makefile.unx +++ b/samples/minimal/Makefile.in @@ -9,6 +9,9 @@ # # Makefile for minimal example (UNIX). +top_srcdir = @top_srcdir@ +top_builddir = ../.. + PROGRAM=minimal OBJECTS=$(PROGRAM).o diff --git a/samples/notebook/.cvsignore b/samples/notebook/.cvsignore index 70845e08eb..e69de29bb2 100644 --- a/samples/notebook/.cvsignore +++ b/samples/notebook/.cvsignore @@ -1 +0,0 @@ -Makefile.in diff --git a/samples/notebook/Makefile.am b/samples/notebook/Makefile.am deleted file mode 100644 index 3631656b63..0000000000 --- a/samples/notebook/Makefile.am +++ /dev/null @@ -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 diff --git a/samples/notebook/makefile.unx b/samples/notebook/Makefile.in similarity index 83% rename from samples/notebook/makefile.unx rename to samples/notebook/Makefile.in index a3f76189b2..6cb90efc3d 100644 --- a/samples/notebook/makefile.unx +++ b/samples/notebook/Makefile.in @@ -9,6 +9,9 @@ # # Makefile for notebook example (UNIX). +top_srcdir = @top_srcdir@ +top_builddir = ../.. + PROGRAM=test OBJECTS=$(PROGRAM).o diff --git a/src/make.env.in b/src/make.env.in index 720d554abb..c3127caccb 100644 --- a/src/make.env.in +++ b/src/make.env.in @@ -63,8 +63,8 @@ SHARED_LD = @SHARED_LD@ ########################### Flags ################################# CFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CFLAGS@ -CPPFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CXXFLAGS@ +CPPFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@ PICFLAGS = @PIC_FLAG@ - +LDFLAGS = @LDFLAGS@ -- 2.45.2