[GRASS-SVN] r45937 - grass/branches/releasebranch_6_4/lib/python

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-04-13 04:32:26 -0700 (Wed, 13 Apr 2011)
New Revision: 45937

Added:
   grass/branches/releasebranch_6_4/lib/python/ctypes/
Modified:
   grass/branches/releasebranch_6_4/lib/python/Makefile
Log:
backport ctypes from devbr6


Modified: grass/branches/releasebranch_6_4/lib/python/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/lib/python/Makefile	2011-04-13 11:31:56 UTC (rev 45936)
+++ grass/branches/releasebranch_6_4/lib/python/Makefile	2011-04-13 11:32:26 UTC (rev 45937)
@@ -3,6 +3,7 @@
 include $(MODULE_TOPDIR)/include/Make/Platform.make
 include $(MODULE_TOPDIR)/include/Make/Grass.make
 include $(MODULE_TOPDIR)/include/Make/Rules.make
+include $(MODULE_TOPDIR)/include/Make/Python.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make
 
 PYDIR = $(ETC)/python
@@ -12,24 +13,29 @@
 MODULES = core db raster vector array setup
 
 PYFILES := $(patsubst %,$(DSTDIR)/%.py,$(MODULES) __init__)
+PYCFILES := $(patsubst %,$(DSTDIR)/%.pyc,$(MODULES) __init__)
 
-default: $(DSTDIR)
-	$(MAKE) $(PYFILES)
+CLEAN_SUBDIRS = ctypes
 EXTRA_CLEAN_FILES = setup.py
 
+default: $(PYFILES) $(PYCFILES) $(GDIR)/__init__.py $(GDIR)/__init__.pyc
+	-$(MAKE) -C ctypes || echo $(CURDIR)/ctypes >> $(ERRORLOG)
+
 $(PYDIR):
-	test -d $@ || $(MKDIR) -p $@
+	$(MKDIR) $@
 
-$(GDIR): $(PYDIR)
-	test -d $@ || $(MKDIR) -p $@
+$(GDIR): | $(PYDIR)
+	$(MKDIR) $@
 
-$(DSTDIR): $(GDIR)
-	test -d $@ || $(MKDIR) -p $@
-	@cat grass__init__.py > $(GDIR)/__init__.py
+$(DSTDIR): | $(GDIR)
+	$(MKDIR) $@
 
-$(DSTDIR)/%: %
+$(GDIR)/__init__.py: grass__init__.py | $(GDIR)
 	$(INSTALL_DATA) $< $@
 
+$(DSTDIR)/%: % | $(DSTDIR)
+	$(INSTALL_DATA) $< $@
+
 setup.py: setup.py.sed
 	sed \
 	-e 's#@LD_LIBRARY_PATH_VAR@#$(LD_LIBRARY_PATH_VAR)#' \