Loading Makefile.in +25 −19 Original line number Original line Diff line number Diff line Loading @@ -65,7 +65,8 @@ endif docgoals := docs userdocs progdocs docgoals := docs userdocs progdocs testgoals := check test tests tests_run testgoals := check test tests tests_run cleangoals := clean distclean testsclean cleangoals := clean distclean testsclean .PHONY: all daemon cli $(docgoals) $(testgoals) $(cleangoals) tags cscope .PHONY: all daemon cli $(docgoals) $(testgoals) $(cleangoals) tags cscope prepare all: daemon cli all: daemon cli daemon: $(daemon) daemon: $(daemon) Loading Loading @@ -103,35 +104,50 @@ include $(addsuffix /Makefile,$(addprefix $(srcdir)/,$(dirs))) # Generic rules # Generic rules # Object file rules # Object file rules $(objdir)/%.o: $(srcdir)/%.c $(objdir)/.dir-stamp $(objdir)/sysdep/paths.h $(objdir)/%.o: $(srcdir)/%.c | prepare $(E)echo CC -o $@ -c $< $(E)echo CC -o $@ -c $< $(Q)$(CC) $(CFLAGS) -MMD -MP -o $@ -c $< $(Q)$(CC) $(CFLAGS) -MMD -MP -o $@ -c $< $(objdir)/%.o: $(objdir)/%.c $(objdir)/.dir-stamp $(objdir)/sysdep/paths.h $(objdir)/%.o: $(objdir)/%.c | prepare $(E)echo CC -o $@ -c $< $(E)echo CC -o $@ -c $< $(Q)$(CC) $(CFLAGS) -MMD -MP -o $@ -c $< $(Q)$(CC) $(CFLAGS) -MMD -MP -o $@ -c $< # Debug: Preprocessed source rules # Debug: Preprocessed source rules $(objdir)/%.E: $(srcdir)/%.c $(objdir)/.dir-stamp $(objdir)/sysdep/paths.h $(objdir)/%.E: $(srcdir)/%.c | prepare $(E)echo CC -o $@ -E $< $(E)echo CC -o $@ -E $< $(Q)$(CC) $(CFLAGS) -MMD -MP -o $@ -E $< $(Q)$(CC) $(CFLAGS) -MMD -MP -o $@ -E $< $(objdir)/%.E: $(objdir)/%.c $(objdir)/.dir-stamp $(objdir)/sysdep/paths.h $(objdir)/%.E: $(objdir)/%.c | prepare $(E)echo CC -o $@ -E $< $(E)echo CC -o $@ -E $< $(Q)$(CC) $(CFLAGS) -MMD -MP -o $@ -E $< $(Q)$(CC) $(CFLAGS) -MMD -MP -o $@ -E $< # Debug: Assembler object rules # Debug: Assembler object rules $(objdir)/%.S: $(srcdir)/%.c $(objdir)/.dir-stamp $(objdir)/sysdep/paths.h $(objdir)/%.S: $(srcdir)/%.c | prepare $(E)echo CC -o $@ -S $< $(E)echo CC -o $@ -S $< $(Q)$(CC) $(CFLAGS) -MMD -MP -o $@ -S $< $(Q)$(CC) $(CFLAGS) -MMD -MP -o $@ -S $< $(objdir)/%.S: $(objdir)/%.c $(objdir)/.dir-stamp $(objdir)/sysdep/paths.h $(objdir)/%.S: $(objdir)/%.c | prepare $(E)echo CC -o $@ -S $< $(E)echo CC -o $@ -S $< $(Q)$(CC) $(CFLAGS) -MMD -MP -o $@ -S $< $(Q)$(CC) $(CFLAGS) -MMD -MP -o $@ -S $< # Finally include the computed dependencies: DEPS = $(shell find $(objdir) -name '*.d') # ## if there is at least one non-clean goal ifneq ($(filter-out $(cleangoals),$(MAKECMDGOALS)),) -include $(DEPS) endif # ## if the implicit goal is called ifeq ($(MAKECMDGOALS),) -include $(DEPS) endif # Rule for pre-generating all generated includables # before compiling any C file prepare: $(objdir)/sysdep/paths.h | $(objdir)/.dir-stamp $(objdir)/.dir-stamp: $(objdir)/.dir-stamp: Makefile $(E)echo MKDIR -p $(addprefix $(objdir)/,$(dirs) doc) $(E)echo MKDIR -p $(addprefix $(objdir)/,$(dirs) doc) $(Q)mkdir -p $(addprefix $(objdir)/,$(dirs) doc) $(Q)mkdir -p $(addprefix $(objdir)/,$(dirs) doc) $(Q)touch $@ $(Q)touch $@ Loading @@ -150,7 +166,7 @@ $(objdir)/sysdep/paths.h: Makefile tests_targets_ok = $(addsuffix .ok,$(tests_targets)) tests_targets_ok = $(addsuffix .ok,$(tests_targets)) $(tests_targets): %: %.o $(tests_objs) $(tests_targets): %: %.o $(tests_objs) | prepare $(E)echo LD $(LDFLAGS) -o $@ $< "..." $(LIBS) $(E)echo LD $(LDFLAGS) -o $@ $< "..." $(LIBS) $(Q)$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(Q)$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) Loading @@ -165,16 +181,6 @@ check: tests tests_run tests: $(tests_targets) tests: $(tests_targets) tests_run: $(tests_targets_ok) tests_run: $(tests_targets_ok) # Finally include the computed dependencies ifneq ($(filter-out $(cleangoals),$(MAKECMDGOALS)),) -include $(shell find $(objdir) -name "*.d") endif ifeq ($(MAKECMDGOALS),) -include $(shell find $(objdir) -name "*.d") endif tags: tags: cd $(srcdir) ; etags -lc `find $(dirs) -name *.[chY]` cd $(srcdir) ; etags -lc `find $(dirs) -name *.[chY]` Loading client/Makefile +0 −2 Original line number Original line Diff line number Diff line Loading @@ -3,8 +3,6 @@ obj := $(src-o-files) $(all-client) $(all-client) $(o)commands.o: $(objdir)/conf/commands.h $(exedir)/birdc: $(o)birdc.o $(exedir)/birdc: $(o)birdc.o $(exedir)/birdc: LIBS += $(CLIENT_LIBS) $(exedir)/birdc: LIBS += $(CLIENT_LIBS) Loading conf/Makefile +2 −1 Original line number Original line Diff line number Diff line Loading @@ -25,9 +25,10 @@ $(o)cf-parse.tab.c: $(o)cf-parse.y $(o)cf-lex.c: $(s)cf-lex.l $(o)cf-lex.c: $(s)cf-lex.l $(FLEX) $(FLEX_DEBUG) -f -s -B -8 -Pcf_ -o$@ $< $(FLEX) $(FLEX_DEBUG) -f -s -B -8 -Pcf_ -o$@ $< $(o)cf-lex.o: $(o)cf-parse.tab.h $(o)keywords.h $(o)cf-lex.o: CFLAGS+=-Wno-sign-compare -Wno-unused-function $(o)cf-lex.o: CFLAGS+=-Wno-sign-compare -Wno-unused-function prepare: $(o)keywords.h $(o)commands.h $(o)cf-parse.tab.h $(addprefix $(o), cf-parse.y keywords.h commands.h cf-parse.tab.h cf-parse.tab.c cf-lex.c): $(objdir)/.dir-stamp $(addprefix $(o), cf-parse.y keywords.h commands.h cf-parse.tab.h cf-parse.tab.c cf-lex.c): $(objdir)/.dir-stamp $(call clean,cf-parse.tab.h cf-parse.tab.c cf-parse.y keywords.h commands.h cf-lex.c cf-parse.output) $(call clean,cf-parse.tab.h cf-parse.tab.c cf-parse.y keywords.h commands.h cf-lex.c cf-parse.output) Loading
Makefile.in +25 −19 Original line number Original line Diff line number Diff line Loading @@ -65,7 +65,8 @@ endif docgoals := docs userdocs progdocs docgoals := docs userdocs progdocs testgoals := check test tests tests_run testgoals := check test tests tests_run cleangoals := clean distclean testsclean cleangoals := clean distclean testsclean .PHONY: all daemon cli $(docgoals) $(testgoals) $(cleangoals) tags cscope .PHONY: all daemon cli $(docgoals) $(testgoals) $(cleangoals) tags cscope prepare all: daemon cli all: daemon cli daemon: $(daemon) daemon: $(daemon) Loading Loading @@ -103,35 +104,50 @@ include $(addsuffix /Makefile,$(addprefix $(srcdir)/,$(dirs))) # Generic rules # Generic rules # Object file rules # Object file rules $(objdir)/%.o: $(srcdir)/%.c $(objdir)/.dir-stamp $(objdir)/sysdep/paths.h $(objdir)/%.o: $(srcdir)/%.c | prepare $(E)echo CC -o $@ -c $< $(E)echo CC -o $@ -c $< $(Q)$(CC) $(CFLAGS) -MMD -MP -o $@ -c $< $(Q)$(CC) $(CFLAGS) -MMD -MP -o $@ -c $< $(objdir)/%.o: $(objdir)/%.c $(objdir)/.dir-stamp $(objdir)/sysdep/paths.h $(objdir)/%.o: $(objdir)/%.c | prepare $(E)echo CC -o $@ -c $< $(E)echo CC -o $@ -c $< $(Q)$(CC) $(CFLAGS) -MMD -MP -o $@ -c $< $(Q)$(CC) $(CFLAGS) -MMD -MP -o $@ -c $< # Debug: Preprocessed source rules # Debug: Preprocessed source rules $(objdir)/%.E: $(srcdir)/%.c $(objdir)/.dir-stamp $(objdir)/sysdep/paths.h $(objdir)/%.E: $(srcdir)/%.c | prepare $(E)echo CC -o $@ -E $< $(E)echo CC -o $@ -E $< $(Q)$(CC) $(CFLAGS) -MMD -MP -o $@ -E $< $(Q)$(CC) $(CFLAGS) -MMD -MP -o $@ -E $< $(objdir)/%.E: $(objdir)/%.c $(objdir)/.dir-stamp $(objdir)/sysdep/paths.h $(objdir)/%.E: $(objdir)/%.c | prepare $(E)echo CC -o $@ -E $< $(E)echo CC -o $@ -E $< $(Q)$(CC) $(CFLAGS) -MMD -MP -o $@ -E $< $(Q)$(CC) $(CFLAGS) -MMD -MP -o $@ -E $< # Debug: Assembler object rules # Debug: Assembler object rules $(objdir)/%.S: $(srcdir)/%.c $(objdir)/.dir-stamp $(objdir)/sysdep/paths.h $(objdir)/%.S: $(srcdir)/%.c | prepare $(E)echo CC -o $@ -S $< $(E)echo CC -o $@ -S $< $(Q)$(CC) $(CFLAGS) -MMD -MP -o $@ -S $< $(Q)$(CC) $(CFLAGS) -MMD -MP -o $@ -S $< $(objdir)/%.S: $(objdir)/%.c $(objdir)/.dir-stamp $(objdir)/sysdep/paths.h $(objdir)/%.S: $(objdir)/%.c | prepare $(E)echo CC -o $@ -S $< $(E)echo CC -o $@ -S $< $(Q)$(CC) $(CFLAGS) -MMD -MP -o $@ -S $< $(Q)$(CC) $(CFLAGS) -MMD -MP -o $@ -S $< # Finally include the computed dependencies: DEPS = $(shell find $(objdir) -name '*.d') # ## if there is at least one non-clean goal ifneq ($(filter-out $(cleangoals),$(MAKECMDGOALS)),) -include $(DEPS) endif # ## if the implicit goal is called ifeq ($(MAKECMDGOALS),) -include $(DEPS) endif # Rule for pre-generating all generated includables # before compiling any C file prepare: $(objdir)/sysdep/paths.h | $(objdir)/.dir-stamp $(objdir)/.dir-stamp: $(objdir)/.dir-stamp: Makefile $(E)echo MKDIR -p $(addprefix $(objdir)/,$(dirs) doc) $(E)echo MKDIR -p $(addprefix $(objdir)/,$(dirs) doc) $(Q)mkdir -p $(addprefix $(objdir)/,$(dirs) doc) $(Q)mkdir -p $(addprefix $(objdir)/,$(dirs) doc) $(Q)touch $@ $(Q)touch $@ Loading @@ -150,7 +166,7 @@ $(objdir)/sysdep/paths.h: Makefile tests_targets_ok = $(addsuffix .ok,$(tests_targets)) tests_targets_ok = $(addsuffix .ok,$(tests_targets)) $(tests_targets): %: %.o $(tests_objs) $(tests_targets): %: %.o $(tests_objs) | prepare $(E)echo LD $(LDFLAGS) -o $@ $< "..." $(LIBS) $(E)echo LD $(LDFLAGS) -o $@ $< "..." $(LIBS) $(Q)$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(Q)$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) Loading @@ -165,16 +181,6 @@ check: tests tests_run tests: $(tests_targets) tests: $(tests_targets) tests_run: $(tests_targets_ok) tests_run: $(tests_targets_ok) # Finally include the computed dependencies ifneq ($(filter-out $(cleangoals),$(MAKECMDGOALS)),) -include $(shell find $(objdir) -name "*.d") endif ifeq ($(MAKECMDGOALS),) -include $(shell find $(objdir) -name "*.d") endif tags: tags: cd $(srcdir) ; etags -lc `find $(dirs) -name *.[chY]` cd $(srcdir) ; etags -lc `find $(dirs) -name *.[chY]` Loading
client/Makefile +0 −2 Original line number Original line Diff line number Diff line Loading @@ -3,8 +3,6 @@ obj := $(src-o-files) $(all-client) $(all-client) $(o)commands.o: $(objdir)/conf/commands.h $(exedir)/birdc: $(o)birdc.o $(exedir)/birdc: $(o)birdc.o $(exedir)/birdc: LIBS += $(CLIENT_LIBS) $(exedir)/birdc: LIBS += $(CLIENT_LIBS) Loading
conf/Makefile +2 −1 Original line number Original line Diff line number Diff line Loading @@ -25,9 +25,10 @@ $(o)cf-parse.tab.c: $(o)cf-parse.y $(o)cf-lex.c: $(s)cf-lex.l $(o)cf-lex.c: $(s)cf-lex.l $(FLEX) $(FLEX_DEBUG) -f -s -B -8 -Pcf_ -o$@ $< $(FLEX) $(FLEX_DEBUG) -f -s -B -8 -Pcf_ -o$@ $< $(o)cf-lex.o: $(o)cf-parse.tab.h $(o)keywords.h $(o)cf-lex.o: CFLAGS+=-Wno-sign-compare -Wno-unused-function $(o)cf-lex.o: CFLAGS+=-Wno-sign-compare -Wno-unused-function prepare: $(o)keywords.h $(o)commands.h $(o)cf-parse.tab.h $(addprefix $(o), cf-parse.y keywords.h commands.h cf-parse.tab.h cf-parse.tab.c cf-lex.c): $(objdir)/.dir-stamp $(addprefix $(o), cf-parse.y keywords.h commands.h cf-parse.tab.h cf-parse.tab.c cf-lex.c): $(objdir)/.dir-stamp $(call clean,cf-parse.tab.h cf-parse.tab.c cf-parse.y keywords.h commands.h cf-lex.c cf-parse.output) $(call clean,cf-parse.tab.h cf-parse.tab.c cf-parse.y keywords.h commands.h cf-lex.c cf-parse.output)
