X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=baae37b20433ee4d75696a4a52f536f798b5e198;hp=5d085c7b5770735be86b5dce481f3993572c0e6f;hb=35993f0cd49206666262cfdd2be89af41ec28a1d;hpb=ff26022314dbe64005e7e178693bdb08013c4687 diff --git a/Makefile.in b/Makefile.in index 5d085c7b..baae37b2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -12,7 +12,7 @@ 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 := solar saturation +codename := elliptic inheritance DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W DEBUG_CPPFLAGS += -Wredundant-decls @@ -23,6 +23,7 @@ DEBUG_CPPFLAGS += -Wredundant-decls # invalid option for gcc-3.3.3 # DEBUG_CPPFLAGS += -Wextra # DEBUG_CPPFLAGS += -Wold-style-definition +# DEBUG_CPPFLAGS += -Wdeclaration-after-statement # many warnings about trivial stuff # CPPFLAGS += -Wconversion @@ -45,6 +46,7 @@ CPPFLAGS += -DCODENAME='"$(codename)"' CPPFLAGS += -DCC_VERSION='"$(cc_version)"' CPPFLAGS += -Werror-implicit-function-declaration CPPFLAGS += -Wmissing-format-attribute +CPPFLAGS += -Wmissing-noreturn CPPFLAGS += -Wunused-macros CPPFLAGS += -Wbad-function-cast CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F) @@ -53,13 +55,14 @@ CPPFLAGS += @ncurses_cppflags@ CPPFLAGS += @arch_cppflags@ BINARIES = para_server para_client para_audioc para_recv \ - para_filter para_write para_fsck @extra_binaries@ + para_filter para_write para_fsck para_afh @extra_binaries@ man_binaries := $(BINARIES) man_pages := $(patsubst %, man/man1/%.1, $(man_binaries)) man_pages_in := $(patsubst %, web/%.man.in.html, $(man_binaries)) -gengetopts := $(wildcard *.ggo) -gengetopts_c := $(gengetopts:.ggo=.cmdline.c) -gengetopts_h := $(gengetopts:.ggo=.cmdline.h) +ggo_dir := ggo +gengetopts := $(wildcard $(ggo_dir)/*.ggo) +gengetopts_c := $(patsubst %/,, $(gengetopts:.ggo=.cmdline.c)) +gengetopts_h := $(patsubst %/,, $(gengetopts:.ggo=.cmdline.h)) autocrap := config.h.in configure tarball_pfx := @PACKAGE_TARNAME@-@PACKAGE_VERSION@ tarball_delete = web versions pics .changelog_before_cvs .changelog_cvs .gitignore @@ -68,20 +71,17 @@ tarball_add := $(gengetopts_c) $(gengetopts_h) $(autocrap) tarball := @PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2 .PHONY: clean distclean maintainer-clean install man tarball -all: $(BINARIES) +all: $(BINARIES) $(man_pages) man: $(man_pages) tarball: $(tarball) -fade_objs := fade.cmdline.o fade.o exec.o close_on_fork.o string.o fd.o -fsck_objs := osl.o rbtree.o fsck.o string.o sha1.o fsck.cmdline.o - *.o: para.h config.h gcc-compat.h include Makefile.deps module_ggo_opts := --set-version="(@PACKAGE_STRING@, $(codename))" -grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo +grab_client.cmdline.h grab_client.cmdline.c: $(ggo_dir)/grab_client.ggo gengetopt $(module_ggo_opts) \ -S \ --set-package=grab \ @@ -89,35 +89,40 @@ grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo --no-handle-error \ --no-handle-version \ --arg-struct-name=grab_client_args_info \ - --file-name=$(subst .ggo,,$<).cmdline \ - --func-name $(subst .ggo,,$<)_cmdline_parser < $< + --file-name=$(subst .ggo,,$( $@ man/man1/para_audiod.1: para_audiod audiod_command_list.man mkdir -p man/man1 - help2man -N -i audiod_command_list.man ./para_audiod > $@ + help2man -h --detailed-help -N -i audiod_command_list.man ./para_audiod > $@ + +man/man1/para_filter.1: para_filter + mkdir -p man/man1 + help2man -h --detailed-help -N ./$< > $@ + +man/man1/para_write.1: para_write + mkdir -p man/man1 + help2man -h --detailed-help -N ./$< > $@ + +man/man1/para_recv.1: para_recv + mkdir -p man/man1 + help2man -h --detailed-help -N ./$< > $@ man/man1/%.1: % mkdir -p man/man1 @@ -155,21 +172,15 @@ web/%.man.in.html: man/man1/%.1 man2html $< | sed -e '/^<\/BODY>/,$$d' -e '1,/<\/HEAD>/d' > $@ -ortp_recv.o: ortp_recv.c - $(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ortp_cppflags@ $< - -ortp_send.o: ortp_send.c - $(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ortp_cppflags@ $< - -oggdec.o: oggdec.c +oggdec_filter.o: oggdec_filter.c $(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @oggvorbis_cppflags@ $< ogg_afh.o: ogg_afh.c $(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @oggvorbis_cppflags@ $< -mp3dec.o: mp3dec.c +mp3dec_filter.o: mp3dec_filter.c $(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @mad_cppflags@ $< -aacdec.o: aacdec.c +aacdec_filter.o: aacdec_filter.c $(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $< aac_common.o: aac_common.c @@ -202,8 +213,8 @@ para_audiod: @audiod_objs@ para_audioc: @audioc_objs@ $(CC) $(LDFLAGS) -o $@ @audioc_objs@ @audioc_ldflags@ -para_fade: $(fade_objs) - $(CC) $(LDFLAGS) -o $@ $(fade_objs) +para_fade: @fade_objs@ + $(CC) $(LDFLAGS) -o $@ @fade_objs@ para_server: @server_objs@ $(CC) $(LDFLAGS) -o $@ @server_objs@ @server_ldflags@ @@ -214,6 +225,9 @@ para_fsck: @fsck_objs@ para_write: @write_objs@ $(CC) $(LDFLAGS) -o $@ @write_objs@ @write_ldflags@ +para_afh: @afh_objs@ + $(CC) $(LDFLAGS) -o $@ @afh_objs@ @afh_ldflags@ + clean: rm -f *.o $(BINARIES) rm -rf man @@ -237,7 +251,7 @@ install: all man @PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2: $(tarball_add) rm -rf $(tarball_pfx).tar.bz2 $(tarball_pfx) - git-archive --format=tar --prefix=$(tarball_pfx)/ HEAD \ + git archive --format=tar --prefix=$(tarball_pfx)/ HEAD \ | tar --delete $(tarball_delete) > $(tarball_pfx).tar mkdir $(tarball_pfx) cp -r $(tarball_add) $(tarball_pfx)