X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=d04d0ea3f2ad2a013d86b2454baeba4c9844d98d;hp=5c76ff0e5b7425a0011d9370da6db121e9ff91f9;hb=b764977e54d34650a4529cc05abb4ca7603735f7;hpb=295c14126da50e77a14fe075b71d885a7b469b4a diff --git a/Makefile.in b/Makefile.in index 5c76ff0e..d04d0ea3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,17 +1,19 @@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -BINDIR = @bindir@ -VARDIR = /var/paraslash -PKGDATADIR = @datarootdir@/@PACKAGE_NAME@ -MANDIR = @datarootdir@/man/man1 - -install_sh = @install_sh@ - -build_date = $(shell date) -system = $(shell uname -rs) -cc_version = $(shell $(CC) --version | head -n 1) -codename = solar saturation +prefix := @prefix@ +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_sh := @install_sh@ + +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 := imaginary radiation DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W DEBUG_CPPFLAGS += -Wredundant-decls @@ -22,107 +24,69 @@ 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 -# uncomment this if your compiler supports it -# LDFLAGS += -Wl,--gc-sections - +ifeq ($(uname_s),Linux) + CPPFLAGS += -fdata-sections -ffunction-sections + LDFLAGS += -Wl,--gc-sections + CPPFLAGS += -Wstrict-prototypes + CPPFLAGS += -Wshadow +endif CPPFLAGS += -Os CPPFLAGS += -Wall CPPFLAGS += -Wuninitialized -CPPFLAGS += -Wstrict-prototypes CPPFLAGS += -Wchar-subscripts CPPFLAGS += -Wformat-security CPPFLAGS += -DBINDIR='"$(BINDIR)"' CPPFLAGS += -DBUILD_DATE='"$(build_date)"' -CPPFLAGS += -DSYSTEM='"$(system)"' +CPPFLAGS += -DUNAME_RS='"$(uname_rs)"' CPPFLAGS += -DCODENAME='"$(codename)"' CPPFLAGS += -DCC_VERSION='"$(cc_version)"' CPPFLAGS += -Werror-implicit-function-declaration CPPFLAGS += -Wmissing-format-attribute +CPPFLAGS += -Wmissing-noreturn CPPFLAGS += -Wunused-macros -CPPFLAGS += -Wshadow CPPFLAGS += -Wbad-function-cast -CPPFLAGS += -fdata-sections -ffunction-sections +CPPFLAGS += -fno-strict-aliasing CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F) CPPFLAGS += @SSL_CPPFLAGS@ 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 + +m4_ggos := afh audioc audiod client filter fsck gui recv server write +all_ggos := $(m4_ggos) dccp_recv oggdec_filter alsa_write oss_write fade http_recv \ + osx_write udp_recv amp_filter compress_filter file_write \ + grab_client mp3dec_filter +ggo_generated := $(addsuffix .cmdline.c, $(all_ggos)) $(addsuffix .cmdline.h, $(all_ggos)) \ + $(addsuffix .ggo, $(addprefix $(ggo_dir)/,$(m4_ggos))) + autocrap := config.h.in configure -tarball_pfx := @PACKAGE_TARNAME@-@PACKAGE_VERSION@ +tarball_pfx := @PACKAGE_TARNAME@-$(PACKAGE_VERSION) tarball_delete = web versions pics .changelog_before_cvs .changelog_cvs .gitignore tarball_delete := $(patsubst %,$(tarball_pfx)/%,$(tarball_delete)) -tarball_add := $(gengetopts_c) $(gengetopts_h) $(autocrap) -tarball := @PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2 +tarball_add := $(ggo_generated) $(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 - gengetopt $(module_ggo_opts) \ - -S \ - --set-package=grab \ - --no-handle-help \ - --no-handle-error \ - --no-handle-version \ - --arg-struct-name=grab_client_args_info \ - --file-name=$(subst .ggo,,$<).cmdline \ - --func-name $(subst .ggo,,$<)_cmdline_parser < $< - -%_recv.cmdline.h %_recv.cmdline.c: %_recv.ggo - gengetopt $(module_ggo_opts) \ - --set-package=$(subst .ggo,,$<) \ - --arg-struct-name=$(subst .ggo,,$<)_args_info \ - --file-name=$(subst .ggo,,$<).cmdline \ - --func-name $(subst .ggo,,$<)_cmdline_parser < $< - -%_filter.cmdline.h %_filter.cmdline.c: %_filter.ggo - gengetopt $(module_ggo_opts) \ - --set-package=$(subst .ggo,,$<) \ - --arg-struct-name=$(subst .ggo,,$<)_args_info \ - --file-name=$(subst .ggo,,$<).cmdline \ - --func-name $(subst _filter.ggo,,$<)_cmdline_parser < $< -%_write.cmdline.h %_write.cmdline.c: %_write.ggo - gengetopt -S $(module_ggo_opts) \ - --set-package=$(subst .ggo,,$<) \ - --arg-struct-name=$(subst .ggo,,$<)_args_info \ - --file-name=$(subst .ggo,,$<).cmdline \ - --func-name $(subst _write.ggo,,$<)_cmdline_parser < $< - -%.cmdline.h %.cmdline.c: %.ggo - case $< in client.ggo) O="--unamed-opts=command";; \ - audioc.ggo) O="--unamed-opts=command";; \ - fsck.ggo) O="--unamed-opts=table";; \ - esac; \ - if test $< != fsck.ggo; then O="$$O --conf-parser "; fi; \ - gengetopt $$O \ - --no-handle-version \ - --file-name=$(*F).cmdline \ - --func-name $(*F)_cmdline_parser \ - --arg-struct-name=$(*F)_args_info \ - --set-package="para_$(subst .cmdline,,$(*F))" \ - --set-version="@PACKAGE_VERSION@" < $< +include $(ggo_dir)/makefile %_command_list.c %_command_list.h: %.cmd ./command_util.sh c < $< >$@ @@ -134,16 +98,16 @@ grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo server_command_lists = server_command_list.man afs_command_list.man man/man1/para_server.1: para_server $(server_command_lists) mkdir -p man/man1 - opts="-N `for i in $(server_command_lists); do echo "-i $$i"; done`"; \ + opts="-h --detailed-help -N `for i in $(server_command_lists); do printf "%s\n" "-i $$i"; done`"; \ help2man $$opts ./para_server > $@ 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/%.1: % mkdir -p man/man1 - help2man -N ./$< > $@ + help2man -h --detailed-help -N ./$< > $@ man/html/%.html: man/man1/%.1 mkdir -p man/html @@ -153,21 +117,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 @@ -200,8 +158,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@ @fade_ldflags@ para_server: @server_objs@ $(CC) $(LDFLAGS) -o $@ @server_objs@ @server_ldflags@ @@ -212,15 +170,19 @@ 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 distclean: clean rm -f Makefile autoscan.log config.status config.log && \ rm -rf web/sync/* autom4te.cache aclocal.m4 rm -f GPATH GRTAGS GSYMS GTAGS maintainer-clean: distclean - rm -f $(gengetopts_c) $(gengetopts_h) *.tar.bz2 \ + rm -f $(ggo_generated) *.tar.bz2 \ config.h configure \ config.h.in skencil/*.pdf skencil/*.ps rm -f *_command_list.* *.man man/man1/* @@ -232,14 +194,12 @@ install: all man $(install_sh) -m 644 $(man_pages) $(MANDIR) mkdir -p $(VARDIR) >/dev/null 2>&1 || true # not fatal, so don't complain -@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2: $(tarball_add) $(man_pages) +@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) - mkdir -p $(tarball_pfx)/man/man1 - cp -r $(man_pages) $(tarball_pfx)/man/man1 tar rf $(tarball_pfx).tar $(tarball_pfx)/* rm -rf $(tarball_pfx) bzip2 -9 $(tarball_pfx).tar