From: Robert Roebling Date: Fri, 13 Aug 1999 18:54:54 +0000 (+0000) Subject: More smaple makefiles X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a8efa9e391fef95b760af6fc5ba6813c6487d5be?ds=inline More smaple makefiles git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- 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.in b/samples/dialogs/Makefile.in new file mode 100644 index 0000000000..66cc206f5f --- /dev/null +++ b/samples/dialogs/Makefile.in @@ -0,0 +1,20 @@ +# +# File: makefile.unx +# Author: Julian Smart +# Created: 1998 +# Updated: +# Copyright: (c) 1998 Julian Smart +# +# "%W% %G%" +# +# Makefile for dialogs example (UNIX). + +top_srcdir = @top_srcdir@ +top_builddir = ../.. + +PROGRAM=dialogs + +OBJECTS=$(PROGRAM).o + +include ../../src/makeprog.env + diff --git a/samples/dialogs/makefile.unx b/samples/dialogs/makefile.unx deleted file mode 100644 index b144f19701..0000000000 --- a/samples/dialogs/makefile.unx +++ /dev/null @@ -1,17 +0,0 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for dialogs example (UNIX). - -PROGRAM=dialogs - -OBJECTS=$(PROGRAM).o - -include ../../src/makeprog.env - 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.in b/samples/dnd/Makefile.in new file mode 100644 index 0000000000..737359f3fe --- /dev/null +++ b/samples/dnd/Makefile.in @@ -0,0 +1,20 @@ +# +# File: makefile.unx +# Author: Julian Smart +# Created: 1998 +# Updated: +# Copyright: (c) 1998 Julian Smart +# +# "%W% %G%" +# +# Makefile for dnd example (UNIX). + +top_srcdir = @top_srcdir@ +top_builddir = ../.. + +PROGRAM=dnd + +OBJECTS=$(PROGRAM).o + +include ../../src/makeprog.env + diff --git a/samples/dnd/makefile.unx b/samples/dnd/makefile.unx deleted file mode 100644 index ffbb3975d5..0000000000 --- a/samples/dnd/makefile.unx +++ /dev/null @@ -1,17 +0,0 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for dnd example (UNIX). - -PROGRAM=dnd - -OBJECTS=$(PROGRAM).o - -include ../../src/makeprog.env - 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.in b/samples/docview/Makefile.in new file mode 100644 index 0000000000..b9d38717e3 --- /dev/null +++ b/samples/docview/Makefile.in @@ -0,0 +1,21 @@ +# +# File: makefile.unx +# Author: Julian Smart +# Created: 1998 +# Updated: +# Copyright: (c) 1998 Julian Smart +# +# "%W% %G%" +# +# Makefile for docview example (UNIX). + +top_srcdir = @top_srcdir@ +top_builddir = ../.. + +PROGRAM=docview + +OBJECTS=$(PROGRAM).o doc.o view.o + +include ../../src/makeprog.env + + diff --git a/samples/docview/makefile.unx b/samples/docview/makefile.unx deleted file mode 100644 index e49d7b7335..0000000000 --- a/samples/docview/makefile.unx +++ /dev/null @@ -1,18 +0,0 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for docview example (UNIX). - -PROGRAM=docview - -OBJECTS=$(PROGRAM).o doc.o view.o - -include ../../src/makeprog.env - - 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.in b/samples/docvwmdi/Makefile.in new file mode 100644 index 0000000000..8cf0cfdc72 --- /dev/null +++ b/samples/docvwmdi/Makefile.in @@ -0,0 +1,19 @@ +# +# File: makefile.unx +# Author: Julian Smart +# Created: 1998 +# Updated: +# Copyright: (c) 1998 Julian Smart +# +# "%W% %G%" +# +# Makefile for docvwmdi example (UNIX). + +top_srcdir = @top_srcdir@ +top_builddir = ../.. + +PROGRAM=docview + +OBJECTS=$(PROGRAM).o doc.o view.o + +include ../../src/makeprog.env diff --git a/samples/docvwmdi/makefile.unx b/samples/docvwmdi/makefile.unx deleted file mode 100644 index 7b3a448e48..0000000000 --- a/samples/docvwmdi/makefile.unx +++ /dev/null @@ -1,16 +0,0 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for docvwmdi example (UNIX). - -PROGRAM=docview - -OBJECTS=$(PROGRAM).o doc.o view.o - -include ../../src/makeprog.env 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.in b/samples/drawing/Makefile.in new file mode 100644 index 0000000000..3ea05ff32c --- /dev/null +++ b/samples/drawing/Makefile.in @@ -0,0 +1,20 @@ +# +# File: makefile.unx +# Author: Julian Smart +# Created: 1998 +# Updated: +# Copyright: (c) 1998 Julian Smart +# +# "%W% %G%" +# +# Makefile for drawing example (UNIX). + +top_srcdir = @top_srcdir@ +top_builddir = ../.. + +PROGRAM=drawing + +OBJECTS=$(PROGRAM).o + +include ../../src/makeprog.env + diff --git a/samples/drawing/makefile.unx b/samples/drawing/makefile.unx deleted file mode 100644 index 9b1b4e058a..0000000000 --- a/samples/drawing/makefile.unx +++ /dev/null @@ -1,17 +0,0 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for drawing example (UNIX). - -PROGRAM=drawing - -OBJECTS=$(PROGRAM).o - -include ../../src/makeprog.env - 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.in b/samples/dynamic/Makefile.in new file mode 100644 index 0000000000..9705a972b8 --- /dev/null +++ b/samples/dynamic/Makefile.in @@ -0,0 +1,20 @@ +# +# File: makefile.unx +# Author: Julian Smart +# Created: 1998 +# Updated: +# Copyright: (c) 1998 Julian Smart +# +# "%W% %G%" +# +# Makefile for dynamic example (UNIX). + +top_srcdir = @top_srcdir@ +top_builddir = ../.. + +PROGRAM=dynamic + +OBJECTS=$(PROGRAM).o + +include ../../src/makeprog.env + diff --git a/samples/dynamic/makefile.unx b/samples/dynamic/makefile.unx deleted file mode 100644 index c4c52d7f6e..0000000000 --- a/samples/dynamic/makefile.unx +++ /dev/null @@ -1,17 +0,0 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for dynamic example (UNIX). - -PROGRAM=dynamic - -OBJECTS=$(PROGRAM).o - -include ../../src/makeprog.env - 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.in b/samples/image/Makefile.in new file mode 100644 index 0000000000..0ed0d7bd3d --- /dev/null +++ b/samples/image/Makefile.in @@ -0,0 +1,20 @@ +# +# File: makefile.unx +# Author: Julian Smart +# Created: 1998 +# Updated: +# Copyright: (c) 1998 Julian Smart +# +# "%W% %G%" +# +# Makefile for image example (UNIX). + +top_srcdir = @top_srcdir@ +top_builddir = ../.. + +PROGRAM=image + +OBJECTS=$(PROGRAM).o + +include ../../src/makeprog.env + diff --git a/samples/image/makefile.unx b/samples/image/makefile.unx deleted file mode 100644 index 361235090f..0000000000 --- a/samples/image/makefile.unx +++ /dev/null @@ -1,17 +0,0 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for image example (UNIX). - -PROGRAM=image - -OBJECTS=$(PROGRAM).o - -include ../../src/makeprog.env - 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.in b/samples/layout/Makefile.in new file mode 100644 index 0000000000..30d7f33045 --- /dev/null +++ b/samples/layout/Makefile.in @@ -0,0 +1,20 @@ +# +# File: makefile.unx +# Author: Julian Smart +# Created: 1998 +# Updated: +# Copyright: (c) 1998 Julian Smart +# +# "%W% %G%" +# +# Makefile for layout example (UNIX). + +top_srcdir = @top_srcdir@ +top_builddir = ../.. + +PROGRAM=layout + +OBJECTS=$(PROGRAM).o + +include ../../src/makeprog.env + diff --git a/samples/layout/makefile.unx b/samples/layout/makefile.unx deleted file mode 100644 index ff2edfa6ce..0000000000 --- a/samples/layout/makefile.unx +++ /dev/null @@ -1,17 +0,0 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for layout example (UNIX). - -PROGRAM=layout - -OBJECTS=$(PROGRAM).o - -include ../../src/makeprog.env - 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.in b/samples/listctrl/Makefile.in new file mode 100644 index 0000000000..0024e9608f --- /dev/null +++ b/samples/listctrl/Makefile.in @@ -0,0 +1,20 @@ +# +# File: makefile.unx +# Author: Julian Smart +# Created: 1998 +# Updated: +# Copyright: (c) 1998 Julian Smart +# +# "%W% %G%" +# +# Makefile for listctrl example (UNIX). + +top_srcdir = @top_srcdir@ +top_builddir = ../.. + +PROGRAM=listtest + +OBJECTS=$(PROGRAM).o + +include ../../src/makeprog.env + diff --git a/samples/listctrl/makefile.unx b/samples/listctrl/makefile.unx deleted file mode 100644 index a94e6cb31d..0000000000 --- a/samples/listctrl/makefile.unx +++ /dev/null @@ -1,17 +0,0 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for listctrl example (UNIX). - -PROGRAM=listtest - -OBJECTS=$(PROGRAM).o - -include ../../src/makeprog.env - 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.in b/samples/mdi/Makefile.in new file mode 100644 index 0000000000..b3ec46662b --- /dev/null +++ b/samples/mdi/Makefile.in @@ -0,0 +1,20 @@ +# +# File: makefile.unx +# Author: Julian Smart +# Created: 1998 +# Updated: +# Copyright: (c) 1998 Julian Smart +# +# "%W% %G%" +# +# Makefile for mdi example (UNIX). + +top_srcdir = @top_srcdir@ +top_builddir = ../.. + +PROGRAM=mdi + +OBJECTS=$(PROGRAM).o + +include ../../src/makeprog.env + diff --git a/samples/mdi/makefile.unx b/samples/mdi/makefile.unx deleted file mode 100644 index 4c904e4c6f..0000000000 --- a/samples/mdi/makefile.unx +++ /dev/null @@ -1,17 +0,0 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for mdi example (UNIX). - -PROGRAM=mdi - -OBJECTS=$(PROGRAM).o - -include ../../src/makeprog.env - 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.in b/samples/minifram/Makefile.in new file mode 100644 index 0000000000..0e0ce03472 --- /dev/null +++ b/samples/minifram/Makefile.in @@ -0,0 +1,21 @@ +# +# File: makefile.unx +# Author: Julian Smart +# Created: 1998 +# Updated: +# Copyright: (c) 1998 Julian Smart +# +# "%W% %G%" +# +# Makefile for toolbar example (UNIX). + +top_srcdir = @top_srcdir@ +top_builddir = ../.. + +PROGRAM=test + +OBJECTS=$(PROGRAM).o + +include ../../src/makeprog.env + + diff --git a/samples/minifram/makefile.unx b/samples/minifram/makefile.unx deleted file mode 100644 index 0b249d4c88..0000000000 --- a/samples/minifram/makefile.unx +++ /dev/null @@ -1,18 +0,0 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for toolbar example (UNIX). - -PROGRAM=test - -OBJECTS=$(PROGRAM).o - -include ../../src/makeprog.env - - 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.in b/samples/minimal/Makefile.in new file mode 100644 index 0000000000..d005a1ee85 --- /dev/null +++ b/samples/minimal/Makefile.in @@ -0,0 +1,20 @@ +# +# File: makefile.unx +# Author: Julian Smart +# Created: 1998 +# Updated: +# Copyright: (c) 1998 Julian Smart +# +# "%W% %G%" +# +# Makefile for minimal example (UNIX). + +top_srcdir = @top_srcdir@ +top_builddir = ../.. + +PROGRAM=minimal + +OBJECTS=$(PROGRAM).o + +include ../../src/makeprog.env + diff --git a/samples/minimal/makefile.unx b/samples/minimal/makefile.unx deleted file mode 100644 index 6e0b9cac43..0000000000 --- a/samples/minimal/makefile.unx +++ /dev/null @@ -1,17 +0,0 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for minimal example (UNIX). - -PROGRAM=minimal - -OBJECTS=$(PROGRAM).o - -include ../../src/makeprog.env - 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.in b/samples/notebook/Makefile.in new file mode 100644 index 0000000000..6cb90efc3d --- /dev/null +++ b/samples/notebook/Makefile.in @@ -0,0 +1,20 @@ +# +# File: makefile.unx +# Author: Julian Smart +# Created: 1998 +# Updated: +# Copyright: (c) 1998 Julian Smart +# +# "%W% %G%" +# +# Makefile for notebook example (UNIX). + +top_srcdir = @top_srcdir@ +top_builddir = ../.. + +PROGRAM=test + +OBJECTS=$(PROGRAM).o + +include ../../src/makeprog.env + diff --git a/samples/notebook/makefile.unx b/samples/notebook/makefile.unx deleted file mode 100644 index a3f76189b2..0000000000 --- a/samples/notebook/makefile.unx +++ /dev/null @@ -1,17 +0,0 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for notebook example (UNIX). - -PROGRAM=test - -OBJECTS=$(PROGRAM).o - -include ../../src/makeprog.env - 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@