pythonlib: update layout

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@54569 15284696-431f-4ddb-bdfa-cd5b030d7da7

lib/python/Makefile

@@ -1,48 +1,26 @@
 MODULE_TOPDIR = ../..
 
-include $(MODULE_TOPDIR)/include/Make/Other.make
+#include $(MODULE_TOPDIR)/include/Make/Other.make
+include $(MODULE_TOPDIR)/include/Make/Dir.make
 include $(MODULE_TOPDIR)/include/Make/Python.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make
 
-PYDIR = $(ETC)/python
-GDIR = $(PYDIR)/grass
-DSTDIR = $(GDIR)/script
+PYDIR = $(ETC)/python/grass
 
-MODULES = core db raster raster3d vector array setup task 
+SUBDIRS = script ctypes temporal pygrass
 
-PYFILES := $(patsubst %,$(DSTDIR)/%.py,$(MODULES) __init__)
-PYCFILES := $(patsubst %,$(DSTDIR)/%.pyc,$(MODULES) __init__)
-
-CLEAN_SUBDIRS = ctypes temporal pygrass
-EXTRA_CLEAN_FILES = setup.py
-
-default: $(PYFILES) $(PYCFILES) $(GDIR)/__init__.py $(GDIR)/__init__.pyc
-	-$(MAKE) -C ctypes || echo $(CURDIR)/ctypes >> $(ERRORLOG)
-	-$(MAKE) -C temporal || echo $(CURDIR)/temporal >> $(ERRORLOG)
-	-$(MAKE) -C pygrass || echo $(CURDIR)/pygrass >> $(ERRORLOG)
+default: $(PYDIR)/__init__.py
+	$(MAKE) subdirs
+#	-$(MAKE) -C script || echo $(CURDIR)/script >> $(ERRORLOG)
+#	-$(MAKE) -C ctypes || echo $(CURDIR)/ctypes >> $(ERRORLOG)
+#	-$(MAKE) -C temporal || echo $(CURDIR)/temporal >> $(ERRORLOG)
+#	-$(MAKE) -C pygrass || echo $(CURDIR)/pygrass >> $(ERRORLOG)
 
 $(PYDIR):
 	$(MKDIR) $@
 
-$(GDIR): | $(PYDIR)
-	$(MKDIR) $@
-
-$(DSTDIR): | $(GDIR)
-	$(MKDIR) $@
-
-$(GDIR)/__init__.py: grass__init__.py | $(GDIR)
+$(PYDIR)/__init__.py: __init__.py | $(PYDIR)
 	$(INSTALL_DATA) $< $@
 
-$(DSTDIR)/%: % | $(DSTDIR)
-	$(INSTALL_DATA) $< $@
-
-$(DSTDIR)/setup.py: setup.py | $(DSTDIR)
-	$(INSTALL_DATA) $< $@
-
-setup.py: setup.py.sed
-	sed \
-	-e 's#@LD_LIBRARY_PATH_VAR@#$(LD_LIBRARY_PATH_VAR)#' \
-	$< > $@
-
-#doxygen:
+# doxygen
 DOXNAME = python

lib/python/__init__.py

@@ -1,5 +1,4 @@
-from core   import *
-from db     import *
-from raster import *
-from raster3d import *
-from vector import *
+import os
+__all__ = ["script", "temporal"]
+if os.path.exists(os.path.join(os.path.dirname(__file__), "lib", "__init__.py")):
+    __all__.append("lib")

lib/python/grass__init__.py

@@ -1,4 +0,0 @@
-import os
-__all__ = ["script", "temporal"]
-if os.path.exists(os.path.join(os.path.dirname(__file__), "lib", "__init__.py")):
-    __all__.append("lib")

lib/python/script/Makefile

@@ -0,0 +1,30 @@
+MODULE_TOPDIR = ../../..
+
+include $(MODULE_TOPDIR)/include/Make/Other.make
+include $(MODULE_TOPDIR)/include/Make/Python.make
+include $(MODULE_TOPDIR)/include/Make/Doxygen.make
+
+DSTDIR = $(ETC)/python/grass/script
+
+MODULES = core db raster raster3d vector array setup task 
+
+PYFILES := $(patsubst %,$(DSTDIR)/%.py,$(MODULES) __init__)
+PYCFILES := $(patsubst %,$(DSTDIR)/%.pyc,$(MODULES) __init__)
+
+EXTRA_CLEAN_FILES = setup.py
+
+default: $(PYFILES) $(PYCFILES)
+
+$(DSTDIR):
+	$(MKDIR) $@
+
+$(DSTDIR)/%: % | $(DSTDIR)
+	$(INSTALL_DATA) $< $@
+
+$(DSTDIR)/setup.py: setup.py | $(DSTDIR)
+	$(INSTALL_DATA) $< $@
+
+setup.py: setup.py.sed
+	sed \
+	-e 's#@LD_LIBRARY_PATH_VAR@#$(LD_LIBRARY_PATH_VAR)#' \
+	$< > $@

lib/python/script/__init__.py

@@ -0,0 +1,5 @@
+from core   import *
+from db     import *
+from raster import *
+from raster3d import *
+from vector import *