[GRASS-SVN] r61733 - in grass/trunk/lib: cdhc python/script

[svn_grass at osgeo.org]

Author: glynn
Date: 2014-08-25 03:23:20 -0700 (Mon, 25 Aug 2014)
New Revision: 61733

Modified:
   grass/trunk/lib/cdhc/Makefile
   grass/trunk/lib/python/script/Makefile
Log:
Minor build clean-up


Modified: grass/trunk/lib/cdhc/Makefile
===================================================================
--- grass/trunk/lib/cdhc/Makefile	2014-08-25 09:53:40 UTC (rev 61732)
+++ grass/trunk/lib/cdhc/Makefile	2014-08-25 10:23:20 UTC (rev 61733)
@@ -16,7 +16,7 @@
 endif
 
 test: $(OBJDIR)/test$(EXE)
-	cd $(OBJDIR) && $(call run_grass,./test < ../test_numbers.csv)
+	$(call run_grass,$(OBJDIR)/test$(EXE) < test_numbers.csv)
 
 #  Test functions
 $(OBJDIR)/test$(EXE): $(OBJDIR)/test.o $(GISDEP) $(CDHCDEP)

Modified: grass/trunk/lib/python/script/Makefile
===================================================================
--- grass/trunk/lib/python/script/Makefile	2014-08-25 09:53:40 UTC (rev 61732)
+++ grass/trunk/lib/python/script/Makefile	2014-08-25 10:23:20 UTC (rev 61733)
@@ -11,8 +11,6 @@
 PYFILES := $(patsubst %,$(DSTDIR)/%.py,$(MODULES) __init__)
 PYCFILES := $(patsubst %,$(DSTDIR)/%.pyc,$(MODULES) __init__)
 
-EXTRA_CLEAN_FILES = setup.py
-
 default: $(PYFILES) $(PYCFILES)
 
 $(DSTDIR):
@@ -21,10 +19,10 @@
 $(DSTDIR)/%: % | $(DSTDIR)
 	$(INSTALL_DATA) $< $@
 
-$(DSTDIR)/setup.py: setup.py | $(DSTDIR)
+$(DSTDIR)/setup.py: $(OBJDIR)/setup.py | $(DSTDIR)
 	$(INSTALL_DATA) $< $@
 
-setup.py: setup.py.sed
+$(OBJDIR)/setup.py: setup.py.sed | $(OBJDIR)
 	sed \
 	-e 's#@LD_LIBRARY_PATH_VAR@#$(LD_LIBRARY_PATH_VAR)#' \
 	$< > $@