X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=643075941d3453bfc84ca186aac7e4dc173458b3;hp=cf8b9f71f0684d4f0184a03ff3b2b519d6e9b44f;hb=8ee71345ece2e781ffa955498fd90283260a5403;hpb=d9e05a6585d795e44847608a8a6ee424a7604b74

diff --git a/Makefile.in b/Makefile.in
index cf8b9f71..64307594 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,14 +7,27 @@ PKGDATADIR := @datarootdir@/@PACKAGE_NAME@
 MANDIR := @datarootdir@/man/man1
 PACKAGE_VERSION := @PACKAGE_VERSION@
 PACKAGE_STRING := @PACKAGE_STRING@
-install_sh := @install_sh@
+INSTALL := @install@
+STRIP := $(CROSS_COMPILE)strip
+HOSTCC ?= cc
 executables := $(addprefix para_, @executables@)
 ggo_descriptions_declared := @ggo_descriptions_declared@
+object_executable_matrix := @object_executable_matrix@
+
 
 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@
+
 build_date := $(shell date)
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
 uname_rs := $(shell uname -rs)
@@ -35,24 +48,14 @@ dep_dir := $(build_dir)/deps
 man_dir := $(build_dir)/man/man1
 cmdline_dir := $(build_dir)/cmdline
 m4depdir := $(build_dir)/m4deps
+help2man_dir := $(build_dir)/help2man
+hostbin_dir := $(build_dir)/host/bin
 
 DEBUG_CPPFLAGS += -g -Wunused -Wundef -W
 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
@@ -103,7 +106,8 @@ dep: $(deps)
 man: $(man_pages)
 tarball: $(tarball)
 
-$(object_dir) $(man_dir) $(ggo_dir) $(cmdline_dir) $(dep_dir) $(m4depdir):
+$(object_dir) $(man_dir) $(ggo_dir) $(cmdline_dir) $(dep_dir) $(m4depdir) \
+		$(help2man_dir) $(hostbin_dir):
 	$(Q) $(MKDIR_P) $@
 
 -include $(m4_ggo_dir)/makefile
@@ -133,37 +137,43 @@ afs_command_list.h afs_command_list.man afs_completion.h: afs.c aft.c attribute.
 audiod_command_list.h audiod_command_list.man audiod_completion.h: audiod_command.c
 
 server_command_lists_man = server_command_list.man afs_command_list.man
-$(man_dir)/para_server.1: para_server $(server_command_lists_man) | $(man_dir)
+$(man_dir)/para_server.1: $(help2man_dir)/para_server $(server_command_lists_man) | $(man_dir)
 	@[ -z "$(Q)" ] || echo 'MAN $<'
-	$(Q) opts="-h --detailed-help -N `for i in $(server_command_lists_man); do printf "%s\n" "-i $$i"; done`"; \
-	$(HELP2MAN) $$opts ./para_server > $@
+	$(Q) opts="`for i in $(server_command_lists_man); do printf "%s\n" "-i $$i"; done`"; \
+	$(HELP2MAN) $$opts ./$< > $@
 
-$(man_dir)/para_audiod.1: para_audiod audiod_command_list.man | $(man_dir)
+$(man_dir)/para_audiod.1: $(help2man_dir)/para_audiod audiod_command_list.man | $(man_dir)
 	@[ -z "$(Q)" ] || echo 'MAN $<'
-	$(Q) $(HELP2MAN) -h --detailed-help -N -i audiod_command_list.man ./para_audiod > $@
+	$(Q) $(HELP2MAN) -N -i audiod_command_list.man ./$< > $@
 
-$(man_dir)/para_play.1: para_play play_command_list.man | $(man_dir)
+$(man_dir)/para_play.1: $(help2man_dir)/para_play play_command_list.man | $(man_dir)
 	@[ -z "$(Q)" ] || echo 'MAN $<'
-	$(Q) $(HELP2MAN) -h --detailed-help -N -i play_command_list.man ./para_play > $@
+	$(Q) $(HELP2MAN) -N -i play_command_list.man ./$< > $@
 
-$(man_dir)/%.1: % | $(man_dir)
+$(man_dir)/%.1: $(help2man_dir)/% | $(man_dir)
 	@[ -z "$(Q)" ] || echo 'MAN $<'
-	$(Q) $(HELP2MAN) -h --detailed-help -N ./$< > $@
-
+	$(Q) $(HELP2MAN) -N ./$< > $@
+
+$(hostbin_dir)/error2: error2.c | $(hostbin_dir)
+	@[ -z "$(Q)" ] || echo 'HCC $<'
+	$(Q) $(HOSTCC) -o $@ $<
+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@ $<
+	$(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 $<'
@@ -197,9 +207,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 $<'
@@ -226,9 +236,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@))
 
@@ -249,6 +260,17 @@ ifeq ($(findstring clean, $(MAKECMDGOALS)),)
 -include $(m4_deps)
 endif
 
+para_recv para_afh para_play para_server: LDFLAGS += $(id3tag_ldflags)
+
+para_server \
+para_filter \
+para_audiod \
+para_play \
+para_afh \
+para_recv \
+: LDFLAGS += $(ogg_ldflags) $(vorbis_ldflags) $(speex_ldflags) $(opus_ldflags)
+
+
 para_recv: $(recv_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
 	$(Q) $(CC) $(recv_objs) -o $@ @recv_ldflags@ $(LDFLAGS)
@@ -263,7 +285,7 @@ para_client: $(client_objs)
 
 para_gui: $(gui_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) -o $@ $(gui_objs) @gui_ldflags@ $(LDFLAGS)
+	$(Q) $(CC) -o $@ $(gui_objs) @curses_ldflags@ $(LDFLAGS)
 
 para_audiod: $(audiod_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
@@ -314,8 +336,8 @@ maintainer-clean: distclean
 
 install: all man
 	$(MKDIR_P) $(BINDIR) $(MANDIR)
-	$(install_sh) -s -m 755 $(executables) $(BINDIR)
-	$(install_sh) -m 644 $(man_pages) $(MANDIR)
+	$(INSTALL) -s --strip-program $(STRIP) -m 755 $(executables) $(BINDIR)
+	$(INSTALL) -m 644 $(man_pages) $(MANDIR)
 	$(MKDIR_P) $(VARDIR) >/dev/null 2>&1 || true # not fatal, so don't complain
 
 $(tarball):
@@ -329,9 +351,4 @@ $(tarball):
 	bzip2 -9 $(tarball_pfx).tar
 	ls -l $(tarball_pfx).tar.bz2
 	rm -rf $(tarball_pfx)
-%.ps: %.sk
-	sk2ps $< > $@
-%.pdf: %.ps
-	ps2pdf - - < $< > $@
-
 include $(test_dir)/makefile.test