From 1b351afee9c00b26cf74255bb333773b4886c018 Mon Sep 17 00:00:00 2001 From: brodsom Date: Fri, 11 Jul 2003 13:31:08 +0000 Subject: [PATCH] Move examples builds to examples directory --- builds/posix/Makefile.in.firebird | 18 +++++++++++++----- configure.in | 7 +++---- .../build_unix}/Makefile.in.example5 | 2 +- .../build_unix}/Makefile.in.v5_examples | 2 +- 4 files changed, 18 insertions(+), 11 deletions(-) rename {builds/posix => examples/build_unix}/Makefile.in.example5 (99%) rename {builds/posix => examples/build_unix}/Makefile.in.v5_examples (98%) diff --git a/builds/posix/Makefile.in.firebird b/builds/posix/Makefile.in.firebird index 7a6e218b89..0c6fcb135b 100644 --- a/builds/posix/Makefile.in.firebird +++ b/builds/posix/Makefile.in.firebird @@ -27,7 +27,7 @@ # Contributor(s): # # -# $Id: Makefile.in.firebird,v 1.40 2003-07-11 02:23:58 brodsom Exp $ +# $Id: Makefile.in.firebird,v 1.41 2003-07-11 13:29:06 brodsom Exp $ # ROOT=.. @@ -301,7 +301,7 @@ security.fdb: gdef isql # build the security database .PHONY: ref_databases msgs msgs_intl generated_headers intl extlib includes -basic_targets: ref_databases msgs msgs_intl generated_headers intl extlib includes examples \ +basic_targets: ref_databases msgs msgs_intl generated_headers intl extlib includes examples_cp \ otherfiles # hack to make code regeneration work @@ -324,9 +324,17 @@ extlib: # external programs than can be called includes: include_generic # examples still need a good makefile to ship with them -examples: -# $(MAKE) -C ../gen/v5_examples -f ../Makefile.v5_examples -# $(MAKE) -f $(GEN_ROOT)/Makefile.v5_examples +examples_cp: + $(CP) $(ROOT)/examples/readme $(FIREBIRD)/examples/README + $(CP) $(ROOT)/examples/*.* $(FIREBIRD)/examples/ + $(CP) $(ROOT)/examples/api/*.* $(FIREBIRD)/examples/api/ + $(CP) $(ROOT)/examples/build_unix/*.* $(FIREBIRD)/examples/build_unix/ + $(CP) $(ROOT)/examples/build_win32/*.* $(FIREBIRD)/examples/build_win32/ + $(CP) $(ROOT)/examples/dyn/*.* $(FIREBIRD)/examples/dyn/ + $(CP) $(ROOT)/examples/empbuild/*.* $(FIREBIRD)/examples/empbuild/ + $(CP) $(ROOT)/examples/include/*.* $(FIREBIRD)/examples/include/ + $(CP) $(ROOT)/examples/stat/*.* $(FIREBIRD)/examples/stat/ + $(CP) $(ROOT)/examples/udf/*.* $(FIREBIRD)/examples/udf/ otherfiles: misc_files script_files diff --git a/configure.in b/configure.in index 17a4be884f..a67049bc84 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.144 2003-07-11 02:28:45 brodsom Exp $ +dnl $Id: configure.in,v 1.145 2003-07-11 13:28:04 brodsom Exp $ dnl ############################# INITIALISATION ############################### @@ -560,7 +560,6 @@ mkdir -p gen/firebird/examples/empbuild mkdir -p gen/firebird/examples/include mkdir -p gen/firebird/examples/stat mkdir -p gen/firebird/examples/udf -mkdir -p gen/firebird/examples/winevent mkdir -p gen/firebird/lib mkdir -p gen/firebird/misc mkdir -p gen/firebird/help @@ -735,7 +734,7 @@ gen/Makefile.client.util:${MAKE_SRC_DIR}/Makefile.in.client.util gen/Makefile.intl:${MAKE_SRC_DIR}/Makefile.in.intl gen/Makefile.msgs:${MAKE_SRC_DIR}/Makefile.in.msgs gen/Makefile.extlib:${MAKE_SRC_DIR}/Makefile.in.extlib -gen/Makefile.v5_examples:${MAKE_SRC_DIR}/Makefile.in.v5_examples +dnl ********** gen/Makefile.examples:${MAKE_SRC_DIR}/Makefile.in.examples gen/Makefile.libfbembed:${MAKE_SRC_DIR}/Makefile.in.libfbembed gen/Makefile.inet_server:${MAKE_SRC_DIR}/Makefile.in.inet_server gen/Makefile.embed.lockmgr:${MAKE_SRC_DIR}/Makefile.in.embed.lockmgr @@ -746,7 +745,7 @@ gen/Makefile.embed.isql:${MAKE_SRC_DIR}/Makefile.in.embed.isql gen/Makefile.embed.gdef:${MAKE_SRC_DIR}/Makefile.in.embed.gdef gen/Makefile.embed.qli:${MAKE_SRC_DIR}/Makefile.in.embed.qli gen/Makefile.embed.gpre:${MAKE_SRC_DIR}/Makefile.in.embed.gpre -src/v5_examples/Makefile:${MAKE_SRC_DIR}/Makefile.in.example5 +dnl ********** src/v5_examples/Makefile:${MAKE_SRC_DIR}/Makefile.in.example5 gen/Makefile.install:builds/install/arch-specific/${MAKEFILE_PREFIX}/Makefile.in Makefile:Makefile.in gen/Makefile.extern.editline:${MAKE_SRC_DIR}/Makefile.in.extern.editline diff --git a/builds/posix/Makefile.in.example5 b/examples/build_unix/Makefile.in.example5 similarity index 99% rename from builds/posix/Makefile.in.example5 rename to examples/build_unix/Makefile.in.example5 index 023bea02fc..1f421677e2 100644 --- a/builds/posix/Makefile.in.example5 +++ b/examples/build_unix/Makefile.in.example5 @@ -26,7 +26,7 @@ # Contributor(s): # # -# $Id: Makefile.in.example5,v 1.7 2003-07-08 01:05:22 brodsom Exp $ +# $Id: Makefile.in.example5,v 1.1 2003-07-11 13:30:32 brodsom Exp $ # ROOT=../.. diff --git a/builds/posix/Makefile.in.v5_examples b/examples/build_unix/Makefile.in.v5_examples similarity index 98% rename from builds/posix/Makefile.in.v5_examples rename to examples/build_unix/Makefile.in.v5_examples index a9fe368bbb..088e241521 100644 --- a/builds/posix/Makefile.in.v5_examples +++ b/examples/build_unix/Makefile.in.v5_examples @@ -27,7 +27,7 @@ # Contributor(s): # # -# $Id: Makefile.in.v5_examples,v 1.9 2003-07-08 01:05:22 brodsom Exp $ +# $Id: Makefile.in.v5_examples,v 1.1 2003-07-11 13:30:32 brodsom Exp $ # ROOT=../.. ObjModuleName=v5_examples