[GRASS-SVN] r67844 - in grass-addons/grass7/raster/r.green: libgreen r.green.hydro/libhydro

[svn_grass at osgeo.org]

Author: martinl
Date: 2016-02-16 05:11:03 -0800 (Tue, 16 Feb 2016)
New Revision: 67844

Modified:
   grass-addons/grass7/raster/r.green/libgreen/Makefile
   grass-addons/grass7/raster/r.green/r.green.hydro/libhydro/Makefile
Log:
r.green: fix lib Makefiles

Modified: grass-addons/grass7/raster/r.green/libgreen/Makefile
===================================================================
--- grass-addons/grass7/raster/r.green/libgreen/Makefile	2016-02-16 11:27:05 UTC (rev 67843)
+++ grass-addons/grass7/raster/r.green/libgreen/Makefile	2016-02-16 13:11:03 UTC (rev 67844)
@@ -3,18 +3,16 @@
 include $(MODULE_TOPDIR)/include/Make/Other.make
 include $(MODULE_TOPDIR)/include/Make/Python.make
 
-MODULES = utils checkparameter
+MODULES = utils checkparameter __init__
 
+LIBGREENDIR = r.green/libgreen
+ETCDIR = $(ETC)/$(LIBGREENDIR)
 
-LIBGREENDIR = $(ETC)/r.green
-ETCDIR = $(LIBGREENDIR)/libgreen
+PYFILES := $(patsubst %,$(ETCDIR)/%.py,$(MODULES))
+PYCFILES := $(patsubst %,$(ETCDIR)/%.pyc,$(MODULES))
 
+default: $(PYFILES) $(PYCFILES)
 
-PYFILES := $(patsubst %,$(ETCDIR)/%.py,$(MODULES) __init__)
-PYCFILES := $(patsubst %,$(ETCDIR)/%.pyc,$(MODULES) __init__)
-
-default: $(PYFILES) $(PYCFILES) $(ETCDIR)/__init__.py $(ETCDIR)/__init__.pyc
-
 $(ETCDIR):
 	$(MKDIR) $@
 
@@ -22,4 +20,4 @@
 	$(INSTALL_DATA) $< $@
 
 install:
-	cp -r $(ETCDIR) $(INST_DIR)
+	cp -r $(ETCDIR) $(INST_DIR)/etc/$(LIBGREENDIR)

Modified: grass-addons/grass7/raster/r.green/r.green.hydro/libhydro/Makefile
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/libhydro/Makefile	2016-02-16 11:27:05 UTC (rev 67843)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/libhydro/Makefile	2016-02-16 13:11:03 UTC (rev 67844)
@@ -3,18 +3,16 @@
 include $(MODULE_TOPDIR)/include/Make/Other.make
 include $(MODULE_TOPDIR)/include/Make/Python.make
 
-MODULES = basin plant optimal
+MODULES = basin plant optimal __init__
 
+LIBHYDRODIR = r.green/libhydro
+ETCDIR = $(ETC)/$(LIBHYDRODIR)
 
-LIBGREENDIR = $(ETC)/r.green
-ETCDIR = $(LIBGREENDIR)/libhydro
+PYFILES := $(patsubst %,$(ETCDIR)/%.py,$(MODULES))
+PYCFILES := $(patsubst %,$(ETCDIR)/%.pyc,$(MODULES))
 
+default: $(PYFILES) $(PYCFILES)
 
-PYFILES := $(patsubst %,$(ETCDIR)/%.py,$(MODULES) __init__)
-PYCFILES := $(patsubst %,$(ETCDIR)/%.pyc,$(MODULES) __init__)
-
-default: $(PYFILES) $(PYCFILES) $(ETCDIR)/__init__.py $(ETCDIR)/__init__.pyc
-
 $(ETCDIR):
 	$(MKDIR) $@
 
@@ -22,4 +20,4 @@
 	$(INSTALL_DATA) $< $@
 
 install:
-	cp -r $(ETCDIR) $(INST_DIR)
+	cp -r $(ETCDIR) $(INST_DIR)/etc/$(LIBHYDRODIR)