X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=bcc19a09b35b816aa76680298b7beec6b3148ee3;hp=4d1c23239b5787d5ff9d55ed8837d830bab02dda;hb=39707e351f94fe8c903f2e0629d7d0427ff12efe;hpb=d02f88dfc3911262174afe6017e04d70e8557a7a

diff --git a/Makefile.in b/Makefile.in
index 4d1c2323..bcc19a09 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -8,7 +8,8 @@ MANDIR := @datarootdir@/man/man1
 PACKAGE_VERSION := @PACKAGE_VERSION@
 PACKAGE_STRING := @PACKAGE_STRING@
 install_sh := @install_sh@
-executables := @executables@
+executables := $(addprefix para_, @executables@)
+ggo_descriptions_declared := @ggo_descriptions_declared@
 
 GENGETOPT := @gengetopt@
 HELP2MAN := @help2man@
@@ -18,7 +19,6 @@ 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 := volatile relativity
 
 GIT_VERSION := $(shell ./GIT-VERSION-GEN git-version.h)
 
@@ -34,6 +34,7 @@ object_dir := $(build_dir)/objects
 dep_dir := $(build_dir)/deps
 man_dir := $(build_dir)/man/man1
 cmdline_dir := $(build_dir)/cmdline
+m4depdir := $(build_dir)/m4deps
 
 DEBUG_CPPFLAGS += -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
@@ -67,7 +68,6 @@ CPPFLAGS += -Wchar-subscripts
 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-noreturn
@@ -79,13 +79,14 @@ CPPFLAGS += -I/usr/local/include
 CPPFLAGS += -I$(cmdline_dir)
 CPPFLAGS += @osl_cppflags@
 
-man_pages := $(patsubst %, $(man_dir)/%.1, @executables@)
+LDFLAGS += @clock_gettime_ldflags@
+
+man_pages := $(patsubst %, $(man_dir)/%.1, $(executables))
 
 autocrap := config.h.in configure
 tarball_pfx := @PACKAGE_TARNAME@-$(PACKAGE_VERSION)
 tarball_delete := $(addprefix $(tarball_pfx)/,\
-	web .changelog_before_cvs .changelog_cvs .gitignore\
-	skencil)
+	web .changelog_before_cvs .changelog_cvs .gitignore)
 tarball := @PACKAGE_TARNAME@-$(PACKAGE_VERSION).tar.bz2
 
 # To put more focus on warnings, be less verbose as default
@@ -97,12 +98,12 @@ else
 endif
 
 .PHONY: dep all clean distclean maintainer-clean install man tarball
-all: dep @executables@ $(man_pages)
+all: dep $(executables) $(man_pages)
 dep: $(deps)
 man: $(man_pages)
 tarball: $(tarball)
 
-$(object_dir) $(man_dir) $(ggo_dir) $(cmdline_dir) $(dep_dir):
+$(object_dir) $(man_dir) $(ggo_dir) $(cmdline_dir) $(dep_dir) $(m4depdir):
 	$(Q) $(MKDIR_P) $@
 
 -include $(m4_ggo_dir)/makefile
@@ -180,6 +181,10 @@ $(object_dir)/mp3dec_filter.o: mp3dec_filter.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
 	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @mad_cppflags@ $<
 
+$(object_dir)/compress_filter.o: compress_filter.c | $(object_dir)
+	@[ -z "$(Q)" ] || echo 'CC $<'
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) -O3 $<
+
 $(object_dir)/aacdec_filter.o: aacdec_filter.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
 	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
@@ -225,6 +230,7 @@ all_objs := @recv_objs@ @filter_objs@ @client_objs@ @gui_objs@ \
 	@audiod_objs@ @audioc_objs@ @fade_objs@ @server_objs@ \
 	@write_objs@ @afh_objs@ @play_objs@
 deps := $(addprefix $(dep_dir)/, $(all_objs:.o=.d))
+m4_deps := $(addprefix $(m4depdir)/, $(addsuffix .m4d, @executables@))
 
 recv_objs := $(addprefix $(object_dir)/, @recv_objs@)
 filter_objs := $(addprefix $(object_dir)/, @filter_objs@)
@@ -240,55 +246,56 @@ play_objs := $(addprefix $(object_dir)/, @play_objs@)
 
 ifeq ($(findstring clean, $(MAKECMDGOALS)),)
 -include $(deps)
+-include $(m4_deps)
 endif
 
 para_recv: $(recv_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) $(LDFLAGS) $(recv_objs) -o $@ @recv_ldflags@
+	$(Q) $(CC) $(recv_objs) -o $@ @recv_ldflags@ $(LDFLAGS)
 
 para_filter: $(filter_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) $(LDFLAGS) $(filter_objs) -o $@ @filter_ldflags@
+	$(Q) $(CC) $(filter_objs) -o $@ @filter_ldflags@ $(LDFLAGS)
 
 para_client: $(client_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) $(LDFLAGS) -o $@ $(client_objs) @client_ldflags@
+	$(Q) $(CC) -o $@ $(client_objs) @client_ldflags@ $(LDFLAGS)
 
 para_gui: $(gui_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) $(LDFLAGS) -o $@ $(gui_objs) -lcurses
+	$(Q) $(CC) -o $@ $(gui_objs) @gui_ldflags@ $(LDFLAGS)
 
 para_audiod: $(audiod_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) $(LDFLAGS) -o $@ $(audiod_objs) @audiod_ldflags@
+	$(Q) $(CC) -o $@ $(audiod_objs) @audiod_ldflags@ $(LDFLAGS)
 
 para_audioc: $(audioc_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) $(LDFLAGS) -o $@ $(audioc_objs) @audioc_ldflags@
+	$(Q) $(CC) -o $@ $(audioc_objs) @audioc_ldflags@ $(LDFLAGS)
 
 para_fade: $(fade_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) $(LDFLAGS) -o $@ $(fade_objs) @fade_ldflags@
+	$(Q) $(CC) -o $@ $(fade_objs) @fade_ldflags@ $(LDFLAGS)
 
 para_server: $(server_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) $(LDFLAGS) -o $@ $(server_objs)  @server_ldflags@
+	$(Q) $(CC) -o $@ $(server_objs) @server_ldflags@ $(LDFLAGS)
 
 para_write: $(write_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) $(LDFLAGS) -o $@ $(write_objs) @write_ldflags@
+	$(Q) $(CC) -o $@ $(write_objs) @write_ldflags@ $(LDFLAGS)
 
 para_afh: $(afh_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) $(LDFLAGS) -o $@ $(afh_objs) @afh_ldflags@
+	$(Q) $(CC) -o $@ $(afh_objs) @afh_ldflags@ $(LDFLAGS)
 
 para_play: $(play_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) $(LDFLAGS) -o $@ $(play_objs) @play_ldflags@
+	$(Q) $(CC) -o $@ $(play_objs) @play_ldflags@ $(LDFLAGS)
 
 clean:
 	@[ -z "$(Q)" ] || echo 'CLEAN'
-	$(Q) rm -f @executables@
+	$(Q) rm -f $(executables)
 	$(Q) rm -rf $(object_dir)
 
 clean2: clean
@@ -302,14 +309,12 @@ distclean: clean2 test-clean
 	$(Q) rm -f GPATH GRTAGS GSYMS GTAGS
 
 maintainer-clean: distclean
-	rm -f *.tar.bz2 \
-		config.h configure \
-		config.h.in skencil/*.pdf skencil/*.ps
+	rm -f *.tar.bz2 config.h configure config.h.in
 	rm -rf web_sync
 
 install: all man
 	$(MKDIR_P) $(BINDIR) $(MANDIR)
-	$(install_sh) -s -m 755 @executables@ $(BINDIR)
+	$(install_sh) -s -m 755 $(executables) $(BINDIR)
 	$(install_sh) -m 644 $(man_pages) $(MANDIR)
 	$(MKDIR_P) $(VARDIR) >/dev/null 2>&1 || true # not fatal, so don't complain
 
@@ -324,9 +329,4 @@ $(tarball):
 	bzip2 -9 $(tarball_pfx).tar
 	ls -l $(tarball_pfx).tar.bz2
 	rm -rf $(tarball_pfx)
-%.ps: %.sk
-	sk2ps $< > $@
-%.pdf: %.ps
-	ps2pdf - - < $< > $@
-
 include $(test_dir)/makefile.test