X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=ggo%2Fmakefile;h=4bc29a0a284a81db80bbc47cba97defac0eb7338;hb=66b0f375732897cb76cfbefbb03ed951c4ed24ba;hp=132ea60ee83ee99ef3f4edb9923aa95c963553ba;hpb=de9a70360fcd3b5285d280ad1f229f679d453603;p=paraslash.git

diff --git a/ggo/makefile b/ggo/makefile
index 132ea60e..4bc29a0a 100644
--- a/ggo/makefile
+++ b/ggo/makefile
@@ -1,69 +1,75 @@
 module_ggo_opts := --set-version="($(PACKAGE_STRING), $(codename))"
+$(cmdline_dir):
+	mkdir -p $(cmdline_dir)
 
-grab_client.cmdline.h grab_client.cmdline.c: $(ggo_dir)/grab_client.ggo
-	gengetopt $(module_ggo_opts) \
-		-S \
-		--set-package=grab \
-		--no-handle-help \
-		--no-handle-error \
-		--no-handle-version \
-		--arg-struct-name=grab_client_args_info \
-		--file-name=$(subst .ggo,,$(<F)).cmdline \
-		--func-name $(subst .ggo,,$(<F))_cmdline_parser < $<
-
-%_recv.cmdline.h %_recv.cmdline.c: $(ggo_dir)/%_recv.ggo
-	gengetopt $(module_ggo_opts) \
+$(cmdline_dir)/%_recv.cmdline.h $(cmdline_dir)/%_recv.cmdline.c: $(ggo_dir)/%_recv.ggo | $(cmdline_dir)
+	@[ -z "$(Q)" ] || echo 'GGO $<'
+	$(Q) $(GENGETOPT) $(module_ggo_opts) \
+		--output-dir=$(cmdline_dir) \
 		--set-package=$(subst .ggo,,$(<F)) \
 		--arg-struct-name=$(subst .ggo,,$(<F))_args_info \
 		--file-name=$(subst .ggo,,$(<F)).cmdline \
 		--func-name $(subst .ggo,,$(<F))_cmdline_parser < $<
 
-%_filter.cmdline.h %_filter.cmdline.c: $(ggo_dir)/%_filter.ggo
-	gengetopt $(module_ggo_opts) \
+$(cmdline_dir)/%_filter.cmdline.h $(cmdline_dir)/%_filter.cmdline.c: $(ggo_dir)/%_filter.ggo | $(cmdline_dir)
+	@[ -z "$(Q)" ] || echo 'GGO $<'
+	$(Q) $(GENGETOPT) $(module_ggo_opts) \
+		--output-dir=$(cmdline_dir) \
 		--set-package=$(subst .ggo,,$(<F)) \
 		--arg-struct-name=$(subst .ggo,,$(<F))_args_info \
 		--file-name=$(subst .ggo,,$(<F)).cmdline \
-		--func-name $(subst _filter.ggo,,$(<F))_cmdline_parser < $<
-%_write.cmdline.h %_write.cmdline.c: $(ggo_dir)/%_write.ggo
-	gengetopt -S $(module_ggo_opts) \
+		--func-name=$(subst _filter.ggo,,$(<F))_cmdline_parser < $<
+$(cmdline_dir)/%_write.cmdline.h $(cmdline_dir)/%_write.cmdline.c: $(ggo_dir)/%_write.ggo | $(cmdline_dir)
+	@[ -z "$(Q)" ] || echo 'GGO $<'
+	$(Q) $(GENGETOPT) -S $(module_ggo_opts) \
+		--output-dir=$(cmdline_dir) \
 		--set-package=$(subst .ggo,,$(<F)) \
 		--arg-struct-name=$(subst .ggo,,$(<F))_args_info \
 		--file-name=$(subst .ggo,,$(<F)).cmdline \
 		--func-name $(subst _write.ggo,,$(<F))_cmdline_parser < $<
 
-%.cmdline.h %.cmdline.c: $(ggo_dir)/%.ggo
-	case $(<F) in client.ggo) O="--unamed-opts=command";; \
-		audioc.ggo) O="--unamed-opts=command";; \
-		fsck.ggo) O="--unamed-opts=table";; \
-		afh.ggo) O="--unamed-opts=audio_file";; \
-		recv.ggo) O="--no-handle-help";; \
-		filter.ggo) O="--no-handle-help";; \
-		write.ggo) O="--no-handle-help";; \
-		audiod.ggo) O="--no-handle-help";; \
-	esac; \
-	if test $(<F) != fsck.ggo; then O="$$O --conf-parser "; fi; \
-	gengetopt $$O \
-		--no-handle-version \
-		--file-name=$(*F).cmdline \
-		--func-name $(*F)_cmdline_parser \
-		--arg-struct-name=$(*F)_args_info \
-		--set-package="para_$(subst .cmdline,,$(*F))" \
-		--set-version="$(PACKAGE_VERSION)"  < $<
+define ggo-opts
+$(if $(filter gui,$(*F)), --no-handle-error) \
+$(if $(filter recv filter write audiod,$(*F)), --no-handle-help) \
+$(if $(filter afh,$(*F)), --unamed-opts=audio_file) \
+$(if $(filter client audioc,$(*F)), --unamed-opts=command) \
+$(if $(filter fsck,$(*F)), --unamed-opts=table, --conf-parser)\
+--output-dir=$(cmdline_dir) \
+--no-handle-version \
+--file-name=$(*F).cmdline \
+--func-name=$(*F)_cmdline_parser \
+--arg-struct-name=$(*F)_args_info \
+--set-package="para_$(*F)" \
+--set-version="$(PACKAGE_VERSION)"
+endef
+
+$(cmdline_dir)/%.cmdline.h $(cmdline_dir)/%.cmdline.c: $(ggo_dir)/%.ggo | $(cmdline_dir)
+	@[ -z "$(Q)" ] || echo 'GGO $<'
+	$(Q) $(GENGETOPT) $(ggo-opts) < $<
 
 $(ggo_dir)/server.ggo $(ggo_dir)/audiod.ggo: \
-	$(ggo_dir)/loglevel.m4 $(ggo_dir)/color.m4 \
-	$(ggo_dir)/config_file.m4 $(ggo_dir)/logfile.m4 \
-	$(ggo_dir)/daemon.m4 $(ggo_dir)/user.m4 \
-	$(ggo_dir)/group.m4
+	$(m4_ggo_dir)/loglevel.m4 $(m4_ggo_dir)/color.m4 \
+	$(m4_ggo_dir)/config_file.m4 $(m4_ggo_dir)/logfile.m4 \
+	$(m4_ggo_dir)/daemon.m4 $(m4_ggo_dir)/user.m4 \
+	$(m4_ggo_dir)/group.m4 $(m4_ggo_dir)/log_timing.m4 \
+	$(m4_ggo_dir)/config_file.m4
 
-$(ggo_dir)/afh.ggo: $(ggo_dir)/loglevel.m4
-$(ggo_dir)/audioc.ggo: $(ggo_dir)/loglevel.m4
-$(ggo_dir)/filter.ggo: $(ggo_dir)/loglevel.m4
-$(ggo_dir)/fsck.ggo: $(ggo_dir)/loglevel.m4
-$(ggo_dir)/gui.ggo: $(ggo_dir)/loglevel.m4
-$(ggo_dir)/recv.ggo: $(ggo_dir)/loglevel.m4
-$(ggo_dir)/write.ggo: $(ggo_dir)/loglevel.m4
-$(ggo_dir)/client.ggo: $(ggo_dir)/loglevel.m4 $(ggo_dir)/config_file.m4
+$(ggo_dir)/afh.ggo: $(m4_ggo_dir)/loglevel.m4
+$(ggo_dir)/audioc.ggo: \
+	$(m4_ggo_dir)/loglevel.m4 \
+	$(m4_ggo_dir)/history_file.m4 \
+	$(m4_ggo_dir)/complete.m4
+$(ggo_dir)/filter.ggo: $(m4_ggo_dir)/loglevel.m4
+$(ggo_dir)/fsck.ggo: $(m4_ggo_dir)/loglevel.m4
+$(ggo_dir)/gui.ggo: $(m4_ggo_dir)/loglevel.m4 $(m4_ggo_dir)/config_file.m4
+$(ggo_dir)/recv.ggo: $(m4_ggo_dir)/loglevel.m4
+$(ggo_dir)/write.ggo: $(m4_ggo_dir)/loglevel.m4
+$(ggo_dir)/client.ggo: \
+	$(m4_ggo_dir)/loglevel.m4 \
+	$(m4_ggo_dir)/config_file.m4 \
+	$(m4_ggo_dir)/history_file.m4 \
+	$(m4_ggo_dir)/complete.m4
 
-$(ggo_dir)/%.ggo: $(ggo_dir)/%.m4 $(ggo_dir)/header.m4
-	cd $(ggo_dir); m4 $(<F) > $(@F)
+$(ggo_dir)/%.ggo: $(m4_ggo_dir)/%.m4 $(m4_ggo_dir)/header.m4
+	@[ -z "$(Q)" ] || echo 'M4 $<'
+	$(Q) cd $(ggo_dir); m4 $(<F) > $(@F)