X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=ed887fa4ba7ddaee7da86a7f809ec66177ff58b2;hp=e22149452f71ecd4ffa3fe52bb1a274bfc451c4f;hb=639a90049f74b4ce528376afe8ec8e84edf16208;hpb=55f0f9461990455656bef7a36b0f963e3d676653

diff --git a/Makefile.in b/Makefile.in
index e2214945..ed887fa4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -89,18 +89,18 @@ tarball_delete = web versions pics/screenshots pics/web .changelog_before_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
+.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 doc
+gruta: $(gen_html) $(gruta_html)
+
 
-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
 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 fd.o
 
 *.o: para.h config.h gcc-compat.h
 
@@ -111,6 +111,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,9 +133,15 @@ 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";; \
+	case $< in client.ggo) O="--unamed-opts=command --arg-struct-name=$(subst .ggo,,$<)_args_info";; \
 		audioc.ggo) O="--unamed-opts=command";; \
 	esac; \
 	gengetopt $$O --conf-parser --file-name=$(*F).cmdline --set-package="para_$(subst .cmdline,,$(*F))" --set-version="$V"  < $<
@@ -171,8 +178,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
@@ -180,8 +187,8 @@ para_gui: @gui_objs@
 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
@@ -241,7 +248,7 @@ install: all
 ChangeLog:
 	para_util changelog > $@
 web/%.in.html: %
-	grutatxt -nb < $< > $@
+	grutatxt -nb  < $< > $@
 tags:
 	rm -rf web/sync/HTML && gtags && htags -nF && mv HTML web/sync
 doc: