Skip to content

Commit 97dbcd3

Browse files
committed
Makefile fixups
Fixes a few goofs left over from 6f51ba0. Namely, the missing 'generated' directory, and some targets that are no longer needed.
1 parent a040c31 commit 97dbcd3

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ BINDIR=bin
99

1010
all: $(BINDIR)/$(BIN)
1111

12-
SRCS=$(shell find src/lib src/driver src/common generated/ -name '*.c') generated/gitsha1.c
12+
SRCS=$(shell find src/lib src/driver src/common -name '*.c') generated/gitsha1.c
1313
OBJS=$(SRCS:%.c=$(BINDIR)/%.o)
1414
DEPS=$(OBJS:%.o=%.d)
1515

cosmo.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ $(OBJDIR_cosmo)/%.o: %.c $(OBJDIR_cosmo)
99
@mkdir -p '$(@D)'
1010
@echo "cosmocc $<"
1111
@$(CC_cosmo) $(CFLAGS) -c $< -o $@
12-
$(OBJDIR_cosmo): dummy
12+
$(OBJDIR_cosmo):
1313
mkdir -p $@
1414
$(BIN_cosmo): $(OBJS_cosmo) $(OBJDIR_cosmo)
1515
@echo "LD $@"

generated/.keep

Whitespace-only changes.

lib.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LIB=lib/libc-ray.so
55
BIN_lib=lib/c-ray
66
OBJDIR_lib=lib/obj_lib
77
OBJDIR_driver=lib/obj_driver
8-
SRCS_lib=$(shell find src/lib src/common generated/ -name '*.c')
8+
SRCS_lib=$(shell find src/lib src/common -name '*.c') generated/gitsha1.c
99
OBJS_lib=$(patsubst %.c, $(OBJDIR_lib)/%.o, $(SRCS_lib))
1010
SRCS_driver=$(shell find src/driver src/common -name '*.c')
1111
OBJS_driver=$(patsubst %.c, $(OBJDIR_driver)/%.o, $(SRCS_driver))
@@ -45,7 +45,7 @@ $(OBJDIR_lib)/%.o: %.c $(OBJDIR_lib)
4545
@mkdir -p '$(@D)'
4646
@echo "CC -fPIC $<"
4747
@$(CC) -DCR_BUILDING_LIB $(CFLAGS) -fvisibility=hidden -c -fPIC $< -o $@
48-
$(OBJDIR_lib): dummy
48+
$(OBJDIR_lib):
4949
mkdir -p $@
5050
$(OBJDIR_driver):
5151
mkdir -p $@

tests/test.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BIN_test=tests/testrunner
22
OBJDIR_test=tests/obj
3-
SRCS_test=$(shell find src/lib src/driver src/common generated/ tests/ -name '*.c' -not -name 'main.c')
3+
SRCS_test=$(shell find src/lib src/driver src/common tests/ -name '*.c' -not -name 'main.c')
44
TEST_HDRS=$(shell find tests/ -name '*.h')
55
OBJS_test=$(patsubst %.c, $(OBJDIR_test)/%.o, $(SRCS_test))
66
# suite=vector

0 commit comments

Comments
 (0)