summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
2f113b5)
Currently $executables contains the full basename of all
executables (para_server, para_client, ...), while the autoconf
variable @executables@ is used for the variants without the "para_"
prefix. This is rather confusing, so introduce $prefixed_executables
and stop using the @executables@ variant in Make recipes.
INSTALL := @install@
STRIP := $(CROSS_COMPILE)strip
HOSTCC ?= cc
INSTALL := @install@
STRIP := $(CROSS_COMPILE)strip
HOSTCC ?= cc
-executables := $(addprefix para_, @executables@)
+executables := @executables@
ggo_descriptions_declared := @ggo_descriptions_declared@
object_executable_matrix := @object_executable_matrix@
ggo_descriptions_declared := @ggo_descriptions_declared@
object_executable_matrix := @object_executable_matrix@
curses_ldflags := @curses_ldflags@
core_audio_ldflags := @core_audio_ldflags@
curses_ldflags := @curses_ldflags@
core_audio_ldflags := @core_audio_ldflags@
+prefixed_executables := $(addprefix para_, $(executables))
+
build_date := $(shell date)
uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
uname_rs := $(shell uname -rs)
build_date := $(shell date)
uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
uname_rs := $(shell uname -rs)
LDFLAGS += @clock_gettime_ldflags@
LDFLAGS += @clock_gettime_ldflags@
-man_pages := $(patsubst %, $(man_dir)/%.1, $(executables))
+man_pages := $(patsubst %, $(man_dir)/%.1, $(prefixed_executables))
autocrap := config.h.in configure
tarball_pfx := @PACKAGE_TARNAME@-$(PACKAGE_VERSION)
autocrap := config.h.in configure
tarball_pfx := @PACKAGE_TARNAME@-$(PACKAGE_VERSION)
endif
.PHONY: dep all clean distclean maintainer-clean install man tarball
endif
.PHONY: dep all clean distclean maintainer-clean install man tarball
-all: dep $(executables) $(man_pages)
+all: dep $(prefixed_executables) $(man_pages)
dep: $(deps)
man: $(man_pages)
tarball: $(tarball)
dep: $(deps)
man: $(man_pages)
tarball: $(tarball)
@audiod_objs@ @audioc_objs@ @fade_objs@ @server_objs@ \
@write_objs@ @afh_objs@ @play_objs@)
deps := $(addprefix $(dep_dir)/, $(all_objs:.o=.d))
@audiod_objs@ @audioc_objs@ @fade_objs@ @server_objs@ \
@write_objs@ @afh_objs@ @play_objs@)
deps := $(addprefix $(dep_dir)/, $(all_objs:.o=.d))
-m4_deps := $(addprefix $(m4depdir)/, $(addsuffix .m4d, @executables@))
+m4_deps := $(addprefix $(m4depdir)/, $(addsuffix .m4d, $(executables)))
recv_objs := $(addprefix $(object_dir)/, @recv_objs@)
filter_objs := $(addprefix $(object_dir)/, @filter_objs@)
recv_objs := $(addprefix $(object_dir)/, @recv_objs@)
filter_objs := $(addprefix $(object_dir)/, @filter_objs@)
clean:
@[ -z "$(Q)" ] || echo 'CLEAN'
clean:
@[ -z "$(Q)" ] || echo 'CLEAN'
- $(Q) rm -f $(executables)
+ $(Q) rm -f $(prefixed_executables)
$(Q) rm -rf $(object_dir)
clean2: clean
$(Q) rm -rf $(object_dir)
clean2: clean
install: all man
$(MKDIR_P) $(BINDIR) $(MANDIR)
install: all man
$(MKDIR_P) $(BINDIR) $(MANDIR)
- $(INSTALL) -s --strip-program $(STRIP) -m 755 $(executables) $(BINDIR)
+ $(INSTALL) -s --strip-program $(STRIP) -m 755 \
+ $(prefixed_executables) $(BINDIR)
$(INSTALL) -m 644 $(man_pages) $(MANDIR)
$(MKDIR_P) $(VARDIR) >/dev/null 2>&1 || true # not fatal, so don't complain
$(INSTALL) -m 644 $(man_pages) $(MANDIR)
$(MKDIR_P) $(VARDIR) >/dev/null 2>&1 || true # not fatal, so don't complain
test_options := --executables-dir $(shell pwd)
test_options += --results-dir $(results_dir)
test_options += --trash-dir $(trash_dir)
test_options := --executables-dir $(shell pwd)
test_options += --results-dir $(results_dir)
test_options += --trash-dir $(trash_dir)
-test_options += --executables "$(executables)"
+test_options += --executables "$(prefixed_executables)"
test_options += --objects "$(basename $(all_objs))"
ifdef V
test_options += --objects "$(basename $(all_objs))"
ifdef V