Skip to content

Commit 9ae42f2

Browse files
committed
Fix Makefile for parallel execution
1 parent 455adbe commit 9ae42f2

File tree

1 file changed

+15
-19
lines changed

1 file changed

+15
-19
lines changed

Makefile.in

+15-19
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
2-
# Makefile.in -- xxx
2+
# Makefile.in -- one file to make them all
33
#
4-
# Copyright (c) 2022-2023, NLnet Labs. All rights reserved.
4+
# Copyright (c) 2022-2024, NLnet Labs. All rights reserved.
55
#
66
# SPDX-License-Identifier: BSD-3-Clause
77
#
@@ -11,6 +11,7 @@ HASWELL = @HAVE_HASWELL@
1111
CC = @CC@
1212
CPPFLAGS = @CPPFLAGS@ -I./include -I./src -I.
1313
CFLAGS = @CFLAGS@
14+
DEPFLAGS = -MT $@ -MMD -MP -MF $(@:.o=.d)
1415

1516
SOURCES = src/zone.c src/fallback/parser.c
1617

@@ -27,7 +28,7 @@ EXPORT_HEADER = include/zone/export.h
2728

2829
.PHONY: all clean
2930

30-
all: libzone.a make.dep
31+
all: libzone.a
3132

3233
clean:
3334
@rm -f make.dep
@@ -45,26 +46,21 @@ realclean: distclean
4546
libzone.a: $(EXPORT_HEADER) $(OBJECTS) $($(WESTMERE)_OBJECTS) $($(HASWELL)_OBJECTS)
4647
$(AR) rcs libzone.a $(OBJECTS) $($(WESTMERE)_OBJECTS) $($(HASWELL)_OBJECTS)
4748

48-
DEPENDS = $(OBJECTS:.o=.d) \
49-
$($(WESTMERE)_OBJECTS:.o=.d) \
50-
$($(HASWELL)_OBJECTS:.o=.d)
51-
52-
%.d: %.c
53-
@touch $@
5449

5550
$(EXPORT_HEADER):
5651
@echo "#define ZONE_EXPORT" > include/zone/export.h
5752

58-
$(OBJECTS): $(SOURCES)
59-
$(CC) $(CPPFLAGS) $(CFLAGS) -MMD -o $@ -c $(@:.o=.c)
60-
61-
$(WESTMERE_OBJECTS): $(WESTMERE_SOURCES)
62-
$(CC) $(CPPFLAGS) $(CFLAGS) -march=westmere -MMD -o $@ -c $(@:.o=.c)
53+
$(OBJECTS): $(SOURCES) $(SOURCES:.c=.d)
54+
$(CC) $(DEPFLAGS) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
6355

64-
$(HASWELL_OBJECTS): $(HASWELL_SOURCES)
65-
$(CC) $(CPPFLAGS) $(CFLAGS) -march=haswell -MMD -o $@ -c $(@:.o=.c)
56+
$(WESTMERE_OBJECTS): $(WESTMERE_SOURCES) $(WESTMERE_SOURCES:.c=.d)
57+
$(CC) $(DEPFLAGS) $(CPPFLAGS) $(CFLAGS) -march=westmere -o $@ -c $<
6658

67-
make.dep: $(DEPENDS)
68-
@cat $(DEPENDS) > $@
59+
$(HASWELL_OBJECTS): $(HASWELL_SOURCES) $(HASWELL_SOURCES:.c=.d)
60+
$(CC) $(DEPFLAGS) $(CPPFLAGS) $(CFLAGS) -march=haswell -o $@ -c $<
6961

70-
-include make.dep
62+
DEPENDS := $(SOURCES:.c=.d) \
63+
$($(WESTMERE)_SOURCES:.c=.d) \
64+
$($(HASWELL)_SOURCES:.c=.d)
65+
$(DEPENDS):
66+
-include $(wildcard $(DEPENDS))

0 commit comments

Comments
 (0)