X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=1ae7ce6acafb9bc6378db707f62f4040840ce7c3;hp=5c76ff0e5b7425a0011d9370da6db121e9ff91f9;hb=190eec54bed8fe79e0ccd72614b253d591e76b4f;hpb=295c14126da50e77a14fe075b71d885a7b469b4a;ds=sidebyside

diff --git a/Makefile.in b/Makefile.in
index 5c76ff0e..1ae7ce6a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,17 +1,18 @@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
+prefix := @prefix@
+exec_prefix := @exec_prefix@
 
-BINDIR = @bindir@
-VARDIR = /var/paraslash
-PKGDATADIR = @datarootdir@/@PACKAGE_NAME@
-MANDIR = @datarootdir@/man/man1
+BINDIR := @bindir@
+VARDIR := /var/paraslash
+PKGDATADIR := @datarootdir@/@PACKAGE_NAME@
+MANDIR := @datarootdir@/man/man1
 
-install_sh = @install_sh@
+install_sh := @install_sh@
 
-build_date = $(shell date)
-system = $(shell uname -rs)
-cc_version = $(shell $(CC) --version | head -n 1)
-codename = solar saturation
+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 := probabilistic parity
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
@@ -26,32 +27,33 @@ DEBUG_CPPFLAGS += -Wredundant-decls
 # many warnings about trivial stuff
 # CPPFLAGS += -Wconversion
 
-# uncomment this if your compiler supports it
-# LDFLAGS += -Wl,--gc-sections
-
+ifeq ($(uname_s),Linux)
+	CPPFLAGS += -fdata-sections -ffunction-sections
+	LDFLAGS += -Wl,--gc-sections
+	CPPFLAGS += -Wstrict-prototypes
+	CPPFLAGS += -Wshadow
+endif
 CPPFLAGS += -Os
 CPPFLAGS += -Wall
 CPPFLAGS += -Wuninitialized
-CPPFLAGS += -Wstrict-prototypes
 CPPFLAGS += -Wchar-subscripts
 CPPFLAGS += -Wformat-security
 CPPFLAGS += -DBINDIR='"$(BINDIR)"'
 CPPFLAGS += -DBUILD_DATE='"$(build_date)"'
-CPPFLAGS += -DSYSTEM='"$(system)"'
+CPPFLAGS += -DUNAME_RS='"$(uname_rs)"'
 CPPFLAGS += -DCODENAME='"$(codename)"'
 CPPFLAGS += -DCC_VERSION='"$(cc_version)"'
 CPPFLAGS += -Werror-implicit-function-declaration
 CPPFLAGS += -Wmissing-format-attribute
 CPPFLAGS += -Wunused-macros
-CPPFLAGS += -Wshadow
 CPPFLAGS += -Wbad-function-cast
-CPPFLAGS += -fdata-sections -ffunction-sections
 CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F)
 CPPFLAGS += @SSL_CPPFLAGS@
 CPPFLAGS += @ncurses_cppflags@
+CPPFLAGS += @arch_cppflags@
 
 BINARIES = para_server para_client para_audioc para_recv \
-	para_filter para_write para_fsck @extra_binaries@
+	para_filter para_write para_fsck 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))
@@ -66,13 +68,10 @@ tarball_add := $(gengetopts_c) $(gengetopts_h) $(autocrap)
 tarball := @PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2
 
 .PHONY: clean distclean maintainer-clean install man tarball
-all: $(BINARIES)
+all: $(BINARIES) $(man_pages)
 man: $(man_pages)
 tarball: $(tarball)
 
-fade_objs = fade.cmdline.o fade.o exec.o close_on_fork.o string.o fd.o
-fsck_objs = osl.o rbtree.o fsck.o string.o sha1.o fsck.cmdline.o
-
 *.o: para.h config.h gcc-compat.h
 
 include Makefile.deps
@@ -114,6 +113,7 @@ grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
 	case $< 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";; \
 	esac; \
 	if test $< != fsck.ggo; then O="$$O --conf-parser "; fi; \
 	gengetopt $$O \
@@ -134,7 +134,7 @@ grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
 server_command_lists = server_command_list.man afs_command_list.man
 man/man1/para_server.1: para_server $(server_command_lists)
 	mkdir -p man/man1
-	opts="-N `for i in $(server_command_lists); do echo "-i $$i"; done`"; \
+	opts="-h --detailed-help -N `for i in $(server_command_lists); do echo "-i $$i"; done`"; \
 	help2man $$opts ./para_server > $@
 
 man/man1/para_audiod.1: para_audiod audiod_command_list.man
@@ -200,8 +200,8 @@ para_audiod: @audiod_objs@
 para_audioc: @audioc_objs@
 	$(CC) $(LDFLAGS) -o $@ @audioc_objs@ @audioc_ldflags@
 
-para_fade: $(fade_objs)
-	$(CC) $(LDFLAGS) -o $@ $(fade_objs)
+para_fade: @fade_objs@
+	$(CC) $(LDFLAGS) -o $@ @fade_objs@
 
 para_server: @server_objs@
 	$(CC) $(LDFLAGS) -o $@ @server_objs@  @server_ldflags@
@@ -212,8 +212,12 @@ para_fsck: @fsck_objs@
 para_write: @write_objs@
 	$(CC) $(LDFLAGS) -o $@ @write_objs@ @write_ldflags@
 
+para_afh: @afh_objs@
+	$(CC) $(LDFLAGS) -o $@ @afh_objs@ @afh_ldflags@
+
 clean:
 	rm -f *.o $(BINARIES)
+	rm -rf man
 distclean: clean
 	rm -f Makefile autoscan.log config.status config.log && \
 	rm -rf web/sync/* autom4te.cache aclocal.m4
@@ -232,14 +236,12 @@ install: all man
 	$(install_sh) -m 644 $(man_pages) $(MANDIR)
 	mkdir -p $(VARDIR) >/dev/null 2>&1 || true # not fatal, so don't complain
 
-@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2: $(tarball_add) $(man_pages)
+@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2: $(tarball_add)
 	rm -rf $(tarball_pfx).tar.bz2 $(tarball_pfx)
 	git-archive --format=tar --prefix=$(tarball_pfx)/ HEAD \
 		| tar --delete $(tarball_delete) > $(tarball_pfx).tar
 	mkdir $(tarball_pfx)
 	cp -r $(tarball_add) $(tarball_pfx)
-	mkdir -p $(tarball_pfx)/man/man1
-	cp -r $(man_pages) $(tarball_pfx)/man/man1
 	tar rf $(tarball_pfx).tar $(tarball_pfx)/*
 	rm -rf $(tarball_pfx)
 	bzip2 -9 $(tarball_pfx).tar