X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=2a803f3bcd217f5cbac2780fc3ab1f8be4426b85;hp=a243b7bbede440000ecc188f0d1149b997fb699e;hb=b43af255d4514b68c98b23fb220306cf5ba1df60;hpb=ee41d31b46e6c3213b799d79fb65a5351aa9d221

diff --git a/Makefile.in b/Makefile.in
index a243b7bb..2a803f3b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,7 +16,7 @@ install_sh = @install_sh@
 build_date = $(shell date)
 system = $(shell uname -rs)
 cc_version = $(shell $(CC) --version | head -n 1)
-codename = transient singularity
+codename = inductive resonance
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 
@@ -73,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
@@ -148,6 +148,74 @@ grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
 		--set-package="para_$(subst .cmdline,,$(*F))" \
 		--set-version="$V"  < $<
 
+server_command_list.c: server.cmd server_command_list.h
+	echo '#include "server.h"' > $@
+	echo '#include "user_list.h"' >> $@
+	echo '#include "server_command_list.h"' >> $@
+	echo 'struct server_command cmd_struct[] = {' >>$@
+	./command_util.sh array < $< >>$@
+	echo '{.name = NULL}};' >> $@
+server_command_list.h: server.cmd
+	echo 'extern struct server_command cmd_struct[];' > $@
+	./command_util.sh proto < $< >> $@
+
+mysql_selector_command_list.c: mysql_selector.cmd mysql_selector_command_list.h
+	echo '#include "server.h"' > $@
+	echo '#include "user_list.h"' >> $@
+	echo '#include "mysql_selector_command_list.h"' >> $@
+	echo 'struct server_command cmds[] = {' >>$@
+	./command_util.sh array < $< >>$@
+	echo '{.name = NULL}};' >> $@
+mysql_selector_command_list.h: mysql_selector.cmd
+	echo 'extern struct server_command cmds[];' > $@
+	./command_util.sh proto < $< >> $@
+
+random_selector_command_list.c: random_selector.cmd random_selector_command_list.h
+	echo '#include "server.h"' > $@
+	echo '#include "user_list.h"' >> $@
+	echo '#include "random_selector_command_list.h"' >> $@
+	echo 'struct server_command random_selector_cmds[] = {' >>$@
+	./command_util.sh array < $< >>$@
+	echo '{.name = NULL}};' >> $@
+random_selector_command_list.h: random_selector.cmd
+	echo 'extern struct server_command random_selector_cmds[];' > $@
+	./command_util.sh proto < $< >> $@
+
+playlist_selector_command_list.c: playlist_selector.cmd playlist_selector_command_list.h
+	echo '#include "server.h"' > $@
+	echo '#include "user_list.h"' >> $@
+	echo '#include "playlist_selector_command_list.h"' >> $@
+	echo 'struct server_command playlist_selector_cmds[] = {' >>$@
+	./command_util.sh array < $< >>$@
+	echo '{.name = NULL}};' >> $@
+playlist_selector_command_list.h: playlist_selector.cmd
+	echo 'extern struct server_command playlist_selector_cmds[];' > $@
+	./command_util.sh proto < $< >> $@
+
+audiod_command_list.c: audiod.cmd audiod_command_list.h
+	echo '#include "list.h"' > $@
+	echo '#include "para.h"' >> $@
+	echo '#include "sched.h"' >> $@
+	echo '#include "audiod.h"' >> $@
+	echo '#include "audiod_command_list.h"' >> $@
+	echo 'struct audiod_command cmds[] = {' >>$@
+	./command_util.sh array < $< >>$@
+	echo '{.name = NULL}};' >> $@
+audiod_command_list.h: audiod.cmd
+	echo 'extern struct audiod_command cmds[];' > $@
+	./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@ $<
 
@@ -214,7 +282,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 && \
@@ -241,7 +309,7 @@ install: all
 
 @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)
@@ -275,8 +343,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