X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=f7c7f1be4e65a87dc6b5b0d8fbb21232911e265f;hp=c65c2d81ccb82b87fd08e9f84d2abd2a9fffe8a1;hb=d7f72444e863fb5aae145d4e720cd71dc03578b0;hpb=959d66719258a7b3d5028e5e6770972768621a4f

diff --git a/Makefile.in b/Makefile.in
index c65c2d81..f7c7f1be 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -91,9 +91,8 @@ tarball_add := $(gengetopts_c) $(gengetopts_h) $(autocrap)
 
 .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
+www: $(gen_html) $(gruta_html) $(web_pics) $(web_misc) $(shots) tags doxygen doc
 
-client_objs = client.cmdline.o client.o net.o string.o crypt.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
@@ -111,6 +110,7 @@ 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 \
@@ -132,6 +132,12 @@ grab_client.cmdline.h grab_client.cmdline.c: grab_client.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";; \
@@ -139,6 +145,15 @@ grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
 	esac; \
 	gengetopt $$O --conf-parser --file-name=$(*F).cmdline --set-package="para_$(subst .cmdline,,$(*F))" --set-version="$V"  < $<
 
+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@
 
@@ -148,6 +163,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
@@ -159,8 +177,8 @@ 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) $(SSL_LIBS)
+para_client: @client_objs@
+	$(CC) -o $@ @client_objs@ @client_ldflags@
 
 para_gui: @gui_objs@
 	$(CC) -o $@ @gui_objs@ -lncurses
@@ -240,8 +258,8 @@ web/header2.html: web/header.html
 doxygen: web/header2.html
 	mkdir -p web/sync/doxygen
 	doxygen
-web/sync/doc/man:
-	mkdir -p $@
+web/sync/doc: doc
+	cp -a $< $@
 web/sync/doxygen:
 	mkdir -p $@
 web/sync/%.html: web/%.in.html web/header.html web/footer.html web/sync
@@ -259,7 +277,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