Skip to content

Commit 7dc0706

Browse files
committed
rename exe -> main
1 parent 2710b2d commit 7dc0706

18 files changed

+13
-13
lines changed

Makefile

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ OBJDIR = obj
7575
BINDIR = bin
7676

7777
# Create necessary directories
78-
$(shell mkdir -p $(OBJDIR) $(BINDIR)/force-test $(BINDIR)/force-misc)
78+
$(shell mkdir -p $(OBJDIR) $(BINDIR) $(BINDIR)/force-test $(BINDIR)/force-misc)
7979

8080
# Source Files (modules)
8181
CROSS_SRC = $(wildcard $(SRCDIR)/modules/cross-level/*.c)
@@ -84,9 +84,9 @@ HIGHER_SRC = $(wildcard $(SRCDIR)/modules/higher-level/*.c)
8484
AUX_SRC = $(wildcard $(SRCDIR)/modules/aux-level/*.c)
8585

8686
# Source Files (main executables)
87-
MAIN_AUX_SRC = $(wildcard $(SRCDIR)/exe/aux-level/*.c)
88-
MAIN_LOWER_SRC = $(wildcard $(SRCDIR)/exe/lower-level/*.c)
89-
MAIN_HIGHER_SRC = $(wildcard $(SRCDIR)/exe/higher-level/*.c)
87+
MAIN_AUX_SRC = $(wildcard $(SRCDIR)/main/aux-level/*.c)
88+
MAIN_LOWER_SRC = $(wildcard $(SRCDIR)/main/lower-level/*.c)
89+
MAIN_HIGHER_SRC = $(wildcard $(SRCDIR)/main/higher-level/*.c)
9090

9191
# Source Files (test executables)
9292
TEST_SRC = $(wildcard $(SRCDIR)/tests/*.c)
@@ -98,9 +98,9 @@ HIGHER_OBJ = $(patsubst $(SRCDIR)/modules/higher-level/%.c, $(OBJDIR)/%.o, $(HIG
9898
AUX_OBJ = $(patsubst $(SRCDIR)/modules/aux-level/%.c, $(OBJDIR)/%.o, $(AUX_SRC))
9999

100100
# Main executables
101-
MAIN_AUX_EXE = $(patsubst $(SRCDIR)/exe/aux-level/%.c, $(BINDIR)/%, $(MAIN_AUX_SRC))
102-
MAIN_LOWER_EXE = $(patsubst $(SRCDIR)/exe/lower-level/%.c, $(BINDIR)/%, $(MAIN_LOWER_SRC))
103-
MAIN_HIGHER_EXE = $(patsubst $(SRCDIR)/exe/higher-level/%.c, $(BINDIR)/%, $(MAIN_HIGHER_SRC))
101+
MAIN_AUX_EXE = $(patsubst $(SRCDIR)/main/aux-level/%.c, $(BINDIR)/%, $(MAIN_AUX_SRC))
102+
MAIN_LOWER_EXE = $(patsubst $(SRCDIR)/main/lower-level/%.c, $(BINDIR)/%, $(MAIN_LOWER_SRC))
103+
MAIN_HIGHER_EXE = $(patsubst $(SRCDIR)/main/higher-level/%.c, $(BINDIR)/%, $(MAIN_HIGHER_SRC))
104104

105105
# Test executables
106106
TEST_EXE = $(patsubst $(SRCDIR)/tests/%.c, $(BINDIR)/force-test/%, $(TEST_SRC))
@@ -123,8 +123,8 @@ dev: $(BINDIR)/force-stratified-sample # specific target for development
123123

124124

125125
print-vars:
126-
@echo "exe source files: $(TEST_SRC)"
127-
@echo "exe program files: $(TEST_EXE)"
126+
@echo "main source files: $(TEST_SRC)"
127+
@echo "main program files: $(TEST_EXE)"
128128
@echo "Object files: $(CROSS_OBJ)"
129129
@echo "Compiler flags: $(CFLAGS)"
130130

@@ -216,15 +216,15 @@ $(OBJDIR)/%.o: $(SRCDIR)/modules/aux-level/%.c
216216

217217
# Main executables
218218

219-
$(BINDIR)/%: $(SRCDIR)/exe/aux-level/%.c $(CROSS_OBJ) $(AUX_OBJ)
219+
$(BINDIR)/%: $(SRCDIR)/main/aux-level/%.c $(CROSS_OBJ) $(AUX_OBJ)
220220
@echo "Compiling $<..."
221221
$(CXX) $(CFLAGS) $(INCLUDES) $(FLAGS) -o $@ $^ $(LIBS)
222222

223-
$(BINDIR)/%: $(SRCDIR)/exe/lower-level/%.c $(CROSS_OBJ) $(LOWER_OBJ)
223+
$(BINDIR)/%: $(SRCDIR)/main/lower-level/%.c $(CROSS_OBJ) $(LOWER_OBJ)
224224
@echo "Compiling $<..."
225225
$(CXX) $(CFLAGS) $(INCLUDES) $(FLAGS) -o $@ $^ $(LIBS)
226226

227-
#$(BINDIR)/%: $(SRCDIR)/exe/higher-level/%.c $(CROSS_OBJ) $(HIGHER_OBJ)
227+
#$(BINDIR)/%: $(SRCDIR)/main/higher-level/%.c $(CROSS_OBJ) $(HIGHER_OBJ)
228228
$(BINDIR)/%: $(MAIN_HIGHER_EXE) $(CROSS_OBJ) $(HIGHER_OBJ)
229229
@echo "Compiling $<..."
230230
$(CXX) $(CFLAGS) $(INCLUDES) $(FLAGS) -o $@ $^ $(LIBS)

misc/force-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.7.12-dev:::2024-09-04_06:16:05
1+
3.7.12-dev:::2024-10-24_07:32:25
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)