X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=Makefile.in;h=6d14029c48b6a835832aa797ae78566269ad1c87;hb=00381560b9726b1db7e135409c37364eed6c4fb6;hp=299c38f1edfd4d02dca3647a1d3dc8065bf6dc5b;hpb=f5fb7ab51189ee8714b1f8986c300f86eb75a6ea;p=paraslash.git

diff --git a/Makefile.in b/Makefile.in
index 299c38f1..6d14029c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,8 +7,10 @@ PKGDATADIR := @datarootdir@/@PACKAGE_NAME@
 MANDIR := @datarootdir@/man/man1
 PACKAGE_VERSION := @PACKAGE_VERSION@
 PACKAGE_STRING := @PACKAGE_STRING@
-install_sh := @install_sh@
-executables := @executables@
+INSTALL := @install@
+STRIP := $(CROSS_COMPILE)strip
+executables := $(addprefix para_, @executables@)
+ggo_descriptions_declared := @ggo_descriptions_declared@
 
 GENGETOPT := @gengetopt@
 HELP2MAN := @help2man@
@@ -18,7 +20,6 @@ build_date := $(shell date)
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
 uname_rs := $(shell uname -rs)
 cc_version := $(shell $(CC) --version | head -n 1)
-codename := spectral gravity
 
 GIT_VERSION := $(shell ./GIT-VERSION-GEN git-version.h)
 
@@ -34,6 +35,8 @@ 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
+help2man_dir := $(build_dir)/help2man
 
 DEBUG_CPPFLAGS += -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
@@ -67,7 +70,6 @@ CPPFLAGS += -Wchar-subscripts
 CPPFLAGS += -DBINDIR='"$(BINDIR)"'
 CPPFLAGS += -DBUILD_DATE='"$(build_date)"'
 CPPFLAGS += -DUNAME_RS='"$(uname_rs)"'
-CPPFLAGS += -DCODENAME='"$(codename)"'
 CPPFLAGS += -DCC_VERSION='"$(cc_version)"'
 CPPFLAGS += -Werror-implicit-function-declaration
 CPPFLAGS += -Wmissing-noreturn
@@ -81,7 +83,7 @@ CPPFLAGS += @osl_cppflags@
 
 LDFLAGS += @clock_gettime_ldflags@
 
-man_pages := $(patsubst %, $(man_dir)/%.1, @executables@)
+man_pages := $(patsubst %, $(man_dir)/%.1, $(executables))
 
 autocrap := config.h.in configure
 tarball_pfx := @PACKAGE_TARNAME@-$(PACKAGE_VERSION)
@@ -98,12 +100,13 @@ else
 endif
 
 .PHONY: dep all clean distclean maintainer-clean install man tarball
-all: dep @executables@ $(man_pages)
+all: dep $(executables) $(man_pages)
 dep: $(deps)
 man: $(man_pages)
 tarball: $(tarball)
 
-$(object_dir) $(man_dir) $(ggo_dir) $(cmdline_dir) $(dep_dir):
+$(object_dir) $(man_dir) $(ggo_dir) $(cmdline_dir) $(dep_dir) $(m4depdir) \
+		$(help2man_dir):
 	$(Q) $(MKDIR_P) $@
 
 -include $(m4_ggo_dir)/makefile
@@ -133,22 +136,22 @@ 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 ./$< > $@
 
 $(object_dir)/crypt.o: crypt.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
@@ -181,6 +184,10 @@ $(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@ $<
@@ -226,6 +233,7 @@ all_objs := @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@))
 
 recv_objs := $(addprefix $(object_dir)/, @recv_objs@)
 filter_objs := $(addprefix $(object_dir)/, @filter_objs@)
@@ -241,6 +249,7 @@ play_objs := $(addprefix $(object_dir)/, @play_objs@)
 
 ifeq ($(findstring clean, $(MAKECMDGOALS)),)
 -include $(deps)
+-include $(m4_deps)
 endif
 
 para_recv: $(recv_objs)
@@ -289,7 +298,7 @@ para_play: $(play_objs)
 
 clean:
 	@[ -z "$(Q)" ] || echo 'CLEAN'
-	$(Q) rm -f @executables@
+	$(Q) rm -f $(executables)
 	$(Q) rm -rf $(object_dir)
 
 clean2: clean
@@ -308,8 +317,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):
@@ -323,9 +332,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