build: Remove duplicates from $all_objs.

[paraslash.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 4160d257ac86684108104914e21d6171d1668bd6..df61b2fb273b5a0ec37ffba9c60f99c1b3014a09 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -47,18 +47,6 @@ DEBUG_CPPFLAGS += -Wredundant-decls
 DEBUG_CPPFLAGS += -Wall -Wno-sign-compare -Wno-unknown-pragmas
 DEBUG_CPPFLAGS += -Wformat-security
 DEBUG_CPPFLAGS += -Wmissing-format-attribute
-# produces false positives
-# DEBUG_CPPFLAGS += -Wunreachable-code
-# DEBUG_CPPFLAGS += -Wwrite-strings
-
-# invalid option for gcc-3.3.3
-# DEBUG_CPPFLAGS += -Wextra
-# DEBUG_CPPFLAGS += -Wold-style-definition
-# DEBUG_CPPFLAGS += -Wdeclaration-after-statement
-# DEBUG_CPPFLAGS += -Wsuggest-attribute=const
-
-# many warnings about trivial stuff
-# CPPFLAGS += -Wconversion
 
 ifeq ($(uname_s),Linux)
        CPPFLAGS += -fdata-sections -ffunction-sections
@@ -239,9 +227,10 @@ $(dep_dir)/%.d: %.c | $(dep_dir)
        $(Q) ./depend.sh $(dep_dir) $(object_dir) $(cmdline_dir) \
                $(CPPFLAGS) $< > $@
 
-all_objs := @recv_objs@ @filter_objs@ @client_objs@ @gui_objs@ \
+# sort removes duplicate words, which is all we need here
+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@
+       @write_objs@ @afh_objs@ @play_objs@)
 deps := $(addprefix $(dep_dir)/, $(all_objs:.o=.d))
 m4_deps := $(addprefix $(m4depdir)/, $(addsuffix .m4d, @executables@))