[GRASS-SVN] r37671 - in grass/trunk: include/Make lib/init locale swig/python

svn_grass at osgeo.org svn_grass at osgeo.org
Mon Jun 1 01:29:24 EDT 2009 

Author: glynn
Date: 2009-06-01 01:29:24 -0400 (Mon, 01 Jun 2009)
New Revision: 37671

Modified:
   grass/trunk/include/Make/Grass.make
   grass/trunk/include/Make/Platform.make.in
   grass/trunk/include/Make/Python.make
   grass/trunk/lib/init/Makefile
   grass/trunk/locale/Makefile
   grass/trunk/swig/python/Makefile
Log:
Build system clean-up


Modified: grass/trunk/include/Make/Grass.make
===================================================================
--- grass/trunk/include/Make/Grass.make	2009-06-01 05:27:36 UTC (rev 37670)
+++ grass/trunk/include/Make/Grass.make	2009-06-01 05:29:24 UTC (rev 37671)
@@ -26,27 +26,33 @@
 # platform specific dirs
 ARCH_DISTDIR	= $(GRASS_HOME)/dist.$(ARCH)
 ARCH_BINDIR     = $(GRASS_HOME)/bin.$(ARCH)
+
+GISBASE		= $(ARCH_DISTDIR)
+
 ERRORLOG        = $(GRASS_HOME)/error.log
 # include dirs
 ARCH_INCDIR     = $(ARCH_DISTDIR)/include/grass
 
-ARCH_INC	= -I$(ARCH_DISTDIR)/include
-INC		= $(ARCH_INC)
+INC		= -I$(ARCH_DISTDIR)/include -I$(GISBASE)/include
 VECT_INC        = 
 
 # libraries
 ARCH_LIBDIR     = $(ARCH_DISTDIR)/lib
 
-ARCH_LIBPATH	= -L$(ARCH_LIBDIR)
-LIBPATH		= $(ARCH_LIBPATH)
+LIBPATH		= -L$(ARCH_LIBDIR) -L$(GISBASE)/lib
 
 # object dir
 OBJDIR		= OBJ.$(ARCH)
 
+LIB_RUNTIME_DIR = $(GISBASE)/lib
+
+RUN_GISRC       = $(GISBASE)/demolocation/.grassrc$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR)
+RUN_GISBASE     = $(GISBASE)
+
 #########################################################################
 # these define the various directories which contain GRASS programs
 # or files used by GRASS programs
-GISBASE		= $(ARCH_DISTDIR)
+
 BIN             = $(ARCH_DISTDIR)/bin
 ETC             = $(ARCH_DISTDIR)/etc
 DRIVERDIR       = $(ARCH_DISTDIR)/driver
@@ -54,6 +60,8 @@
 DOCSDIR         = $(ARCH_DISTDIR)/docs
 HTMLDIR         = $(ARCH_DISTDIR)/docs/html
 SCRIPTDIR       = $(ARCH_DISTDIR)/scripts
+MSG_DIR         = $(ARCH_DISTDIR)/etc/msgs
+MO_DIR          = $(ARCH_DISTDIR)/locale
 
 FONTDIR         = $(ARCH_DISTDIR)/fonts
 
@@ -64,6 +72,10 @@
 GRASS_BUILD_FILE      = $(ETC)/BUILD
 
 ##################### other #############################################
+
+COMPILE_FLAGS      = $(CPPFLAGS) $(CFLAGS1) $(INCLUDE_DIRS)
+COMPILE_FLAGS_CXX  = $(CPPFLAGS) $(CXXFLAGS1) $(INCLUDE_DIRS)
+
 CFLAGS      =  $(INC) $(COMPILE_FLAGS)
 CXXFLAGS    =  $(INC) $(COMPILE_FLAGS_CXX)
 LDFLAGS     =  $(LIBPATH) $(LINK_FLAGS) $(LD_SEARCH_FLAGS) $(PQLIBPATH)
@@ -83,7 +95,7 @@
 MANSECT = 1
 MANBASEDIR = $(ARCH_DISTDIR)/man
 MANDIR = $(MANBASEDIR)/man$(MANSECT)
-HTML2MAN = VERSION_NUMBER=${GRASS_VERSION_NUMBER} $(GRASS_HOME)/tools/g.html2man/g.html2man.py
+HTML2MAN = VERSION_NUMBER=$(GRASS_VERSION_NUMBER) $(GRASS_HOME)/tools/g.html2man/g.html2man.py
 
 ##################### library names #####################################
 

Modified: grass/trunk/include/Make/Platform.make.in
===================================================================
--- grass/trunk/include/Make/Platform.make.in	2009-06-01 05:27:36 UTC (rev 37670)
+++ grass/trunk/include/Make/Platform.make.in	2009-06-01 05:29:24 UTC (rev 37671)
@@ -40,6 +40,8 @@
 UNIX_BIN            = @BINDIR@
 INST_DIR            = @INSTDIR@
 
+GRASS_HOME          = @GRASS_HOME@
+
 GRASS_VERSION_MAJOR = @GRASS_VERSION_MAJOR@
 GRASS_VERSION_MINOR = @GRASS_VERSION_MINOR@
 GRASS_VERSION_RELEASE = @GRASS_VERSION_RELEASE@
@@ -50,7 +52,6 @@
 CC_SEARCH_FLAGS     = @CC_SEARCH_FLAGS@
 LD_SEARCH_FLAGS     = @LD_SEARCH_FLAGS@
 LD_LIBRARY_PATH_VAR = @LD_LIBRARY_PATH_VAR@
-LIB_RUNTIME_DIR     = $(ARCH_LIBDIR)
 
 #generate static (ST) or shared (SH)
 LIB_PREFIX          = @GRASS_LIB_PREFIX@
@@ -72,12 +73,6 @@
 SHLIB_SUFFIX        = @SHLIB_SUFFIX@
 EXE                 = @EXEEXT@
 
-
-# GRASS dirs
-GRASS_HOME          = @GRASS_HOME@
-RUN_GISBASE         = @GISBASE@
-RUN_GISRC           = ${ARCH_DISTDIR}/demolocation/.grassrc${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}
-
 DEFAULT_DATABASE    =
 DEFAULT_LOCATION    =
 
@@ -85,9 +80,6 @@
 CFLAGS1             = @CFLAGS@
 CXXFLAGS1           = @CXXFLAGS@
 INCLUDE_DIRS        = @INCLUDE_DIRS@
-
-COMPILE_FLAGS       = $(CPPFLAGS) $(CFLAGS1) $(INCLUDE_DIRS)
-COMPILE_FLAGS_CXX   = $(CPPFLAGS) $(CXXFLAGS1) $(INCLUDE_DIRS)
 LINK_FLAGS          = @LDFLAGS@
 
 DLLIB               = @DLLIB@

Modified: grass/trunk/include/Make/Python.make
===================================================================
--- grass/trunk/include/Make/Python.make	2009-06-01 05:27:36 UTC (rev 37670)
+++ grass/trunk/include/Make/Python.make	2009-06-01 05:29:24 UTC (rev 37671)
@@ -13,7 +13,7 @@
 	$(PYTHON) -m py_compile $<
 
 %_wrap.c %.py: %.i $(EXTRA_SWIG)
-	$(SWIG) $(ARCH_INC) -python -module $* -shadow $<
+	$(SWIG) $(INC) -python -module $* -shadow $<
 
 _%.so: $(OBJDIR)/%_wrap.o $(_%_so_FILES)
 	$(PYMOD_LD) -o $@ $(LDFLAGS) $(EXTRA_LDFLAGS) $(PYMOD_LDFLAGS) $(filter %.o,$^) $($*_LIBS) $(LIBES) $(EXTRA_LIBS)

Modified: grass/trunk/lib/init/Makefile
===================================================================
--- grass/trunk/lib/init/Makefile	2009-06-01 05:27:36 UTC (rev 37670)
+++ grass/trunk/lib/init/Makefile	2009-06-01 05:29:24 UTC (rev 37671)
@@ -61,8 +61,8 @@
 default: $(FILES)
 
 $(ARCH_BINDIR)/$(START_UP): init.sh grass.src
-	@test -d $(ARCH_BINDIR) || (echo 'ARCH_DISTDIR($(ARCH_BINDIR))' not found; exit 1)
-	@test -w $(ARCH_BINDIR) || (echo '($(ARCH_BINDIR))' not writeable; exit 1)
+	@test -d $(ARCH_BINDIR) || (echo 'ARCH_BINDIR($(ARCH_BINDIR))' not found; exit 1)
+	@test -w $(ARCH_BINDIR) || (echo 'ARCH_BINDIR($(ARCH_BINDIR))' not writeable; exit 1)
 	rm -f $(ARCH_BINDIR)/$(START_UP) ; true
 	$(SHELL) -c "sed \
 	-e \"s#GISBASE_VALUE#$(GISBASE)#\" \
@@ -70,8 +70,8 @@
 	chmod a+x $(ARCH_BINDIR)/$(START_UP)
 
 $(ARCH_BINDIR)/$(START_UP).bat: init.bat grass.bat
-	@test -d $(ARCH_BINDIR) || (echo 'ARCH_DISTDIR($(ARCH_BINDIR))' not found; exit 1)
-	@test -w $(ARCH_BINDIR) || (echo '($(ARCH_BINDIR))' not writeable; exit 1)
+	@test -d $(ARCH_BINDIR) || (echo 'ARCH_BINDIR($(ARCH_BINDIR))' not found; exit 1)
+	@test -w $(ARCH_BINDIR) || (echo 'ARCH_BINDIR($(ARCH_BINDIR))' not writeable; exit 1)
 	rm -f $@ ; true
 	$(SHELL) -c "sed \
 	-e \"s#GISBASE_VALUE#$(RUN_GISBASE)#\" \

Modified: grass/trunk/locale/Makefile
===================================================================
--- grass/trunk/locale/Makefile	2009-06-01 05:27:36 UTC (rev 37670)
+++ grass/trunk/locale/Makefile	2009-06-01 05:29:24 UTC (rev 37671)
@@ -20,8 +20,6 @@
 	@echo '   make mo         create the *.mo files'
 
 # Directory for installing tcl .msg files:
-MSG_DIR = $(ARCH_DISTDIR)/etc/msgs
-MO_DIR = $(ARCH_DISTDIR)/locale
 PO_DIR = po
 
 #distinguish between library messages and modules:

Modified: grass/trunk/swig/python/Makefile
===================================================================
--- grass/trunk/swig/python/Makefile	2009-06-01 05:27:36 UTC (rev 37670)
+++ grass/trunk/swig/python/Makefile	2009-06-01 05:29:24 UTC (rev 37671)
@@ -33,7 +33,7 @@
 proj_wrap_c_FLAGS = $(PROJINC) $(GDALCFLAGS)
 
 EXTRA_SWIG = ../include/python/my_typemaps.i ../include/python/common.i
-SWIGFLAGS = $(ARCH_INC) -I../include/python -outdir .
+SWIGFLAGS = $(INC) -I../include/python -outdir .
 EXTRA_CFLAGS = $(PYMOD_CFLAGS)
 EXTRA_CLEAN_FILES := $(foreach M,$(MODULES),$(M)_wrap.o $(M)_wrap.c $(M).pyc $(M).py _$(M).so)
 CLEAN_SUBDIRS = NumPtr

More information about the grass-commit mailing list