[csw-devel] SF.net SVN: gar:[4634] csw/mgar/gar/v2

[dmichelsen at users.sourceforge.net]

Revision: 4634
          http://gar.svn.sourceforge.net/gar/?rev=4634&view=rev
Author:   dmichelsen
Date:     2009-05-01 14:37:31 +0000 (Fri, 01 May 2009)

Log Message:
-----------
mGAR v2: Allow category-specific compiler flags, use x11/category.mk as example

Modified Paths:
--------------
    csw/mgar/gar/v2/categories/x11/category.mk
    csw/mgar/gar/v2/gar.conf.mk

Modified: csw/mgar/gar/v2/categories/x11/category.mk
===================================================================
--- csw/mgar/gar/v2/categories/x11/category.mk	2009-05-01 13:09:55 UTC (rev 4633)
+++ csw/mgar/gar/v2/categories/x11/category.mk	2009-05-01 14:37:31 UTC (rev 4634)
@@ -3,41 +3,22 @@
 XCB_MASTER_SITES = http://xcb.freedesktop.org/dist/
 
 # C and C++ compiler flags
-ifeq ($(GARCOMPILER),GNU)
-  CFLAGS +=
-  CXXFLAGS +=
-else
-  CFLAGS += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION
-  CXXFLAGS += -xlibmil -xlibmopt -features=tmplife -norunpath
-endif
+_CATEGORY_CFLAGS_SOS11 = -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION
+_CATEGORY_CFLAGS_SOS12 = -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION
+_CATEGORY_CXXFLAGS_SOS11 = -xlibmil -xlibmopt -features=tmplife -norunpath
+_CATEGORY_CXXFLAGS_SOS12 = -xlibmil -xlibmopt -features=tmplife -norunpath
 
-# Preprocessor flags
+_CATEGORY_CFLAGS = $(_CATEGORY_CFLAGS_$(GARCOMPILER))
+_CATEGORY_CXXFLAGS = $(_CATEGORY_CFLAGS_$(GARCOMPILER))
 
-# Linker flags
-#LDFLAGS      += -L/opt/csw/lib -R/opt/csw/lib
-
 # Defines some tools used by autostuff
 GREP = ggrep
 _CATEGORY_COMMON_EXPORTS = GREP
 
-# export the variables
-#export LDFLAGS CXXFLAGS CFLAGS CPPFLAGS GREP
-
-# pkg-config options
-#_CATEGORY_PKG_CONFIG_PATH = $(abspath $(prefix)/X11/lib/$(MM_LIBDIR)/pkgconfig)
-
 prefix = $(BUILD_PREFIX)/X11
 
-# Configure common options
-#CONFIGURE_ARGS  = --prefix=/opt/csw/X11 
-#CONFIGURE_ARGS += --exec-prefix=/opt/csw/X11 
-#CONFIGURE_ARGS += --libdir=/opt/csw/X11/lib
-#CONFIGURE_ARGS += --includedir=/opt/csw/X11/include
-#CONFIGURE_ARGS += --datadir=/opt/csw/X11/share
-#CONFIGURE_ARGS += --mandir=/opt/csw/X11/share/man
-
 # No tests scripts, thus there is no "gmake test" target
-TEST_SCRIPTS      = 
+TEST_SCRIPTS = 
 
 # Includes the rest of gar
 include gar/gar.mk

Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk	2009-05-01 13:09:55 UTC (rev 4633)
+++ csw/mgar/gar/v2/gar.conf.mk	2009-05-01 14:37:31 UTC (rev 4634)
@@ -466,12 +466,12 @@
 CC_HOME  = $($(GARCOMPILER)_CC_HOME)
 CC       = $($(GARCOMPILER)_CC)
 CXX      = $($(GARCOMPILER)_CXX)
-CFLAGS   ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(EXTRA_CFLAGS) $(INCLUDE_FLAGS))
-CXXFLAGS ?= $(strip $($(GARCOMPILER)_CXX_FLAGS) $(EXTRA_CXXFLAGS) $(INCLUDE_FLAGS))
-CPPFLAGS ?= $(strip $($(GARCOMPILER)_CPP_FLAGS) $(EXTRA_CPPFLAGS) $(INCLUDE_FLAGS))
-LDFLAGS  ?= $(strip $($(GARCOMPILER)_LD_FLAGS) $(EXTRA_LDFLAGS) $(LINKER_FLAGS))
-ASFLAGS  ?= $(strip $($(GARCOMPILER)_AS_FLAGS) $(EXTRA_ASFLAGS))
-OPTFLAGS ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(EXTRA_OPTFLAGS))
+CFLAGS   ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(_CATEGORY_CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE_FLAGS))
+CXXFLAGS ?= $(strip $($(GARCOMPILER)_CXX_FLAGS) $(_CATEGORY_CXXFLAGS) $(EXTRA_CXXFLAGS) $(INCLUDE_FLAGS))
+CPPFLAGS ?= $(strip $($(GARCOMPILER)_CPP_FLAGS) $(_CATEGORY_CPPFLAGS) $(EXTRA_CPPFLAGS) $(INCLUDE_FLAGS))
+LDFLAGS  ?= $(strip $($(GARCOMPILER)_LD_FLAGS) $(_CATEGORY_LDFLAGS) $(EXTRA_LDFLAGS) $(LINKER_FLAGS))
+ASFLAGS  ?= $(strip $($(GARCOMPILER)_AS_FLAGS) $(_CATEGORY_ASFLAGS) $(EXTRA_ASFLAGS))
+OPTFLAGS ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(_CATEGORY_OPTFLAGS) $(EXTRA_OPTFLAGS))
 
 GCC3_LD_OPTIONS = -R$(GCC3_CC_HOME)/lib $(EXTRA_GCC3_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS) $(EXTRA_LD_OPTIONS)
 GCC4_LD_OPTIONS = -R$(GCC4_CC_HOME)/lib $(EXTRA_GCC4_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS) $(EXTRA_LD_OPTIONS)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.