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

diff --git a/Makefile.in b/Makefile.in
index 964b41f0..7d692a7e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,35 +6,26 @@ exec_prefix = @exec_prefix@
 
 BINDIR = @bindir@
 VARDIR = /var/paraslash
-PKGDATADIR = @datadir@/@PACKAGE_NAME@
-CONFDIR = $(PKGDATADIR)/samples
+PKGDATADIR = @datarootdir@/@PACKAGE_NAME@
 FONTDIR = $(PKGDATADIR)/fonts
 PICDIR = $(PKGDATADIR)/pics
-MANDIR = @prefix@/share/man/man1
+MANDIR = @datarootdir@/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
+codename = transient singularity
 
 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
+#CPPFLAGS += -Wwrite-strings
 
 # invalid option for gcc-3.3.5
 # CPPFLAGS += -Wextra
@@ -50,17 +41,18 @@ CPPFLAGS += -DFONTDIR='"$(PKGDATADIR)/fonts"'
 CPPFLAGS += -DPICDIR='"$(PKGDATADIR)/pics"'
 CPPFLAGS += -DBUILD_DATE='"$(build_date)"'
 CPPFLAGS += -DSYSTEM='"$(system)"'
-CPPFLAGS += -DVERSION='"$(version)"'
 CPPFLAGS += -DCODENAME='"$(codename)"'
 CPPFLAGS += -DCC_VERSION='"$(cc_version)"'
 CPPFLAGS += -Werror-implicit-function-declaration
+CPPFLAGS += -Wmissing-format-attribute
+CPPFLAGS += -Wunused-macros
+CPPFLAGS += -Wshadow
 
-BINARIES = para_server para_client para_gui para_audiod para_audioc para_recv para_filter $(extra_binaries)
+BINARIES = para_server para_client para_gui para_audioc para_recv para_filter para_write @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)
@@ -84,68 +76,95 @@ 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
+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_delete := $(patsubst %,$(tarball_pfx)/%,$(tarball_delete))
+tarball_add := $(gengetopts_c) $(gengetopts_h) $(autocrap)
+
+.PHONY: clean distclean maintainer-clean install html www tags ChangeLog doxygen gruta
 all: $(BINARIES)
-www: $(gen_html) $(gruta_html) $(web_pics) $(web_misc) $(shots) tags doxygen
+www: $(gen_html) $(gruta_html) $(web_pics) $(web_misc) $(shots) tags doxygen doc
+gruta: $(gen_html) $(gruta_html)
 
-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
+
+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 fd.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
+fade_objs = fade.cmdline.o fade.o exec.o close_on_fork.o string.o fd.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
 
 *.o: para.h config.h gcc-compat.h
 
 include Makefile.deps
 
 V := ($(TGZ_PREFIX)@PACKAGE_STRING@, $(codename))\n$(COPYRIGHT)\n$(DISCLAIMER)
-module_ggo_opts := --set-version="" --set-package=""
+module_ggo_opts := --set-version="(@PACKAGE_STRING@, $(codename))"
 
 grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
 	gengetopt $(module_ggo_opts) \
-		--no-handle-error \
+		-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 < $<
-	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) \
+		--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";; \
 	esac; \
-	gengetopt $$O --conf-parser --file-name=$(*F).cmdline --set-package="para_$(subst .cmdline,,$(*F))" --set-version="$V"  < $<
+	gengetopt $$O \
+		--conf-parser \
+		--file-name=$(*F).cmdline \
+		--func-name $(*F)_cmdline_parser \
+		--arg-struct-name=$(*F)_args_info \
+		--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@ $<
+	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ortp_cppflags@ $<
+
+ortp_send.o: ortp_send.c
+	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ortp_cppflags@ $<
+
+mp3dec.o: mp3dec.c
+	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @mad_cppflags@ $<
+
+aacdec.o: aacdec.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@ $<
 
 para_recv: @recv_objs@
 	$(CC) @recv_objs@ -o $@ @recv_ldflags@
@@ -156,6 +175,9 @@ slider.o: slider.c
 krell.o: krell.c
 	$(CC) -Wall -O -g -fPIC @GTK_CFLAGS@ -c -o $@ krell.c
 
+mysql_selector.o: mysql_selector.c
+	$(CC)  -Wall -O -g @mysql_cppflags@ -c -o $@ $<
+
 %.cmdline.o: %.cmdline.c
 	$(CC) -c $(CPPFLAGS) $<
 %.o: %.c
@@ -167,17 +189,17 @@ para_filter: @filter_objs@
 para_slider: $(slider_objs)
 	$(CC) $(slider_objs) -o $@ @GTK_LIBS@ @GLIB_LIBS@ -lzmw
 
-para_client: $(client_objs)
-	$(CC) -o $@ $(client_objs) $(SSL_LDFLAGS) -lreadline -lncurses $(SSL_LIBS)
+para_client: @client_objs@
+	$(CC) -o $@ @client_objs@ @client_ldflags@
 
-para_gui: $(gui_objs)
-	$(CC) -o $@ $(gui_objs) -lncurses
+para_gui: @gui_objs@
+	$(CC) -o $@ @gui_objs@ -lncurses
 
 para_audiod: @audiod_objs@
 	$(CC) -o $@ @audiod_objs@ @audiod_ldflags@
 
-para_audioc: $(audioc_objs)
-	$(CC) -o $@ $(audioc_objs)
+para_audioc: @audioc_objs@
+	$(CC) -o $@ @audioc_objs@
 
 para_dbadm: $(dbadm_objs)
 	$(CC) -o $@ $(dbadm_objs) -lncurses -lmenu
@@ -191,11 +213,8 @@ para_server: @server_objs@
 para_sdl_gui: $(sdl_gui_objs)
 	$(CC) -o $@ $(sdl_gui_objs) -lSDL_image
 
-para_play: $(play_objs)
-	$(CC) -o $@ $(play_objs) -lasound
-
-para_compress: $(compress_objs)
-	$(CC) -o $@ $(compress_objs)
+para_write: @write_objs@
+	$(CC) -o $@ @write_objs@ @write_ldflags@
 
 para_krell.so: $(krell_objs)
 	$(CC) -Wall -fPIC @GTK_CFLAGS@ krell.o -o $@ @GTK_LIBS@ -shared
@@ -216,34 +235,35 @@ maintainer-clean: distclean
 
 install: all
 	umask 022 && \
-	mkdir -p $(BINDIR) $(VARDIR) $(VARDIR)/fifo && \
+	mkdir -p $(BINDIR) && \
 	$(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 $@
+	$(install_sh) -m 644 $(MANS) $(MANDIR) \
+	mkdir -p $(VARDIR) > /dev/null 2>&1 || exit 0
+
+@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2: $(tarball_add) doc
+	rm -f $(tarball_pfx).tar.bz2
+	git-tar-tree HEAD $(tarball_pfx) | tar --delete $(tarball_delete) > $(tarball_pfx).tar
+	mkdir $(tarball_pfx)
+	cp -r $(tarball_add) $(tarball_pfx)
+	tar c doc/man | (cd $(tarball_pfx); tar x)
+	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
 
 ChangeLog:
 	para_util changelog > $@
 web/%.in.html: %
-	grutatxt -nb < $< > $@
+	grutatxt -nb  < $< > $@
 tags:
 	rm -rf web/sync/HTML && gtags && htags -nF && mv HTML web/sync
-web/sync/doc:
+doc:
 	para_util doc
 web/header2.html: web/header.html
 	sed -e 's|href="|href="\.\.\/\.\./|g' \
@@ -251,9 +271,10 @@ web/header2.html: web/header.html
 doxygen: web/header2.html
 	mkdir -p web/sync/doxygen
 	doxygen
+web/sync/doc: doc
+	cp -a $< $@
 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
@@ -269,7 +290,7 @@ web/sync/versions/paraslash-git.tar.bz2: paraslash-git.tar.bz2 web/sync
 web/sync/overview.pdf: skencil/overview.pdf web/sync
 	cp $< $@
 web/sync/%: %
-	cp $< $@
+	cp -a $< $@
 web/sync/%: pics/screenshots/%
 	cp $< $@
 skencil/%.ps: skencil/%.sk