-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-BINDIR = @bindir@
-VARDIR = /var/paraslash
-PKGDATADIR = @datarootdir@/@PACKAGE_NAME@
-PICDIR = $(PKGDATADIR)/pics
-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 = isotropic threshold
+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 := simultaneous independence
DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
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
-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 += -DPICDIR='"$(PKGDATADIR)/pics"'
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@
+CPPFLAGS += -I/usr/local/include
+CPPFLAGS += @osl_cppflags@
BINARIES = para_server para_client para_audioc para_recv \
- para_filter para_write para_fsck @extra_binaries@
+ para_filter para_write para_afh @extra_binaries@
man_binaries := $(BINARIES)
man_pages := $(patsubst %, man/man1/%.1, $(man_binaries))
-man_pages_html := $(patsubst %, man/html/%.html, $(man_binaries))
-PICS := $(wildcard pics/paraslash/*.jpg)
-gengetopts := $(wildcard *.ggo)
-gengetopts_c := $(gengetopts:.ggo=.cmdline.c)
-gengetopts_h := $(gengetopts:.ggo=.cmdline.h)
-grutatxt := NEWS CREDITS INSTALL README FEATURES
-grutatxt_html := $(grutatxt:=.html)
-html_in := $(wildcard web/*.in.html)
-gen_html := $(subst web/,web/sync/,$(html_in))
-gen_html := $(gen_html:.in.html=.html)
-gruta_in := $(grutatxt:=.in.html)
-gruta_in := $(patsubst %,web/%,$(gruta_in))
-gruta_html := $(grutatxt:=.html)
-gruta_html := $(patsubst %,web/sync/%,$(gruta_html))
-shots := gui-2005-11-12.png para_audiod-startup.txt para_server-startup.txt
-shots := $(patsubst %,web/sync/%,$(shots))
-web_pics := web/sync/paraslash.png web/sync/paraslash.ico
-web_misc := overview.pdf versions/@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2 PUBLIC_KEY \
- key.anonymous para.css
-web_misc := $(patsubst %,web/sync/%,$(web_misc))
-web_man := web/sync/man
+man_pages_in := $(patsubst %, web/%.man.in.html, $(man_binaries))
+
+ggo_dir := ggo
+
+m4_ggos := afh audioc audiod client filter 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 \
+ 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_delete = web versions pics/screenshots pics/web .changelog_before_cvs \
- .changelog_cvs
+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)
-
-.PHONY: clean distclean maintainer-clean install html www tags doxygen gruta \
- man html_man
-all: $(BINARIES)
-www: $(gen_html) $(gruta_html) $(web_pics) $(web_misc) $(shots) $(web_man) \
- tags doxygen
-gruta: $(gen_html) $(gruta_html)
-man: $(man_pages)
-html_man: $(man_pages_html)
+tarball_add := $(ggo_generated) $(autocrap)
+tarball := @PACKAGE_TARNAME@-$(PACKAGE_VERSION).tar.bz2
-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
+.PHONY: clean distclean maintainer-clean install man tarball
+all: $(BINARIES) $(man_pages)
+man: $(man_pages)
+tarball: $(tarball)
*.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; \
- echo "$O"; 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 < $< >$@
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
man2html $< > $@
+web/%.man.in.html: man/man1/%.1
+ man2html $< | sed -e '/^<\/BODY>/,$$d' -e '1,/<\/HEAD><BODY>/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
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@
-para_fsck: @fsck_objs@
- $(CC) $(LDFLAGS) -o $@ @fsck_objs@ @fsck_ldflags@
-
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 -f *_command_list.*
+ 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 \
- $(grutatxt_html) config.h configure \
+ rm -f $(ggo_generated) *.tar.bz2 \
+ config.h configure \
config.h.in skencil/*.pdf skencil/*.ps
- rm -f *_command_list.* *.man man/man1/* man/html/*
-
+ rm -rf web_sync
install: all man
- mkdir -p $(BINDIR) $(PICDIR) $(MANDIR)
+ mkdir -p $(BINDIR) $(MANDIR)
$(install_sh) -s -m 755 $(BINARIES) $(BINDIR)
- $(install_sh) -m 644 $(PICS) $(PICDIR)
$(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
rm -f $(tarball_pfx).tar
ls -l $(tarball_pfx).tar.bz2
-
-web/%.in.html: %
- grutatxt -nb < $< > $@
-tags:
- rm -rf web/sync/HTML && gtags && htags -nF && mv HTML web/sync
-web/header2.html: web/header.html
- sed -e 's|href="|href="\.\.\/\.\./|g' \
- -e 's|SRC="|SRC="\.\.\/\.\./|g' $< > $@
-doxygen: web/header2.html
- mkdir -p web/sync/doxygen
- doxygen
-web/sync/man: html_man
- mkdir -p $@
- cp -a $(man_pages_html) $@
-web/sync/%.html: web/%.in.html web/header.html web/footer.html web/sync
- cat web/header.html $< web/footer.html > $@
-web/sync/%.png: pics/web/%.png web/sync
- cp $< $@
-web/sync/%.ico: pics/web/%.ico web/sync
- cp $< $@
-web/sync/para.css: web/para.css web/sync
- cp $< $@
-web/sync/versions/@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2: @PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2 web/sync
- cp -a versions web/sync && cp $< $@
-web/sync/overview.pdf: skencil/overview.pdf web/sync
- cp $< $@
-web/sync/%: %
- cp -a $< $@
-web/sync/%: pics/screenshots/%
- cp $< $@
-skencil/%.ps: skencil/%.sk
+%.ps: %.sk
sk2ps $< > $@
%.pdf: %.ps
ps2pdf - - < $< > $@
+
projects / paraslash.git / blobdiff