From 0c3f1084652f7d81f1ca992676e90c158eeb3e65 Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Mon, 6 Nov 2006 16:43:31 +0000
Subject: Minor source reorg, see README.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@471789 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/options.mk | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

(limited to 'cpp/options.mk')

diff --git a/cpp/options.mk b/cpp/options.mk
index a98c42666c..ef14480113 100644
--- a/cpp/options.mk
+++ b/cpp/options.mk
@@ -14,28 +14,23 @@
  # limitations under the License.
  #
 
-## Build platform and type.
-
-# Default type
+## Build platform and type defaults
 TYPE := debug
-# Known platforms
-PLATFORMS := apr
-# TODO aconway 2006-10-30: Remove Default platform when there's more than 1.
 PLATFORM := apr
 
 # Local options, may override PLATFORM and/or TYPE
 -include options-local.mk
 
-DUMMY := $(if $(filter $(PLATFORM),$(PLATFORMS)),OK,$(error PLATFORM is not set. Use 'make PLATFORM=<name>' or create file options-local.mk with PLATFORM=<name>. Valid names: $(PLATFORMS)))
-DUMMY := $(if $(filter $(TYPE),debug release),OK,$(error TYPE must be 'debug' or 'release'))
-
-
 ## Platform specific options
 
 # apr: Apache Portable Runtime.
-CXXFLAGS_apr := -D_USE_APR_IO_ -I/usr/local/apr/include
+CXXFLAGS_apr := -I/usr/local/apr/include
 LDFLAGS_apr  := -L/usr/local/apr/lib -lapr-1 
 
+# posix: Native posix implementation
+CXXFLAGS_posix :=
+LDFLAGS_posix  :=
+
 ## Build directories.
 
 BUILD=$(PLATFORM)-$(TYPE)
@@ -46,13 +41,13 @@ OBJDIR:=build/$(BUILD)/obj
 TESTDIR:=build/$(BUILD)/test
 
 BUILDDIRS := $(BINDIR) $(LIBDIR) $(OBJDIR) $(TESTDIR) $(GENDIR)
-SRCDIRS := src src_$(PLATFORM) $(GENDIR)
+SRCDIRS := src $(GENDIR)
 
 ## External dependencies:
 
 # Add location for headers and libraries of any external dependencies here
-EXTRA_INCLUDES := -I/usr/local/apr/include
-EXTRA_LIBDIRS := -L/usr/local/apr/lib
+EXTRA_INCLUDES :=
+EXTRA_LIBDIRS  :=
 
 ## Compile flags
 
-- 
cgit v1.2.1