[SCM] an open source computer algebra system branch, cleanedupstream, updated. 6125e540ca6d66c307958938a9d53b245507c323

Bernhard R. Link brlink at debian.org
Tue Apr 24 15:54:00 UTC 2012


The following commit has been merged in the cleanedupstream branch:
commit db8a09cee00cdced7ac1e071b160d75c3666737b
Author: Bernhard R. Link <brlink at debian.org>
Date:   Tue Mar 6 12:58:15 2012 +0100

    libfac: don't rebuild object files all the time.
    
    libfac/Makefile.in puts object files into the OPTOBJ directory,
    which it creates by some target and has it as prerequisite of
    all the files generated in this directory.
    This has the side effect of make considering every of those files
    out of date once a any other file is created in that directory.
    This means that when running make multiple times, those files will
    be recreated every time.
    To avoid that replace the OPTOBJ dependency with a
    order-only-dependency (behind '|'), only requesting the directory
    to be created but not causing the files to get outdated.

diff --git a/libfac/Makefile.in b/libfac/Makefile.in
index 3e026fe..5defa8f 100644
--- a/libfac/Makefile.in
+++ b/libfac/Makefile.in
@@ -85,40 +85,40 @@ all: OPTOBJ ${TARGETNAME} libsingfac_g.a
 OPTOBJ:
 	${MKINSTALLDIRS} OPTOBJ
 
-OPTOBJ/%.o: %.cc OPTOBJ
+OPTOBJ/%.o: %.cc | OPTOBJ
 	$(CXX) $(CXXFLAGS) $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
 
-OPTOBJ/%.o: charset/%.cc OPTOBJ
+OPTOBJ/%.o: charset/%.cc | OPTOBJ
 	$(CXX) $(CXXFLAGS) $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
 
-OPTOBJ/%.o: factor/%.cc OPTOBJ
+OPTOBJ/%.o: factor/%.cc | OPTOBJ
 	$(CXX) $(CXXFLAGS) $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
 
-OPTOBJ/tmpl_inst.o: factor/tmpl_inst.cc  OPTOBJ
+OPTOBJ/tmpl_inst.o: factor/tmpl_inst.cc  | OPTOBJ
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
 
-OPTOBJ/%.op: %.cc  OPTOBJ
+OPTOBJ/%.op: %.cc | OPTOBJ
 	$(CXX) -O -pg $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
 
-OPTOBJ/%.op: charset/%.cc  OPTOBJ
+OPTOBJ/%.op: charset/%.cc | OPTOBJ
 	$(CXX) -O -pg $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
 
-OPTOBJ/%.op: factor/%.cc OPTOBJ
+OPTOBJ/%.op: factor/%.cc | OPTOBJ
 	$(CXX) -O -pg $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
 
-OPTOBJ/tmpl_inst.op: factor/tmpl_inst.cc  OPTOBJ
+OPTOBJ/tmpl_inst.op: factor/tmpl_inst.cc | OPTOBJ
 	$(CXX) -O -pg $(CPPFLAGS) $(DEFS) -c $< -o $@
 
-OPTOBJ/%.og: %.cc  OPTOBJ
+OPTOBJ/%.og: %.cc | OPTOBJ
 	$(CXX) -g $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
 
-OPTOBJ/%.og: charset/%.cc  OPTOBJ
+OPTOBJ/%.og: charset/%.cc | OPTOBJ
 	$(CXX) -g $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
 
-OPTOBJ/%.og: factor/%.cc OPTOBJ
+OPTOBJ/%.og: factor/%.cc | OPTOBJ
 	$(CXX) -g $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
 
-OPTOBJ/tmpl_inst.og: factor/tmpl_inst.cc  OPTOBJ
+OPTOBJ/tmpl_inst.og: factor/tmpl_inst.cc | OPTOBJ
 	$(CXX) -g $(CPPFLAGS) $(DEFS) -c $< -o $@
 
 libfac:		OPTOBJ libfac.a

-- 
an open source computer algebra system



More information about the debian-science-commits mailing list