commit 7c75e8888de4fbfa9633f2f6623cd248574c2a08
parent 6567c8b614319667393095049c5ebdfdc0f27757
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Mon, 8 Apr 2024 16:05:50 +0200
Rename libraries
Replace dashes (-) with underscores (_). There's no particular reason
not to use the same naming convention as the source file name.
Diffstat:
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
@@ -33,7 +33,7 @@ default: .config $(TESTS)
clean:
rm -f .config src/*.o src/*.d
rm -f ground.stl sphere.stl sshape.stl wall.stl probes.txt scene.txt
- rm -f libsadist-triprof.so libsadist-spherical-source.so $(TESTS)
+ rm -f libsadist_trilinear_profile.so libsadist_spherical_source.so $(TESTS)
test: $(TESTS)
@$(SHELL) make.sh check sadist_probe_boundary ./sadist_probe_boundary
@@ -49,14 +49,14 @@ src/sadist_lib_trilinear_profile.o:\
src/sadist_lib_trilinear_profile.c
$(CC) $(CFLAGS_SO) $(RSYS_CFLAGS) -c $(@:.o=.c) -o $@
-libsadist-triprof.so: src/sadist_lib_trilinear_profile.o
+libsadist_trilinear_profile.so: src/sadist_lib_trilinear_profile.o
$(CC) $(CFLAGS_SO) $(RSYS_CFLAGS) -o $@ src/sadist_lib_trilinear_profile.o \
$(LDFLAGS_SO) $(RSYS_LIBS)
src/sadist_lib_spherical_source.o: config.mk src/sadist_lib_spherical_source.c
$(CC) $(CFLAGS_SO) $(RSYS_CFLAGS) -c $(@:.o=.c) -o $@
-libsadist-spherical-source.so: config.mk src/sadist_lib_spherical_source.o
+libsadist_spherical_source.so: config.mk src/sadist_lib_spherical_source.o
$(CC) $(CFLAGS_SO) $(RSYS_CFLAGS) -o $@ src/sadist_lib_spherical_source.o \
$(LDFLAGS_SO) $(RSYS_LIBS)
@@ -69,7 +69,10 @@ src/sadist_probe_boundary.o:\
src/sadist_probe_boundary.c
$(CC) $(CFLAGS_EXE) $(S3DUT_CFLAGS) $(RSYS_CFLAGS) -c $(@:.o=.c) -o $@
-sadist_probe_boundary: config.mk src/sadist_probe_boundary.o libsadist-triprof.so
+sadist_probe_boundary:\
+ config.mk\
+ src/sadist_probe_boundary.o\
+ libsadist_trilinear_profile.so
$(CC) $(CFLAGS_EXE) $(S3DUT_CFLAGS) $(RSYS_CFLAGS) -o $@ src/$@.o \
$(LDFLAGS_EXE) $(S3DUT_LIBS) $(RSYS_LIBS) -lm
@@ -82,5 +85,5 @@ src/sadist_external_flux.o:\
sadist_external_flux:\
config.mk\
src/sadist_external_flux.o\
- libsadist-spherical-source.so
+ libsadist_spherical_source.so
$(CC) $(CFLAGS_EXE) -o $@ src/$@.o $(LDFLAGS_EXE) $(RSYS_LIBS) -lm
diff --git a/src/sadist_external_flux.c b/src/sadist_external_flux.c
@@ -139,7 +139,7 @@ setup_scene_prog(FILE* fp)
double pos[3];
ASSERT(fp);
- fprintf(fp, "PROGRAM source libsadist-spherical-source.so\n");
+ fprintf(fp, "PROGRAM source libsadist_spherical_source.so\n");
fprintf(fp, "SOLID ground 1.15 1700 800 5.0e-3 0 UNKNOWN 0 FRONT "
FILENAME_GROUND "\n");
fprintf(fp, "SOLID wall 1.15 1700 800 5.0e-3 0 UNKNOWN 0 FRONT "
diff --git a/src/sadist_probe_boundary.c b/src/sadist_probe_boundary.c
@@ -200,7 +200,7 @@ setup_scene
double low, upp;
ASSERT(sshape && sphere && aabb && profile);
- fprintf(fp, "PROGRAM trilinear_profile libsadist-triprof.so\n");
+ fprintf(fp, "PROGRAM trilinear_profile libsadist_trilinear_profile.so\n");
fprintf(fp, "SOLID SuperShape 25 7500 500 0.05 0 UNKNOWN 0 BACK %s FRONT %s\n",
sshape, sphere);
fprintf(fp, "SOLID Sphere 25 7500 500 0.05 0 UNKNOWN 0 BACK %s\n", sphere);