X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=a7abc2d3169b50c56b444846a3c77409b5607b86;hp=4160d257ac86684108104914e21d6171d1668bd6;hb=ad35733037a093e0726b210c432c5701823b8dc1;hpb=e8f3104cc1c1f243f4b7c8b1eabdc24c93a6ad35

diff --git a/Makefile.in b/Makefile.in
index 4160d257..a7abc2d3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,6 +19,25 @@ GENGETOPT := @gengetopt@
 HELP2MAN := @help2man@
 MKDIR_P := mkdir -p
 
+speex_cppflags := @speex_cppflags@
+opus_cppflags := @opus_cppflags@
+
+id3tag_ldflags := @id3tag_ldflags@
+ogg_ldflags := @ogg_ldflags@
+vorbis_ldflags := @vorbis_ldflags@
+speex_ldflags := @speex_ldflags@
+opus_ldflags := @opus_ldflags@
+faad_ldflags := @faad_ldflags@
+mad_ldflags := @mad_ldflags@
+flac_ldflags := @flac_ldflags@
+oss_ldflags := @oss_ldflags@
+alsa_ldflags := @alsa_ldflags@
+ao_ldflags := @ao_ldflags@
+readline_ldflags := @readline_ldflags@
+samplerate_ldflags := @samplerate_ldflags@
+osl_ldflags := @osl_ldflags@
+openssl_ldflags := @openssl_ldflags@
+
 build_date := $(shell date)
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
 uname_rs := $(shell uname -rs)
@@ -47,18 +66,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
@@ -168,15 +175,15 @@ $(object_dir)/crypt.o: crypt.c | $(object_dir)
 	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @openssl_cppflags@ $<
 $(object_dir)/spx_common.o: spx_common.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ogg_cppflags@ $<
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) $(speex_cppflags) @ogg_cppflags@ $<
 
 $(object_dir)/spxdec_filter.o: spxdec_filter.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ogg_cppflags@ $<
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) $(speex_cppflags) @ogg_cppflags@ $<
 
 $(object_dir)/spx_afh.o: spx_afh.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ogg_cppflags@ $<
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) $(speex_cppflags) @ogg_cppflags@ $<
 
 $(object_dir)/oggdec_filter.o: oggdec_filter.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
@@ -210,9 +217,9 @@ $(object_dir)/aac_afh.o: aac_afh.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
 	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
 
+$(object_dir)/opus%.o: CPPFLAGS += $(opus_cppflags)
+$(object_dir)/mp3_afh.o: CPPFLAGS += @id3tag_cppflags@
 $(object_dir)/mp3_afh.o: mp3_afh.c | $(object_dir)
-	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @id3tag_cppflags@ $<
 
 $(object_dir)/gui%.o: gui%.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
@@ -239,9 +246,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@))
 
@@ -262,6 +270,41 @@ ifeq ($(findstring clean, $(MAKECMDGOALS)),)
 -include $(m4_deps)
 endif
 
+para_recv para_afh para_play para_server: LDFLAGS += $(id3tag_ldflags)
+para_write para_play para_audiod: LDFLAGS += $(ao_ldflags)
+para_client para_audioc para_play : LDFLAGS += $(readline_ldflags)
+para_server: LDFLAGS += $(osl_ldflags)
+para_server para_client para_audiod: LDFLAGS += $(openssl_ldflags)
+
+para_audiod \
+para_filter \
+para_play \
+: LDFLAGS += \
+	$(mad_ldflags) \
+	$(samplerate_ldflags)
+
+para_write \
+para_play \
+para_audiod \
+para_fade \
+: LDFLAGS += \
+	$(oss_ldflags) \
+	$(alsa_ldflags)
+
+para_server \
+para_filter \
+para_audiod \
+para_play \
+para_afh \
+para_recv \
+: LDFLAGS += \
+	$(ogg_ldflags) \
+	$(vorbis_ldflags) \
+	$(speex_ldflags) \
+	$(opus_ldflags) \
+	$(faad_ldflags) \
+	$(flac_ldflags)
+
 para_recv: $(recv_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
 	$(Q) $(CC) $(recv_objs) -o $@ @recv_ldflags@ $(LDFLAGS)