X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=bb0488082d4d3a0d4b328aa7fb0d38c22f6ce8c3;hp=ed887fa4ba7ddaee7da86a7f809ec66177ff58b2;hb=e090f7343634d5f68acf961367ee256d0bf831d7;hpb=27638103f249ffbe9768603b9baff199950fd9f6

diff --git a/Makefile.in b/Makefile.in
index ed887fa4..bb048808 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,21 +6,17 @@ exec_prefix = @exec_prefix@
 
 BINDIR = @bindir@
 VARDIR = /var/paraslash
-PKGDATADIR = @datadir@/@PACKAGE_NAME@
+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 = oriented abstraction
+codename = inductive resonance
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 
@@ -45,14 +41,14 @@ 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 para_write $(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)
@@ -77,7 +73,7 @@ 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 := overview.pdf versions/paraslash-git.tar.bz2 PUBLIC_KEY key.anonymous para.css doc
 web_misc := $(patsubst %,web/sync/%,$(web_misc))
 
 autocrap := config.h.in configure
@@ -141,10 +137,55 @@ grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
 		--func-name $(subst _write.ggo,,$<)_cmdline_parser < $<
 
 %.cmdline.h %.cmdline.c: %.ggo
-	case $< in client.ggo) O="--unamed-opts=command --arg-struct-name=$(subst .ggo,,$<)_args_info";; \
+	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"  < $<
+
+server_command_list.c: server.cmd server_command_list.h
+	./command_util.sh array < $< >>$@
+server_command_list.h: server.cmd
+	./command_util.sh proto < $< >> $@
+
+mysql_selector_command_list.c: mysql_selector.cmd mysql_selector_command_list.h
+	./command_util.sh array < $< >>$@
+mysql_selector_command_list.h: mysql_selector.cmd
+	./command_util.sh proto < $< >> $@
+
+random_selector_command_list.c: random_selector.cmd random_selector_command_list.h
+	./command_util.sh array < $< >>$@
+random_selector_command_list.h: random_selector.cmd
+	./command_util.sh proto < $< >> $@
+
+playlist_selector_command_list.c: playlist_selector.cmd playlist_selector_command_list.h
+	./command_util.sh array < $< >>$@
+playlist_selector_command_list.h: playlist_selector.cmd
+	./command_util.sh proto < $< >> $@
+
+audiod_command_list.c: audiod.cmd audiod_command_list.h
+	./command_util.sh array < $< >>$@
+audiod_command_list.h: audiod.cmd
+	./command_util.sh proto < $< >> $@
+
+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
+	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @oggvorbis_cppflags@ $<
+ogg_afh.o: ogg_afh.c
+	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @oggvorbis_cppflags@ $<
+
+mp3dec.o: mp3dec.c
+	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @mad_cppflags@ $<
 
 aacdec.o: aacdec.c
 	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
@@ -209,7 +250,7 @@ para_krell.so: $(krell_objs)
 	$(CC) -Wall -fPIC @GTK_CFLAGS@ krell.o -o $@ @GTK_LIBS@ -shared
 
 clean:
-	rm -f *.o $(BINARIES)
+	rm -f *.o $(BINARIES) *_command_list.*
 
 distclean: clean
 	rm -f Makefile autoscan.log config.status config.log && \
@@ -224,18 +265,19 @@ maintainer-clean: distclean
 
 install: all
 	umask 022 && \
-	mkdir -p $(BINDIR) $(VARDIR) && \
+	mkdir -p $(BINDIR) && \
 	$(install_sh) -s -m 755 $(BINARIES) $(BINDIR) && \
 	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)
+	$(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
+	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 c doc/man | (cd $(tarball_pfx); tar x)
@@ -269,8 +311,6 @@ 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