From e43ca5dad846ed131404677a8ef9955ff5f55aff Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 10 Jul 2016 18:33:48 +0200 Subject: [PATCH] build: Remove cmdline_dir and friends. This directory used to contain the source files of the command line parsers generated by gengetopt. There are no such files any more, so the the receipts which compile these source files can go away and we do not need to create the directory any more. The special CFLAGS for compiling those files can be removed as well as the include directive for CPPFLAGS. Finally, the make construct which filters out the .cmdline.d files from the list of dependency files is no longer needed, and we may get rid of the sed command which prepends $(cmdline_dir) to the includes of the dependency files. --- Makefile.real | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/Makefile.real b/Makefile.real index ca758e50..6a161e9e 100644 --- a/Makefile.real +++ b/Makefile.real @@ -29,7 +29,6 @@ endif object_dir := $(build_dir)/objects dep_dir := $(build_dir)/deps man_dir := $(build_dir)/man/man1 -cmdline_dir := $(build_dir)/cmdline m4depdir := $(build_dir)/m4deps lls_suite_dir := $(build_dir)/lls lls_m4_dir := m4/lls @@ -39,7 +38,7 @@ test_dir := t all_objs := $(sort $(recv_objs) $(filter_objs) $(client_objs) $(gui_objs) \ $(audiod_objs) $(audioc_objs) $(fade_objs) $(server_objs) \ $(write_objs) $(afh_objs) $(play_objs)) -deps := $(addprefix $(dep_dir)/, $(filter-out %.cmdline.d, $(all_objs:.o=.d))) +deps := $(addprefix $(dep_dir)/, $(all_objs:.o=.d)) afh_objs += afh.lsg.o audioc_objs += audioc.lsg.o @@ -96,7 +95,7 @@ ifeq ($(findstring clean, $(MAKECMDGOALS)),) -include $(m4_lls_deps) endif -$(object_dir) $(man_dir) $(cmdline_dir) $(dep_dir) $(m4depdir) $(lls_suite_dir): +$(object_dir) $(man_dir) $(dep_dir) $(m4depdir) $(lls_suite_dir): $(Q) $(MKDIR_P) $@ CPPFLAGS += -DBINDIR='"$(bindir)"' @@ -106,7 +105,6 @@ CPPFLAGS += -DLOGLEVELS='$(LOGLEVELS)' CPPFLAGS += -DUNAME_RS='"$(uname_rs)"' CPPFLAGS += -DCC_VERSION='"$(cc_version)"' CPPFLAGS += -I/usr/local/include -CPPFLAGS += -I$(cmdline_dir) CPPFLAGS += -I$(lls_suite_dir) CPPFLAGS += $(lopsub_cppflags) @@ -246,25 +244,19 @@ $(object_dir)/send_common.o $(dep_dir)/send_common.d \ $(object_dir)/mm.o $(dep_dir)/mm.d \ : CPPFLAGS += $(osl_cppflags) -$(object_dir)/%.cmdline.o: CFLAGS += -Wno-unused-function $(object_dir)/compress_filter.o: CFLAGS += -O3 $(object_dir)/%.o: %.c | $(object_dir) @[ -z "$(Q)" ] || echo 'CC $<' $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(STRICT_CFLAGS) $< -$(object_dir)/%.cmdline.o: $(cmdline_dir)/%.cmdline.c $(cmdline_dir)/%.cmdline.h | $(object_dir) - @[ -z "$(Q)" ] || echo 'CC $<' - $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $< - # The compiler outputs dependencies either as foo.h or as some_directory/foo.h, # depending on whether the latter file exists. Since make needs the directory # part we prefix the dependency as appropriate. $(dep_dir)/%.d: %.c | $(dep_dir) @[ -z "$(Q)" ] || echo 'DEP $<' $(Q) $(CC) $(CPPFLAGS) -MM -MG -MP -MT $@ -MT $(object_dir)/$(*F).o $< \ - | sed -e "s@ \([a-zA-Z0-9_]\{1,\}\.cmdline.h\)@ $(cmdline_dir)/\1@g" \ - -e "s@ \([a-zA-Z0-9_]\{1,\}.lsg.h\)@ $(lls_suite_dir)/\1@g" > $@ + | sed -e "s@ \([a-zA-Z0-9_]\{1,\}.lsg.h\)@ $(lls_suite_dir)/\1@g" > $@ para_recv para_afh para_play para_server: LDFLAGS += $(id3tag_ldflags) para_write para_play para_audiod \ -- 2.39.5