Kaynağa Gözat

Minor build clean-up

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@61733 15284696-431f-4ddb-bdfa-cd5b030d7da7
Glynn Clements 10 yıl önce
ebeveyn
işleme
e9bf676713
2 değiştirilmiş dosya ile 3 ekleme ve 5 silme
  1. 1 1
      lib/cdhc/Makefile
  2. 2 4
      lib/python/script/Makefile

+ 1 - 1
lib/cdhc/Makefile

@@ -16,7 +16,7 @@ ifeq ($(strip $(CROSS_COMPILING)),)
 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)

+ 2 - 4
lib/python/script/Makefile

@@ -11,8 +11,6 @@ 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):
@@ -21,10 +19,10 @@ $(DSTDIR):
 $(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)#' \
 	$< > $@