X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=75414df4292b71911ed8f66d0823fe472bb2121f;hp=c64b5ae7250ce5cceb178f39089319ae38894a11;hb=32d355e7c8bb9ed3497faf0ddd41755196d039b8;hpb=002115fc06853f219215319b3c7769ba6881a0b4

diff --git a/Makefile.in b/Makefile.in
index c64b5ae7..75414df4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,15 +9,21 @@ PACKAGE_VERSION := @PACKAGE_VERSION@
 PACKAGE_STRING := @PACKAGE_STRING@
 install_sh := @install_sh@
 cmdline_dir := @cmdline_dir@
+executables := @executables@
 
 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 := deterministic entropy
+codename := infinite rollback
+
+GIT_VERSION := $(shell ./GIT-VERSION-GEN git-version.h)
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
+DEBUG_CPPFLAGS += -Wall
+DEBUG_CPPFLAGS += -Wformat-security
+DEBUG_CPPFLAGS += -Wmissing-format-attribute
 # produces false positives
 # DEBUG_CPPFLAGS += -Wunreachable-code
 # DEBUG_CPPFLAGS += -Wwrite-strings
@@ -26,6 +32,7 @@ DEBUG_CPPFLAGS += -Wredundant-decls
 # DEBUG_CPPFLAGS += -Wextra
 # DEBUG_CPPFLAGS += -Wold-style-definition
 # DEBUG_CPPFLAGS += -Wdeclaration-after-statement
+# DEBUG_CPPFLAGS += -Wsuggest-attribute=const
 
 # many warnings about trivial stuff
 # CPPFLAGS += -Wconversion
@@ -37,29 +44,23 @@ ifeq ($(uname_s),Linux)
 	CPPFLAGS += -Wshadow
 endif
 CPPFLAGS += -Os
-CPPFLAGS += -Wall
 CPPFLAGS += -Wuninitialized
 CPPFLAGS += -Wchar-subscripts
-CPPFLAGS += -Wformat-security
 CPPFLAGS += -DBINDIR='"$(BINDIR)"'
 CPPFLAGS += -DBUILD_DATE='"$(build_date)"'
 CPPFLAGS += -DUNAME_RS='"$(uname_rs)"'
 CPPFLAGS += -DCODENAME='"$(codename)"'
 CPPFLAGS += -DCC_VERSION='"$(cc_version)"'
 CPPFLAGS += -Werror-implicit-function-declaration
-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
 CPPFLAGS += -I$(cmdline_dir)
 CPPFLAGS += @osl_cppflags@
-CPPFLAGS += -DGIT_VERSION='"$(GIT_VERSION)"'
 
 man_pages := $(patsubst %, man/man1/%.1, @executables@)
 man_pages_in := $(patsubst %, web/%.man.in.html, @executables@)
@@ -67,8 +68,9 @@ man_pages_in := $(patsubst %, web/%.man.in.html, @executables@)
 ggo_dir := ggo
 object_dir := objects
 man_dir := man/man1
+test_dir := t
 
-m4_ggos := afh audioc audiod client filter gui recv server write
+m4_ggos := afh audioc audiod client filter gui recv server write ao_write
 all_ggos := $(m4_ggos) dccp_recv alsa_write oss_write fade http_recv \
 	osx_write udp_recv amp_filter compress_filter file_write \
 	mp3dec_filter prebuffer_filter
@@ -93,24 +95,18 @@ endif
 ifndef BUILD_VERBOSE
 	BUILD_VERBOSE = 0
 endif
-ifeq ($(BUILD_VERBOSE),1)
-	Q =
-else
+ifeq ($(BUILD_VERBOSE),0)
 	Q = @
+else
+	Q =
 endif
 
-.PHONY: dep all clean distclean maintainer-clean install man tarball\
-	.FORCE-GIT-VERSION-FILE
+.PHONY: dep all clean distclean maintainer-clean install man tarball
 all: dep @executables@ $(man_pages)
 dep: $(deps)
 man: $(man_pages)
 tarball: $(tarball)
 
-GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
-	@./GIT-VERSION-GEN GIT-VERSION-FILE
--include GIT-VERSION-FILE
-@executables@: GIT-VERSION-FILE
-
 -include $(ggo_dir)/makefile
 
 %_command_list.c: %.cmd
@@ -154,6 +150,9 @@ $(object_dir):
 $(man_dir):
 	mkdir -p $@
 
+$(object_dir)/crypt.o: crypt.c | $(object_dir)
+	@[ -z "$(Q)" ] || echo 'CC $<'
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @openssl_cppflags@ $<
 $(object_dir)/spx_common.o: spx_common.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
 	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ogg_cppflags@ $<
@@ -194,6 +193,13 @@ $(object_dir)/aac_afh.o: aac_afh.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
 	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
 
+$(object_dir)/gui%.o: gui%.c | $(object_dir)
+	@[ -z "$(Q)" ] || echo 'CC $<'
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @curses_cppflags@ $<
+$(object_dir)/ao_write.o: ao_write.c | $(object_dir)
+	@[ -z "$(Q)" ] || echo 'CC $<'
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ao_cppflags@ $<
+
 $(object_dir)/%.cmdline.o: $(cmdline_dir)/%.cmdline.c $(cmdline_dir)/%.cmdline.h | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
 	$(Q) $(CC) -c $(CPPFLAGS) -Wno-unused-function -o $@ $<
@@ -210,6 +216,7 @@ $(object_dir)/%.d: %.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'DEP $<'
 	$(Q) ./depend.sh $(object_dir) $(cmdline_dir) $(CPPFLAGS) $< > $@
 
+
 recv_objs := $(addprefix $(object_dir)/, @recv_objs@)
 filter_objs := $(addprefix $(object_dir)/, @filter_objs@)
 client_objs := $(addprefix $(object_dir)/, @client_objs@)
@@ -245,7 +252,7 @@ para_client: $(client_objs)
 
 para_gui: $(gui_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) $(LDFLAGS) -o $@ $(gui_objs) -lncurses
+	$(Q) $(CC) $(LDFLAGS) -o $@ $(gui_objs) -lcurses
 
 para_audiod: audiod_command_list.c audiod_command_list.h $(audiod_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
@@ -280,7 +287,7 @@ clean2: clean
 	$(Q) rm -rf man $(object_dir)
 	$(Q) rm -f *_command_list.*
 
-distclean: clean2
+distclean: clean2 test-clean
 	@[ -z "$(Q)" ] || echo 'DISTCLEAN'
 	$(Q) rm -f Makefile autoscan.log config.status config.log
 	$(Q) rm -rf autom4te.cache aclocal.m4
@@ -303,7 +310,7 @@ $(tarball): $(cmdline_generated)
 	git archive --format=tar --prefix=$(tarball_pfx)/ HEAD \
 		| tar --delete $(tarball_delete) > $(tarball_pfx).tar
 	mkdir -p $(tarball_pfx)/$(cmdline_dir)
-	echo $(GIT_VERSION) > $(tarball_pfx)/VERSION
+	./GIT-VERSION-GEN > $(tarball_pfx)/VERSION
 	cp -r $(autocrap) $(tarball_pfx)
 	cp -r $(cmdline_generated) $(tarball_pfx)/$(cmdline_dir)
 	tar rf $(tarball_pfx).tar $(tarball_pfx)/*
@@ -316,3 +323,4 @@ $(tarball): $(cmdline_generated)
 %.pdf: %.ps
 	ps2pdf - - < $< > $@
 
+include $(test_dir)/makefile.test