Skip to content

Commit 6ca64fa

Browse files
author
Patrick Farrell
committed
In the previous change to the build process, I remarked that deleting libfluidity.a
by itself was a bad idea. Well, it turns out we had it configured so that if any file failed to build, it deleted libfluidity.a, thus making the next build fail confusingly. This commit turns off that deletion of libfluidity.a, so people can make mistakes to their heart's content.
1 parent 3d435aa commit 6ca64fa

23 files changed

Lines changed: 86 additions & 86 deletions

File tree

‎adjoint/Makefile.in‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,16 @@ OBJS = $(patsubst %.F90,%.o,$(wildcard *.F90)) $(patsubst %.c,%.o,$(wildcard
4949

5050
.f90.o:
5151
@echo " FC $<"
52-
$(FC) $(FCFLAGS) -c $< || (rm $(LIB) && false)
52+
$(FC) $(FCFLAGS) -c $<
5353
.F90.o:
5454
@echo " FC $<"
55-
$(FC) $(FCFLAGS) -c $< || (rm $(LIB) && false)
55+
$(FC) $(FCFLAGS) -c $<
5656
.c.o:
5757
@echo " CC $<"
58-
$(CC) $(CFLAGS) -c $< || (rm $(LIB) && false)
58+
$(CC) $(CFLAGS) -c $<
5959
.cpp.o:
6060
@echo " CXX $<"
61-
$(CXX) $(CXXFLAGS) -c $< || (rm $(LIB) && false)
61+
$(CXX) $(CXXFLAGS) -c $<
6262

6363
$(LIB): $(OBJS)
6464
@mkdir -p ../lib

‎assemble/Makefile.in‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,16 +80,16 @@ OBJS = Momentum_Diagnostic_Fields.o \
8080

8181
.f90.o:
8282
@echo " FC $<"
83-
$(FC) $(FCFLAGS) -c $< || (rm $(LIB) && false)
83+
$(FC) $(FCFLAGS) -c $<
8484
.F90.o:
8585
@echo " FC $<"
86-
$(FC) $(FCFLAGS) -c $< || (rm $(LIB) && false)
86+
$(FC) $(FCFLAGS) -c $<
8787
.c.o:
8888
@echo " CC $<"
89-
$(CC) $(CFLAGS) -c $< || (rm $(LIB) && false)
89+
$(CC) $(CFLAGS) -c $<
9090
.cpp.o:
9191
@echo " CXX $<"
92-
$(CXX) $(CXXFLAGS) -c $< || (rm $(LIB) && false)
92+
$(CXX) $(CXXFLAGS) -c $<
9393

9494
$(LIB): $(OBJS)
9595
@mkdir -p ../lib

‎bathymetry/Makefile.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ OBJS = NetCDF_reader.o SampleNetCDF2.o import_bath_data.o read_netcdf_interface.
5656

5757
.F90.o:
5858
@echo " FC $<"
59-
$(FC) $(FCFLAGS) -c $< || (rm $(LIB) && false)
59+
$(FC) $(FCFLAGS) -c $<
6060
.c.o:
6161
@echo " CC $<"
62-
$(CC) $(CFLAGS) -c $< || (rm $(LIB) && false)
62+
$(CC) $(CFLAGS) -c $<
6363
.cpp.o:
6464
@echo " CXX $<"
65-
$(CXX) $(CXXFLAGS) -c $< || (rm $(LIB) && false)
65+
$(CXX) $(CXXFLAGS) -c $<
6666

6767
$(LIB): $(OBJS)
6868
@mkdir -p ../lib

‎debug/Makefile.in‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,16 @@ OBJS = C++_Debug.o Debug.o Debug_Parameters.o Diagnostic_Output.o
5454

5555
.f90.o:
5656
@echo " FC $<"
57-
$(FC) $(FCFLAGS) -c $< || (rm $(LIB) && false)
57+
$(FC) $(FCFLAGS) -c $<
5858
.F90.o:
5959
@echo " FC $<"
60-
$(FC) $(FCFLAGS) -c $< || (rm $(LIB) && false)
60+
$(FC) $(FCFLAGS) -c $<
6161
.c.o:
6262
@echo " CC $<"
63-
$(CC) $(CFLAGS) -c $< || (rm $(LIB) && false)
63+
$(CC) $(CFLAGS) -c $<
6464
.cpp.o:
6565
@echo " CXX $<"
66-
$(CXX) $(CXXFLAGS) -c $< || (rm $(LIB) && false)
66+
$(CXX) $(CXXFLAGS) -c $<
6767

6868
$(LIB): $(OBJS)
6969
@mkdir -p ../lib

‎decomp/Makefile.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ OBJS = partition.o
4949

5050
.f90.o:
5151
@echo " FC $<"
52-
$(FC) $(FCFLAGS) -c $< || (rm $(LIB) && false)
52+
$(FC) $(FCFLAGS) -c $<
5353
.F90.o:
5454
@echo " FC $<"
55-
$(FC) $(FCFLAGS) -c $< || (rm $(LIB) && false)
55+
$(FC) $(FCFLAGS) -c $<
5656
.cpp.o:
5757
@echo " CXX $<"
58-
$(CXX) $(CXXFLAGS) -c $< || (rm $(LIB) && false)
58+
$(CXX) $(CXXFLAGS) -c $<
5959

6060
$(LIB): $(OBJS)
6161
@mkdir -p ../lib

‎diagnostics/Makefile.in‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,16 @@ OBJS = $(AUTO_WRAPPER).o $(DIAGOBJS) Diagnostic_Source_Fields.o Diagnostic_Fiel
5353

5454
.f90.o:
5555
@echo " FC $<"
56-
$(FC) $(FCFLAGS) -c $< || (rm $(LIB) && false)
56+
$(FC) $(FCFLAGS) -c $<
5757
.F90.o:
5858
@echo " FC $<"
59-
$(FC) $(FCFLAGS) -c $< || (rm $(LIB) && false)
59+
$(FC) $(FCFLAGS) -c $<
6060
.c.o:
6161
@echo " CC $<"
62-
$(CC) $(CFLAGS) -c $< || (rm $(LIB) && false)
62+
$(CC) $(CFLAGS) -c $<
6363
.cpp.o:
6464
@echo " CXX $<"
65-
$(CXX) $(CXXFLAGS) -c $< || (rm $(LIB) && false)
65+
$(CXX) $(CXXFLAGS) -c $<
6666

6767
$(LIB): $(OBJS)
6868
@mkdir -p ../lib

‎error_measures/Makefile.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ OBJS = Form_metric.o Assemble_metric.o Interpolation_metric.o Edge_lengths.o \
5858

5959
.f90.o:
6060
@echo " FC $<"
61-
$(FC) $(FCFLAGS) -c $< || (rm $(LIB) && false)
61+
$(FC) $(FCFLAGS) -c $<
6262
.F90.o:
6363
@echo " FC $<"
64-
$(FC) $(FCFLAGS) -c $< || (rm $(LIB) && false)
64+
$(FC) $(FCFLAGS) -c $<
6565
.cpp.o:
6666
@echo " CXX $<"
67-
$(CXX) $(CXXFLAGS) -I../include -c $< || (rm $(LIB) && false)
67+
$(CXX) $(CXXFLAGS) -I../include -c $<
6868

6969
$(LIB): $(OBJS)
7070
@mkdir -p ../lib

‎femtools/Makefile.in‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,19 +114,19 @@ endif
114114

115115
.f90.o:
116116
@echo " FC $<"
117-
$(FC) $(FCFLAGS) -c $< || (rm $(LIB) && false)
117+
$(FC) $(FCFLAGS) -c $<
118118
.F.o:
119119
@echo " FC $<"
120-
$(FC) $(FCFLAGS) -c $< || (rm $(LIB) && false)
120+
$(FC) $(FCFLAGS) -c $<
121121
.F90.o:
122122
@echo " FC $<"
123-
$(FC) $(FCFLAGS) -c $< || (rm $(LIB) && false)
123+
$(FC) $(FCFLAGS) -c $<
124124
.c.o:
125125
@echo " CC $<"
126-
$(CC) $(CFLAGS) -c $< || (rm $(LIB) && false)
126+
$(CC) $(CFLAGS) -c $<
127127
.cpp.o:
128128
@echo " CXX $<"
129-
$(CXX) $(CXXFLAGS) -c $< || (rm $(LIB) && false)
129+
$(CXX) $(CXXFLAGS) -c $<
130130

131131
$(LIB): $(OBJS)
132132
@mkdir -p ../lib
@@ -158,7 +158,7 @@ Conservative_interpolation.o: Conservative_interpolation.F90 Fields.o Superconve
158158
Solvers.o Interpolation.o Adjacency_Lists.o Unittest_tools.o qsortd.o Tensors.o Intersection_finder.o \
159159
Sparse_Matrices_Fields.o Bound_field.o Diagnostic_Fields.o Tetrahedron_intersection.o
160160
@echo " FC $<"
161-
$(FC) $(FCFLAGS) $(UNROLL_LOOPS) -c $< || (rm $(LIB) && false)
161+
$(FC) $(FCFLAGS) $(UNROLL_LOOPS) -c $<
162162

163163
Supermesh.o: Fields_Base.o Fields_Allocates.o Fields_Data_Types.o Sparse_Tools.o Futils.o \
164164
Metric_tools.o Linked_Lists.o Unify_meshes.o Transform_elements.o \
@@ -319,7 +319,7 @@ Futils.o: Global_Parameters.o
319319

320320
FETools.o: FETools.F90 Elements.o Transform_elements.o Sparse_Tools.o
321321
@echo " FC $<"
322-
$(FC) $(FCFLAGS) $(UNROLL_LOOPS) -c $< || (rm $(LIB) && false)
322+
$(FC) $(FCFLAGS) $(UNROLL_LOOPS) -c $<
323323

324324
FEFields.o: Fields.o Elements.o FETools.o Transform_elements.o Field_Options.o
325325

‎fldecomp/Makefile.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ FLDECOMP = ../bin/fldecomp
5656

5757
.f90.o:
5858
@echo " FC $<"
59-
$(FC) $(FCFLAGS) -c $< || (rm $(LIB) && false)
59+
$(FC) $(FCFLAGS) -c $<
6060
.F90.o:
6161
@echo " FC $<"
62-
$(FC) $(FCFLAGS) -c $< || (rm $(LIB) && false)
62+
$(FC) $(FCFLAGS) -c $<
6363
.cpp.o:
6464
@echo " CXX $<"
65-
$(CXX) $(CXXFLAGS) -c $< || (rm $(LIB) && false)
65+
$(CXX) $(CXXFLAGS) -c $<
6666

6767
fldecomp: $(LIB) $(OBJS)
6868
@$(EVAL) $(LINKER) @OPENMP_CXXFLAGS@ -o $(FLDECOMP) -I../include/ \

‎forward_interfaces/Makefile.in‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,16 @@ OBJS = Diagnostic_Fields_Wrapper_New.o
5050

5151
.f90.o:
5252
@echo " FC $<"
53-
$(FC) $(FCFLAGS) -c $< || (rm $(LIB) && false)
53+
$(FC) $(FCFLAGS) -c $<
5454
.F90.o:
5555
@echo " FC $<"
56-
$(FC) $(FCFLAGS) -c $< || (rm $(LIB) && false)
56+
$(FC) $(FCFLAGS) -c $<
5757
.c.o:
5858
@echo " CC $<"
59-
$(CC) $(CFLAGS) -c $< || (rm $(LIB) && false)
59+
$(CC) $(CFLAGS) -c $<
6060
.cpp.o:
6161
@echo " CXX $<"
62-
$(CXX) $(CXXFLAGS) -c $< || (rm $(LIB) && false)
62+
$(CXX) $(CXXFLAGS) -c $<
6363

6464
$(LIB): $(OBJS)
6565
@mkdir -p ../lib

0 commit comments

Comments
 (0)