@@ -75,7 +75,7 @@ OBJDIR = obj
75
75
BINDIR = bin
76
76
77
77
# 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)
79
79
80
80
# Source Files (modules)
81
81
CROSS_SRC = $(wildcard $(SRCDIR ) /modules/cross-level/* .c)
@@ -84,9 +84,9 @@ HIGHER_SRC = $(wildcard $(SRCDIR)/modules/higher-level/*.c)
84
84
AUX_SRC = $(wildcard $(SRCDIR ) /modules/aux-level/* .c)
85
85
86
86
# 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)
90
90
91
91
# Source Files (test executables)
92
92
TEST_SRC = $(wildcard $(SRCDIR ) /tests/* .c)
@@ -98,9 +98,9 @@ HIGHER_OBJ = $(patsubst $(SRCDIR)/modules/higher-level/%.c, $(OBJDIR)/%.o, $(HIG
98
98
AUX_OBJ = $(patsubst $(SRCDIR ) /modules/aux-level/% .c, $(OBJDIR ) /% .o, $(AUX_SRC ) )
99
99
100
100
# 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 ) )
104
104
105
105
# Test executables
106
106
TEST_EXE = $(patsubst $(SRCDIR ) /tests/% .c, $(BINDIR ) /force-test/% , $(TEST_SRC ) )
@@ -123,8 +123,8 @@ dev: $(BINDIR)/force-stratified-sample # specific target for development
123
123
124
124
125
125
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) "
128
128
@echo " Object files: $( CROSS_OBJ) "
129
129
@echo " Compiler flags: $( CFLAGS) "
130
130
@@ -216,15 +216,15 @@ $(OBJDIR)/%.o: $(SRCDIR)/modules/aux-level/%.c
216
216
217
217
# Main executables
218
218
219
- $(BINDIR ) /% : $(SRCDIR ) /exe /aux-level/% .c $(CROSS_OBJ ) $(AUX_OBJ )
219
+ $(BINDIR ) /% : $(SRCDIR ) /main /aux-level/% .c $(CROSS_OBJ ) $(AUX_OBJ )
220
220
@echo " Compiling $<..."
221
221
$(CXX ) $(CFLAGS ) $(INCLUDES ) $(FLAGS ) -o $@ $^ $(LIBS )
222
222
223
- $(BINDIR ) /% : $(SRCDIR ) /exe /lower-level/% .c $(CROSS_OBJ ) $(LOWER_OBJ )
223
+ $(BINDIR ) /% : $(SRCDIR ) /main /lower-level/% .c $(CROSS_OBJ ) $(LOWER_OBJ )
224
224
@echo " Compiling $<..."
225
225
$(CXX ) $(CFLAGS ) $(INCLUDES ) $(FLAGS ) -o $@ $^ $(LIBS )
226
226
227
- # $(BINDIR)/%: $(SRCDIR)/exe /higher-level/%.c $(CROSS_OBJ) $(HIGHER_OBJ)
227
+ # $(BINDIR)/%: $(SRCDIR)/main /higher-level/%.c $(CROSS_OBJ) $(HIGHER_OBJ)
228
228
$(BINDIR ) /% : $(MAIN_HIGHER_EXE ) $(CROSS_OBJ ) $(HIGHER_OBJ )
229
229
@echo " Compiling $<..."
230
230
$(CXX ) $(CFLAGS ) $(INCLUDES ) $(FLAGS ) -o $@ $^ $(LIBS )
0 commit comments