X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=53ec53d6f1c5b3e968ca2c3748b5206792a07684;hp=b04cbdb74923f78d9b16bfef24a531ed769e3ef0;hb=2440c41a10f1862dafdbe02d8cc64ecf7cfddc41;hpb=7aa41429957666cdc8bea237224a5b1d55ddbb8c

diff --git a/Makefile.in b/Makefile.in
index b04cbdb7..53ec53d6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,14 +3,12 @@ exec_prefix := @exec_prefix@
 
 BINDIR := @bindir@
 VARDIR := /var/paraslash
-PKGDATADIR := @datarootdir@/@PACKAGE_NAME@
 MANDIR := @datarootdir@/man/man1
 PACKAGE_VERSION := @PACKAGE_VERSION@
-PACKAGE_STRING := @PACKAGE_STRING@
 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@
 
@@ -19,9 +17,40 @@ GENGETOPT := @gengetopt@
 HELP2MAN := @help2man@
 MKDIR_P := mkdir -p
 
+speex_cppflags := @speex_cppflags@
+opus_cppflags := @opus_cppflags@
+arch_cppflags := @arch_cppflags@
+osl_cppflags := @osl_cppflags@
+id3tag_cppflags := @id3tag_cppflags@
+openssl_cppflags := @openssl_cppflags@
+ogg_cppflags := @ogg_cppflags@
+mad_cppflags := @mad_cppflags@
+faad_cppflags := @faad_cppflags@
+curses_cppflags := @curses_cppflags@
+ao_cppflags := @ao_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@
+gcrypt_ldflags := @gcrypt_ldflags@
+socket_ldflags := @socket_ldflags@
+nsl_ldflags := @nsl_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")
@@ -72,14 +101,14 @@ CPPFLAGS += -Wmissing-noreturn
 CPPFLAGS += -Wbad-function-cast
 CPPFLAGS += -fno-strict-aliasing
 CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F)
-CPPFLAGS += @arch_cppflags@
+CPPFLAGS += $(arch_cppflags)
 CPPFLAGS += -I/usr/local/include
 CPPFLAGS += -I$(cmdline_dir)
-CPPFLAGS += @osl_cppflags@
+CPPFLAGS += $(osl_cppflags)
 
 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)
@@ -96,7 +125,7 @@ else
 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)
@@ -155,63 +184,35 @@ $(hostbin_dir)/error2: error2.c | $(hostbin_dir)
 error2.h: $(hostbin_dir)/error2
 	@[ -z "$(Q)" ] || echo 'ER2 $<'
 	@echo "$(object_executable_matrix)" | $< > $@
-$(object_dir)/crypt.o: crypt.c | $(object_dir)
-	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(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@ $<
-
-$(object_dir)/spxdec_filter.o: spxdec_filter.c | $(object_dir)
-	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_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@ $<
-
-$(object_dir)/oggdec_filter.o: oggdec_filter.c | $(object_dir)
-	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ogg_cppflags@ $<
-
-$(object_dir)/ogg_afh.o: ogg_afh.c | $(object_dir)
-	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ogg_cppflags@ $<
-
-$(object_dir)/ogg_afh_common.o: ogg_afh_common.c | $(object_dir)
-	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ogg_cppflags@ $<
-
-$(object_dir)/mp3dec_filter.o: mp3dec_filter.c | $(object_dir)
-	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @mad_cppflags@ $<
-
-$(object_dir)/compress_filter.o: compress_filter.c | $(object_dir)
-	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) -O3 $<
-
-$(object_dir)/aacdec_filter.o: aacdec_filter.c | $(object_dir)
-	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
-
-$(object_dir)/aac_common.o: aac_common.c | $(object_dir)
-	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
-
-$(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)/%.o: %.c | $(object_dir)
+$(object_dir)/opus%.o: CPPFLAGS += $(opus_cppflags)
+$(object_dir)/gui%.o: CPPFLAGS += $(curses_cppflags)
+$(object_dir)/spx%.o: CPPFLAGS += $(speex_cppflags)
+$(object_dir)/%.cmdline.o: CPPFLAGS += -Wno-unused-function
+
+$(object_dir)/mp3_afh.o: CPPFLAGS += $(id3tag_cppflags)
+$(object_dir)/crypt.o: CPPFLAGS += $(openssl_cppflags)
+$(object_dir)/mp3dec_filter.o: CPPFLAGS += $(mad_cppflags)
+$(object_dir)/compress_filter.o: CPPFLAGS += -O3
+$(object_dir)/ao_write.o: CPPFLAGS += $(ao_cppflags)
+
+$(object_dir)/aacdec_filter.o \
+$(object_dir)/aac_common.o \
+$(object_dir)/aac_afh.o \
+: CPPFLAGS += $(faad_cppflags)
+
+$(object_dir)/spx_common.o \
+$(object_dir)/spxdec_filter.o \
+$(object_dir)/spx_afh.o \
+$(object_dir)/oggdec_filter.o \
+$(object_dir)/ogg_afh.o \
+$(object_dir)/ogg_afh_common.o \
+: CPPFLAGS += $(ogg_cppflags)
 
-$(object_dir)/mp3_afh.o: CPPFLAGS += @id3tag_cppflags@
-$(object_dir)/mp3_afh.o: mp3_afh.c | $(object_dir)
-
-$(object_dir)/gui%.o: gui%.c | $(object_dir)
-	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @curses_cppflags@ $<
-$(object_dir)/ao_write.o: ao_write.c | $(object_dir)
+$(object_dir)/%.o: %.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ao_cppflags@ $<
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) $<
 
 $(object_dir)/%.cmdline.o: $(cmdline_dir)/%.cmdline.c $(cmdline_dir)/%.cmdline.h | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
@@ -236,7 +237,7 @@ 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)/, $(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@)
@@ -256,6 +257,32 @@ ifeq ($(findstring clean, $(MAKECMDGOALS)),)
 endif
 
 para_recv para_afh para_play para_server: LDFLAGS += $(id3tag_ldflags)
+para_write para_play para_audiod: LDFLAGS += $(ao_ldflags) $(core_audio_ldflags)
+para_client para_audioc para_play : LDFLAGS += $(readline_ldflags)
+para_server: LDFLAGS += $(osl_ldflags)
+para_gui: LDFLAGS += $(curses_ldflags)
+para_server \
+para_client \
+para_audiod \
+:LDFLAGS += \
+	$(openssl_ldflags) \
+	$(gcrypt_ldflags)
+
+para_audiod \
+para_filter \
+para_play \
+: LDFLAGS += \
+	$(mad_ldflags) \
+	$(samplerate_ldflags) \
+	-lm
+
+para_write \
+para_play \
+para_audiod \
+para_fade \
+: LDFLAGS += \
+	$(oss_ldflags) \
+	$(alsa_ldflags)
 
 para_server \
 para_filter \
@@ -263,56 +290,69 @@ para_audiod \
 para_play \
 para_afh \
 para_recv \
-: LDFLAGS += $(ogg_ldflags) $(vorbis_ldflags)
+: LDFLAGS += \
+	$(ogg_ldflags) \
+	$(vorbis_ldflags) \
+	$(speex_ldflags) \
+	$(opus_ldflags) \
+	$(faad_ldflags) \
+	$(flac_ldflags)
 
+para_server \
+para_client \
+para_audioc \
+para_audiod \
+para_recv \
+: LDFLAGS += \
+	$(socket_ldflags) $(nsl_ldflags)
 
 para_recv: $(recv_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) $(recv_objs) -o $@ @recv_ldflags@ $(LDFLAGS)
+	$(Q) $(CC) $(recv_objs) -o $@ $(LDFLAGS)
 
 para_filter: $(filter_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) $(filter_objs) -o $@ @filter_ldflags@ $(LDFLAGS)
+	$(Q) $(CC) $(filter_objs) -o $@ $(LDFLAGS)
 
 para_client: $(client_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) -o $@ $(client_objs) @client_ldflags@ $(LDFLAGS)
+	$(Q) $(CC) -o $@ $(client_objs) $(LDFLAGS)
 
 para_gui: $(gui_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) -o $@ $(gui_objs) @curses_ldflags@ $(LDFLAGS)
+	$(Q) $(CC) -o $@ $(gui_objs) $(LDFLAGS)
 
 para_audiod: $(audiod_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) -o $@ $(audiod_objs) @audiod_ldflags@ $(LDFLAGS)
+	$(Q) $(CC) -o $@ $(audiod_objs) $(LDFLAGS)
 
 para_audioc: $(audioc_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) -o $@ $(audioc_objs) @audioc_ldflags@ $(LDFLAGS)
+	$(Q) $(CC) -o $@ $(audioc_objs) $(LDFLAGS)
 
 para_fade: $(fade_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) -o $@ $(fade_objs) @fade_ldflags@ $(LDFLAGS)
+	$(Q) $(CC) -o $@ $(fade_objs) $(LDFLAGS)
 
 para_server: $(server_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) -o $@ $(server_objs) @server_ldflags@ $(LDFLAGS)
+	$(Q) $(CC) -o $@ $(server_objs) $(LDFLAGS)
 
 para_write: $(write_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) -o $@ $(write_objs) @write_ldflags@ $(LDFLAGS)
+	$(Q) $(CC) -o $@ $(write_objs) $(LDFLAGS)
 
 para_afh: $(afh_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) -o $@ $(afh_objs) @afh_ldflags@ $(LDFLAGS)
+	$(Q) $(CC) -o $@ $(afh_objs) $(LDFLAGS)
 
 para_play: $(play_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) -o $@ $(play_objs) @play_ldflags@ $(LDFLAGS)
+	$(Q) $(CC) -o $@ $(play_objs) $(LDFLAGS)
 
 clean:
 	@[ -z "$(Q)" ] || echo 'CLEAN'
-	$(Q) rm -f $(executables)
+	$(Q) rm -f $(prefixed_executables)
 	$(Q) rm -rf $(object_dir)
 
 clean2: clean
@@ -331,7 +371,8 @@ maintainer-clean: distclean
 
 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