X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=8921a3c67a993536616b23d32ed01f17d51e1204;hp=fc0ffa487cdb0848f5ea924bf706e59d8907a35a;hb=b6100d88b5a03e824991b4a5bfd90b0e951e8d2b;hpb=8221397af24a2df3c2edbc889847ce0ab15eb3e0

diff --git a/Makefile.in b/Makefile.in
index fc0ffa48..8921a3c6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,7 +13,7 @@ build_date := $(shell date)
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
 uname_rs := $(shell uname -rs)
 cc_version := $(shell $(CC) --version | head -n 1)
-codename := elliptic inheritance
+codename := simultaneous independence
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
@@ -50,25 +50,33 @@ CPPFLAGS += -Wmissing-format-attribute
 CPPFLAGS += -Wmissing-noreturn
 CPPFLAGS += -Wunused-macros
 CPPFLAGS += -Wbad-function-cast
+CPPFLAGS += -fno-strict-aliasing
 CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F)
 CPPFLAGS += @SSL_CPPFLAGS@
 CPPFLAGS += @ncurses_cppflags@
 CPPFLAGS += @arch_cppflags@
+CPPFLAGS += -I/usr/local/include
 
 BINARIES = para_server para_client para_audioc para_recv \
-	para_filter para_write para_fsck para_afh @extra_binaries@
+	para_filter para_write para_afh @extra_binaries@
 man_binaries := $(BINARIES)
 man_pages := $(patsubst %, man/man1/%.1, $(man_binaries))
 man_pages_in := $(patsubst %, web/%.man.in.html, $(man_binaries))
+
 ggo_dir := ggo
-gengetopts := $(wildcard $(ggo_dir)/*.ggo)
-gengetopts_c := $(patsubst %/,, $(gengetopts:.ggo=.cmdline.c))
-gengetopts_h := $(patsubst %/,, $(gengetopts:.ggo=.cmdline.h))
+
+m4_ggos := afh audioc audiod client filter gui recv server write
+all_ggos := $(m4_ggos) dccp_recv oggdec_filter alsa_write oss_write fade http_recv \
+	osx_write udp_recv amp_filter compress_filter file_write \
+	grab_client mp3dec_filter
+ggo_generated := $(addsuffix .cmdline.c, $(all_ggos)) $(addsuffix .cmdline.h, $(all_ggos)) \
+	$(addsuffix .ggo, $(addprefix $(ggo_dir)/,$(m4_ggos)))
+
 autocrap := config.h.in configure
 tarball_pfx := @PACKAGE_TARNAME@-$(PACKAGE_VERSION)
 tarball_delete = web versions pics .changelog_before_cvs .changelog_cvs .gitignore
 tarball_delete := $(patsubst %,$(tarball_pfx)/%,$(tarball_delete))
-tarball_add := $(gengetopts_c) $(gengetopts_h) $(autocrap)
+tarball_add := $(ggo_generated) $(autocrap)
 tarball := @PACKAGE_TARNAME@-$(PACKAGE_VERSION).tar.bz2
 
 .PHONY: clean distclean maintainer-clean install man tarball
@@ -79,7 +87,7 @@ tarball: $(tarball)
 *.o: para.h config.h gcc-compat.h
 
 include Makefile.deps
-include $(ggo_dir)/Makefile.ggo
+include $(ggo_dir)/makefile
 
 %_command_list.c %_command_list.h: %.cmd
 	./command_util.sh c < $< >$@
@@ -98,21 +106,9 @@ man/man1/para_audiod.1: para_audiod audiod_command_list.man
 	mkdir -p man/man1
 	help2man -h --detailed-help -N -i audiod_command_list.man ./para_audiod > $@
 
-man/man1/para_filter.1: para_filter
-	mkdir -p man/man1
-	help2man -h --detailed-help -N ./$< > $@
-
-man/man1/para_write.1: para_write
-	mkdir -p man/man1
-	help2man -h --detailed-help -N ./$< > $@
-
-man/man1/para_recv.1: para_recv
-	mkdir -p man/man1
-	help2man -h --detailed-help -N ./$< > $@
-
 man/man1/%.1: %
 	mkdir -p man/man1
-	help2man -N ./$< > $@
+	help2man -h --detailed-help -N ./$< > $@
 
 man/html/%.html: man/man1/%.1
 	mkdir -p man/html
@@ -164,14 +160,11 @@ para_audioc: @audioc_objs@
 	$(CC) $(LDFLAGS) -o $@ @audioc_objs@ @audioc_ldflags@
 
 para_fade: @fade_objs@
-	$(CC) $(LDFLAGS) -o $@ @fade_objs@
+	$(CC) $(LDFLAGS) -o $@ @fade_objs@ @fade_ldflags@
 
 para_server: @server_objs@
 	$(CC) $(LDFLAGS) -o $@ @server_objs@  @server_ldflags@
 
-para_fsck: @fsck_objs@
-	$(CC) $(LDFLAGS) -o $@ @fsck_objs@ @fsck_ldflags@
-
 para_write: @write_objs@
 	$(CC) $(LDFLAGS) -o $@ @write_objs@ @write_ldflags@
 
@@ -180,6 +173,7 @@ para_afh: @afh_objs@
 
 clean:
 	rm -f *.o $(BINARIES)
+	rm -f *_command_list.*
 	rm -rf man
 distclean: clean
 	rm -f Makefile autoscan.log config.status config.log && \
@@ -187,10 +181,9 @@ distclean: clean
 	rm -f GPATH GRTAGS GSYMS GTAGS
 
 maintainer-clean: distclean
-	rm -f $(gengetopts_c) $(gengetopts_h) *.tar.bz2 \
+	rm -f $(ggo_generated) *.tar.bz2 \
 		config.h configure \
 		config.h.in skencil/*.pdf skencil/*.ps
-	rm -f *_command_list.* *.man man/man1/*
 	rm -rf web_sync
 
 install: all man