From: Andre Noll Date: Sat, 14 Sep 2013 06:53:59 +0000 (+0000) Subject: build: Combine link rules. X-Git-Tag: v0.5.1~1^2~10 X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=fe76667a0b6be31b58ca4078b6145ba63673ea98 build: Combine link rules. Due to the cleanups in the previous patches, all rules for linking have become identical. Hence we may replace all of them by a single one. --- diff --git a/Makefile.in b/Makefile.in index 53ec53d6..855b6693 100644 --- a/Makefile.in +++ b/Makefile.in @@ -306,49 +306,10 @@ para_recv \ : LDFLAGS += \ $(socket_ldflags) $(nsl_ldflags) -para_recv: $(recv_objs) +$(foreach exe,$(executables),$(eval para_$(exe): $$($(exe)_objs))) +$(prefixed_executables): @[ -z "$(Q)" ] || echo 'LD $@' - $(Q) $(CC) $(recv_objs) -o $@ $(LDFLAGS) - -para_filter: $(filter_objs) - @[ -z "$(Q)" ] || echo 'LD $@' - $(Q) $(CC) $(filter_objs) -o $@ $(LDFLAGS) - -para_client: $(client_objs) - @[ -z "$(Q)" ] || echo 'LD $@' - $(Q) $(CC) -o $@ $(client_objs) $(LDFLAGS) - -para_gui: $(gui_objs) - @[ -z "$(Q)" ] || echo 'LD $@' - $(Q) $(CC) -o $@ $(gui_objs) $(LDFLAGS) - -para_audiod: $(audiod_objs) - @[ -z "$(Q)" ] || echo 'LD $@' - $(Q) $(CC) -o $@ $(audiod_objs) $(LDFLAGS) - -para_audioc: $(audioc_objs) - @[ -z "$(Q)" ] || echo 'LD $@' - $(Q) $(CC) -o $@ $(audioc_objs) $(LDFLAGS) - -para_fade: $(fade_objs) - @[ -z "$(Q)" ] || echo 'LD $@' - $(Q) $(CC) -o $@ $(fade_objs) $(LDFLAGS) - -para_server: $(server_objs) - @[ -z "$(Q)" ] || echo 'LD $@' - $(Q) $(CC) -o $@ $(server_objs) $(LDFLAGS) - -para_write: $(write_objs) - @[ -z "$(Q)" ] || echo 'LD $@' - $(Q) $(CC) -o $@ $(write_objs) $(LDFLAGS) - -para_afh: $(afh_objs) - @[ -z "$(Q)" ] || echo 'LD $@' - $(Q) $(CC) -o $@ $(afh_objs) $(LDFLAGS) - -para_play: $(play_objs) - @[ -z "$(Q)" ] || echo 'LD $@' - $(Q) $(CC) -o $@ $(play_objs) $(LDFLAGS) + $(Q) $(CC) $^ -o $@ $(LDFLAGS) clean: @[ -z "$(Q)" ] || echo 'CLEAN'