X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=05d7b3e016942b128c11a7397455b74376df6873;hp=964b41f084e97c063fe15665d3cac76b9d84c511;hb=672e27768e31a6eaa6854d4fc75ee6885db9abd8;hpb=a559f4f7cb0f10f838fb419498c591d4d9d693d8

diff --git a/Makefile.in b/Makefile.in
index 964b41f0..05d7b3e0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,278 +1,210 @@
-COPYRIGHT = Copyright (c) 1997-2006 by Andre Noll
-DISCLAIMER = This is free software with ABSOLUTELY NO WARRANTY. See COPYING for details.
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-BINDIR = @bindir@
-VARDIR = /var/paraslash
-PKGDATADIR = @datadir@/@PACKAGE_NAME@
-CONFDIR = $(PKGDATADIR)/samples
-FONTDIR = $(PKGDATADIR)/fonts
-PICDIR = $(PKGDATADIR)/pics
-MANDIR = @prefix@/share/man/man1
-
-install_sh = @install_sh@
-SSL_LIBS = @SSL_LIBS@
-SSL_LDFLAGS = @SSL_LDFLAGS@
-
-extra_binaries = @extra_binaries@
-build_date = $(shell date)
-system = $(shell uname -rs)
-cc_version = $(shell $(CC) --version | head -n 1)
-version = @PACKAGE_VERSION@
-codename = atomic duality
+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
-
-# produces lots of warnings on older debian systems with gcc-2.95.4
-# DEBUG_CPPFLAGS += -Wredundant-decls
-
+DEBUG_CPPFLAGS += -Wredundant-decls
 # produces false positives
 # DEBUG_CPPFLAGS += -Wunreachable-code
-
-# invalid options for gcc-2.95.4
-# CPPFLAGS += -Wfloat-equal
-# CPPFLAGS += -Wmissing-format-attribute
-# CPPFLAGS += -Wunused-macros
-
-# invalid option for gcc-3.3.5
-# CPPFLAGS += -Wextra
-
+# DEBUG_CPPFLAGS += -Wwrite-strings
+
+# 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
+
+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 += -DFONTDIR='"$(PKGDATADIR)/fonts"'
-CPPFLAGS += -DPICDIR='"$(PKGDATADIR)/pics"'
 CPPFLAGS += -DBUILD_DATE='"$(build_date)"'
-CPPFLAGS += -DSYSTEM='"$(system)"'
-CPPFLAGS += -DVERSION='"$(version)"'
+CPPFLAGS += -DUNAME_RS='"$(uname_rs)"'
 CPPFLAGS += -DCODENAME='"$(codename)"'
 CPPFLAGS += -DCC_VERSION='"$(cc_version)"'
 CPPFLAGS += -Werror-implicit-function-declaration
-
-BINARIES = para_server para_client para_gui para_audiod para_audioc para_recv para_filter $(extra_binaries)
-
-FONTS := $(wildcard fonts/*.png)
-PICS := $(wildcard pics/paraslash/*.jpg)
-MANS := $(wildcard doc/man/man1/*.1)
-sample_conf := $(wildcard *.conf.sample)
-gengetopts := $(wildcard *.ggo)
-gengetopts_c := $(gengetopts:.ggo=.cmdline.c)
-gengetopts_h := $(gengetopts:.ggo=.cmdline.h)
-all_c_files := $(wildcard *.c)
-c_sources := $(filter-out $(gengetopts_c), $(all_c_files))
-grutatxt := COPYING NEWS README.mysql CREDITS INSTALL README \
-	FEATURES GPL
-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
-shots += para_krell-2005-02.png para_server-startup.txt
-shots += para_slider-2004-12.png sdl_gui.jpg para_krell-2005-02.png
-shots := $(patsubst %,web/sync/%,$(shots))
-web_pics := web/sync/paraslash.png web/sync/paraslash.ico
-web_misc := demo-script overview.pdf versions/paraslash-git.tar.bz2 PUBLIC_KEY key.anonymous para.css doc
-web_misc := $(patsubst %,web/sync/%,$(web_misc))
-
-misc := bash_completion
-headers := para.h server.h SFont.h crypt.h list.h http.h send.h ortp.h rc4.h \
-	close_on_fork.h afs.h db.h gcc-compat.h recv.h filter.h audiod.h \
-	grab_client.h error.h net.h ringbuffer.h daemon.h string.h
-scripts := install-sh configure
-autocrap := Makefile.in config.h.in configure.ac autogen.sh
-tarball := web/sync/doc pics fonts $(c_sources) $(sample_conf) $(headers) \
-	$(misc) $(grutatxt) $(gengetopts) $(autocrap) $(gengetopts_c) $(gengetopts_h) \
-	$(scripts)
-
-.PHONY: clean distclean maintainer-clean install html www tags ChangeLog doxygen
-all: $(BINARIES)
-www: $(gen_html) $(gruta_html) $(web_pics) $(web_misc) $(shots) tags doxygen
-
-client_objs = client.cmdline.o client.o net.o string.o crypt.o
-gui_objs = gui.cmdline.o gui.o gui_common.o exec.o close_on_fork.o signal.o string.o gui_theme.o stat.o ringbuffer.o
-sdl_gui_objs = sdl_gui.cmdline.o SFont.o sdl_gui.o gui_common.o exec.o close_on_fork.o string.o stat.o
-dbadm_objs = dbadm.o exec.o close_on_fork.o string.o
-fade_objs = fade.cmdline.o fade.o exec.o close_on_fork.o string.o
-krell_objs = krell.o string.o
-slider_objs = slider.o string.o
-audioc_objs = audioc.cmdline.o audioc.o string.o net.o
-play_objs = play.cmdline.o play.o time.o
+CPPFLAGS += -Wmissing-format-attribute
+CPPFLAGS += -Wmissing-noreturn
+CPPFLAGS += -Wunused-macros
+CPPFLAGS += -Wbad-function-cast
+CPPFLAGS += -fno-strict-aliasing
+CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F)
+CPPFLAGS += @SSL_CPPFLAGS@
+CPPFLAGS += @ncurses_cppflags@
+CPPFLAGS += @arch_cppflags@
+CPPFLAGS += -I/usr/local/include
+
+BINARIES = para_server para_client para_audioc para_recv \
+	para_filter para_write 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))
+
+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 .changelog_before_cvs .changelog_cvs .gitignore
+tarball_delete := $(patsubst %,$(tarball_pfx)/%,$(tarball_delete))
+tarball_add := $(ggo_generated) $(autocrap)
+tarball := @PACKAGE_TARNAME@-$(PACKAGE_VERSION).tar.bz2
+
+.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
+include $(ggo_dir)/makefile
 
-V := ($(TGZ_PREFIX)@PACKAGE_STRING@, $(codename))\n$(COPYRIGHT)\n$(DISCLAIMER)
-module_ggo_opts := --set-version="" --set-package=""
-
-grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
-	gengetopt $(module_ggo_opts) \
-		--no-handle-error \
-		--no-handle-help \
-		--arg-struct-name=grab_client_args_info \
-		--file-name=$(subst .ggo,,$<).cmdline \
-		--func-name $(subst .ggo,,$<)_cmdline_parser < $<
-	grep -v 'fprintf\ *(stderr' $(subst .ggo,,$<).cmdline.c > $(subst .ggo,,$<).tmp
-	mv $(subst .ggo,,$<).tmp $(subst .ggo,,$<).cmdline.c
-	ggo_help GRAB_HELP_TXT < grab_client.ggo >> $(subst .ggo,,$<).cmdline.h
-
-%_recv.cmdline.h %_recv.cmdline.c: %_recv.ggo
-	gengetopt $(module_ggo_opts) \
-		--file-name=$(subst .ggo,,$<).cmdline \
-		--func-name $(subst .ggo,,$<)_cmdline_parser < $<
-
-%_filter.cmdline.h %_filter.cmdline.c: %_filter.ggo
-	gengetopt $(module_ggo_opts) \
-		--file-name=$(subst .ggo,,$<).cmdline \
-		--func-name $(subst _filter.ggo,,$<)_cmdline_parser < $<
-
-%.cmdline.h %.cmdline.c: %.ggo
-	case $< in client.ggo) O="--unamed-opts=command";; \
-		audioc.ggo) O="--unamed-opts=command";; \
-	esac; \
-	gengetopt $$O --conf-parser --file-name=$(*F).cmdline --set-package="para_$(subst .cmdline,,$(*F))" --set-version="$V"  < $<
-
-ortp_send.o: ortp_send.c
-	$(CC) -c -Wall -o $@ -g @GLIB_CFLAGS@ $<
-ortp_recv.o: ortp_recv.c
-	$(CC) -c -Wall -o $@ -g @GLIB_CFLAGS@ $<
+%_command_list.c %_command_list.h: %.cmd
+	./command_util.sh c < $< >$@
+	./command_util.sh h < $< >$(@:%.c=%.h)
+
+%_command_list.man: %.cmd
+	./command_util.sh man < $< > $@
+
+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="-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 -h --detailed-help -N -i audiod_command_list.man ./para_audiod > $@
+
+man/man1/%.1: %
+	mkdir -p man/man1
+	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' > $@
 
-para_recv: @recv_objs@
-	$(CC) @recv_objs@ -o $@ @recv_ldflags@
 
-slider.o: slider.c
-	$(CC) -c -Wall -o $@ -g @GLIB_CFLAGS@  @GTK_CFLAGS@ $<
+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@ $<
 
-krell.o: krell.c
-	$(CC) -Wall -O -g -fPIC @GTK_CFLAGS@ -c -o $@ krell.c
+mp3dec_filter.o: mp3dec_filter.c
+	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @mad_cppflags@ $<
+
+aacdec_filter.o: aacdec_filter.c
+	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
+
+aac_common.o: aac_common.c
+	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
+
+aac_afh.o: aac_afh.c
+	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
 
 %.cmdline.o: %.cmdline.c
 	$(CC) -c $(CPPFLAGS) $<
+
 %.o: %.c
 	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) $<
 
-para_filter: @filter_objs@
-	$(CC) @filter_objs@ -o $@ @filter_ldflags@
+para_recv: @recv_objs@
+	$(CC) $(LDFLAGS) @recv_objs@ -o $@ @recv_ldflags@
 
-para_slider: $(slider_objs)
-	$(CC) $(slider_objs) -o $@ @GTK_LIBS@ @GLIB_LIBS@ -lzmw
+para_filter: @filter_objs@
+	$(CC) $(LDFLAGS) @filter_objs@ -o $@ @filter_ldflags@
 
-para_client: $(client_objs)
-	$(CC) -o $@ $(client_objs) $(SSL_LDFLAGS) -lreadline -lncurses $(SSL_LIBS)
+para_client: @client_objs@
+	$(CC) $(LDFLAGS) -o $@ @client_objs@ @client_ldflags@
 
-para_gui: $(gui_objs)
-	$(CC) -o $@ $(gui_objs) -lncurses
+para_gui: @gui_objs@
+	$(CC) $(LDFLAGS) -o $@ @gui_objs@ -lncurses
 
 para_audiod: @audiod_objs@
-	$(CC) -o $@ @audiod_objs@ @audiod_ldflags@
-
-para_audioc: $(audioc_objs)
-	$(CC) -o $@ $(audioc_objs)
+	$(CC) $(LDFLAGS) -o $@ @audiod_objs@ @audiod_ldflags@
 
-para_dbadm: $(dbadm_objs)
-	$(CC) -o $@ $(dbadm_objs) -lncurses -lmenu
+para_audioc: @audioc_objs@
+	$(CC) $(LDFLAGS) -o $@ @audioc_objs@ @audioc_ldflags@
 
-para_fade: $(fade_objs)
-	$(CC) -o $@ $(fade_objs)
+para_fade: @fade_objs@
+	$(CC) $(LDFLAGS) -o $@ @fade_objs@ @fade_ldflags@
 
 para_server: @server_objs@
-	$(CC) -o $@ @server_objs@  @server_ldflags@
-
-para_sdl_gui: $(sdl_gui_objs)
-	$(CC) -o $@ $(sdl_gui_objs) -lSDL_image
+	$(CC) $(LDFLAGS) -o $@ @server_objs@  @server_ldflags@
 
-para_play: $(play_objs)
-	$(CC) -o $@ $(play_objs) -lasound
+para_write: @write_objs@
+	$(CC) $(LDFLAGS) -o $@ @write_objs@ @write_ldflags@
 
-para_compress: $(compress_objs)
-	$(CC) -o $@ $(compress_objs)
-
-para_krell.so: $(krell_objs)
-	$(CC) -Wall -fPIC @GTK_CFLAGS@ krell.o -o $@ @GTK_LIBS@ -shared
+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) ChangeLog* config.h configure \
+	rm -f $(ggo_generated) *.tar.bz2 \
+		config.h configure \
 		config.h.in skencil/*.pdf skencil/*.ps
-	rm -rf doc
-
-install: all
-	umask 022 && \
-	mkdir -p $(BINDIR) $(VARDIR) $(VARDIR)/fifo && \
-	$(install_sh) -s -m 755 $(BINARIES) $(BINDIR) && \
-	mkdir -p $(CONFDIR) && \
-	$(install_sh) -m 644 bash_completion $(sample_conf) $(CONFDIR)
-	mkdir -p $(FONTDIR) && \
-	$(install_sh) -m 644 $(FONTS) $(FONTDIR) && \
-	mkdir -p $(PICDIR) && \
-	$(install_sh) -m 644 $(PICS) $(PICDIR) && \
-	mkdir -p $(MANDIR) && \
-	$(install_sh) -m 644 $(MANS) $(MANDIR)
-
-
-@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2: all $(gengetopts_c) $(tarball)
-	dir=@PACKAGE_TARNAME@-@PACKAGE_VERSION@ &&\
-	mkdir -p $${dir} && \
-	cp -a $(tarball) $${dir} && \
-	find $${dir} -name "CVS" | xargs rm -rf && \
-	tar cpjf $@ $${dir} && \
-	rm -rf $${dir} && \
-	ls -l $@
-
-ChangeLog:
-	para_util changelog > $@
-web/%.in.html: %
-	grutatxt -nb < $< > $@
-tags:
-	rm -rf web/sync/HTML && gtags && htags -nF && mv HTML web/sync
-web/sync/doc:
-	para_util doc
-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/doxygen:
-	mkdir -p $@
-web/sync/doxygen/index.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/demo-script: scripts/demo-script web/sync
-	cp $< $@
-web/sync/para.css: web/para.css web/sync
-	cp $< $@
-web/sync/versions/paraslash-git.tar.bz2: paraslash-git.tar.bz2 web/sync
-	cp -a versions web/sync && cp $< $@
-web/sync/overview.pdf: skencil/overview.pdf web/sync
-	cp $< $@
-web/sync/%: %
-	cp $< $@
-web/sync/%: pics/screenshots/%
-	cp $< $@
-skencil/%.ps: skencil/%.sk
+	rm -rf web_sync
+
+install: all man
+	mkdir -p $(BINDIR) $(MANDIR)
+	$(install_sh) -s -m 755 $(BINARIES) $(BINDIR)
+	$(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)
+	rm -rf $(tarball_pfx).tar.bz2 $(tarball_pfx)
+	git archive --format=tar --prefix=$(tarball_pfx)/ HEAD \
+		| tar --delete $(tarball_delete) > $(tarball_pfx).tar
+	mkdir $(tarball_pfx)
+	cp -r $(tarball_add) $(tarball_pfx)
+	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
+%.ps: %.sk
 	sk2ps $< > $@
 %.pdf: %.ps
 	ps2pdf - - < $< > $@
+