diff options
| author | Kaz Kylheku <kaz@kylheku.com> | 2014-12-13 18:02:26 -0800 |
|---|---|---|
| committer | Kaz Kylheku <kaz@kylheku.com> | 2014-12-13 18:02:26 -0800 |
| commit | bdde09352bed633ac31ca898d4dc3141ac1153d2 (patch) | |
| tree | 14675e272c38536f4c9b8c1b39e069d793f1232b | |
| parent | 4217488314883c309cb355d91740451b7f9a01f3 (diff) | |
| download | txr-bdde09352bed633ac31ca898d4dc3141ac1153d2.tar.gz txr-bdde09352bed633ac31ca898d4dc3141ac1153d2.tar.bz2 txr-bdde09352bed633ac31ca898d4dc3141ac1153d2.zip | |
Factor out some compiling commands into macros.
* Makefile (COMPILE_C, COMPILE_C_WITH_DEPS, LINK_PROG): New
macro strings.
(dbg/%.o, opt/*.o, %.o, $(PROG), $(PROG)-dbg, conftest,
conftest2): These targets now use these commands.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Makefile | 40 |
2 files changed, 33 insertions, 16 deletions
@@ -1,3 +1,12 @@ +2014-12-13 Kaz Kylheku <kaz@kylheku.com> + + Factor out some compiling commands into macros. + + * Makefile (COMPILE_C, COMPILE_C_WITH_DEPS, LINK_PROG): New + macro strings. + (dbg/%.o, opt/*.o, %.o, $(PROG), $(PROG)-dbg, conftest, + conftest2): These targets now use these commands. + 2014-12-11 Kaz Kylheku <kaz@kylheku.com> Build bugfix: if a config.h header exists in $(top_srcdir), @@ -84,22 +84,32 @@ define DEPGEN $(V)sed -e '1s/^/DEP_/' -e '1s/: [^ ]\+/ :=/' < $(1) > $(1:.d=.v) endef +define COMPILE_C +$(call ABBREV,CC) +$(V)$(CC) $(OPT_FLAGS) $(CFLAGS) -c -o $@ $< +endef + +define COMPILE_C_WITH_DEPS +$(call ABBREV,CC) +$(V)mkdir -p $(dir $@) +$(V)$(CC) -MMD -MT $@ $(1) $(CFLAGS) -c -o $@ $< +$(call DEPGEN,${@:.o=.d}) +endef + +define LINK_PROG +$(call ABBREV,LINK) +$(V)$(CC) $(1) $(CFLAGS) -o $@ $^ -lm +endef + dbg/%.o: %.c - $(call ABBREV,CC) - $(V)mkdir -p $(dir $@) - $(V)$(CC) -MMD -MT $@ $(CFLAGS) -c -o $@ $< - $(call DEPGEN,${@:.o=.d}) + $(call COMPILE_C_WITH_DEPS,) opt/%.o: %.c - $(call ABBREV,CC) - $(V)mkdir -p $(dir $@) - $(V)$(CC) -MMD -MT $@ $(OPT_FLAGS) $(CFLAGS) -c -o $@ $< - $(call DEPGEN,${@:.o=.d}) + $(call COMPILE_C_WITH_DEPS,$(OPT_FLAGS)) # The following pattern rule is used for test targets built by configure %.o: %.c - $(call ABBREV,CC,$<) - $(V)$(CC) $(OPT_FLAGS) $(CFLAGS) -c -o $@ $< + $(call COMPILE_C) ifeq ($(PROG),) .PHONY: notconfigured @@ -112,12 +122,10 @@ endif all: $(BUILD_TARGETS) $(PROG): $(OPT_OBJS) - $(call ABBREV,LINK) - $(V)$(CC) $(OPT_FLAGS) $(CFLAGS) -o $@ $^ -lm + $(call LINK_PROG,$(OPT_FLAGS)) $(PROG)-dbg: $(DBG_OBJS) - $(call ABBREV,LINK) - $(V)$(CC) $(CFLAGS) -o $@ $^ -lm + $(call LINK_PROG,) VPATH := $(top_srcdir) @@ -345,10 +353,10 @@ txr-manpage.pdf: txr.1 # conftest: conftest.c - $(CC) $(CFLAGS) -o $@ $^ -lm + $(call LINK_PROG,) conftest2: conftest1.c conftest2.c - $(CC) $(CFLAGS) -o $@ $^ -lm + $(call LINK_PROG,) conftest.syms: conftest.o $(NM) -n -t o -P $^ > $@ |