X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=19e17cf572fbe12908ec79f10e3eba75721c2be1;hp=cf9598f71a0da39073d9dba6b8e85b9be5e4cbca;hb=94a3c445bf70808292e3c239752970b9be05e8f5;hpb=ef1f130a1f9ac61a51da10ee56c5bd9ef1b52366

diff --git a/Makefile.in b/Makefile.in
index cf9598f7..19e17cf5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -8,7 +8,6 @@ MANDIR := @datarootdir@/man/man1
 PACKAGE_VERSION := @PACKAGE_VERSION@
 PACKAGE_STRING := @PACKAGE_STRING@
 install_sh := @install_sh@
-cmdline_dir := @cmdline_dir@
 executables := @executables@
 
 GENGETOPT := @gengetopt@
@@ -18,10 +17,16 @@ 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 := hybrid causality
+codename := volatile relativity
 
 GIT_VERSION := $(shell ./GIT-VERSION-GEN git-version.h)
 
+ggo_dir := ggo
+object_dir := objects
+man_dir := man/man1
+test_dir := t
+cmdline_dir := cmdline
+
 DEBUG_CPPFLAGS += -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
 DEBUG_CPPFLAGS += -Wall -Wno-sign-compare -Wno-unknown-pragmas
@@ -45,6 +50,8 @@ ifeq ($(uname_s),Linux)
 	LDFLAGS += -Wl,--gc-sections
 	CPPFLAGS += -Wstrict-prototypes
 	CPPFLAGS += -Wshadow
+	# causes warnings on *BSD for the feature test macros
+	CPPFLAGS += -Wunused-macros
 endif
 CPPFLAGS += -Os
 CPPFLAGS += -Wuninitialized
@@ -56,7 +63,6 @@ CPPFLAGS += -DCODENAME='"$(codename)"'
 CPPFLAGS += -DCC_VERSION='"$(cc_version)"'
 CPPFLAGS += -Werror-implicit-function-declaration
 CPPFLAGS += -Wmissing-noreturn
-CPPFLAGS += -Wunused-macros
 CPPFLAGS += -Wbad-function-cast
 CPPFLAGS += -fno-strict-aliasing
 CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F)
@@ -67,21 +73,10 @@ CPPFLAGS += @osl_cppflags@
 
 man_pages := $(patsubst %, man/man1/%.1, @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 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
-ggo_generated := $(addsuffix .ggo, $(addprefix $(ggo_dir)/,$(m4_ggos)))
-
 autocrap := config.h.in configure
 tarball_pfx := @PACKAGE_TARNAME@-$(PACKAGE_VERSION)
 tarball_delete := $(addprefix $(tarball_pfx)/,\
-	web versions .changelog_before_cvs .changelog_cvs .gitignore\
+	web .changelog_before_cvs .changelog_cvs .gitignore\
 	skencil)
 tarball := @PACKAGE_TARNAME@-$(PACKAGE_VERSION).tar.bz2
 
@@ -118,20 +113,21 @@ $(subst p,P,$(subst q,Q,$(subst r,R,$(subst s,S,$(subst t,T,\
 $(subst u,U,$(subst v,V,$(subst w,W,$(subst x,X,$(subst y,Y,\
 $(subst z,Z,$1))))))))))))))))))))))))))
 
-%_command_list.c: %.cmd
-	@[ -z "$(Q)" ] || echo 'GEN $@'
-	$(Q) ./command_util.sh c < $< >$@
-%_command_list.h: %.cmd
+%_command_list.h: %.cmd %.c
 	@[ -z "$(Q)" ] || echo 'GEN $@'
 	$(Q) ./command_util.sh h < $< >$@
-%_command_list.man: %.cmd
+%_command_list.man: %.cmd %.c
 	@[ -z "$(Q)" ] || echo 'GEN $@'
 	$(Q) ./command_util.sh man < $< > $@
-%_completion.h: %.cmd
+%_completion.h: %.cmd %.c
 	@[ -z "$(Q)" ] || echo 'GEN $@'
 	$(Q) ./command_util.sh compl $(strip $(call TOUPPER,$(*F)))_COMPLETERS \
 		$(strip $(call TOUPPER,$(*F)))_COMMANDS	< $< > $@
 
+server_command_list.h server_command_list.man server_completion.h: command.c
+afs_command_list.h afs_command_list.man afs_completion.h: afs.c aft.c attribute.c
+audiod_command_list.h audiod_command_list.man audiod_completion.h: audiod_command.c
+
 server_command_lists_man = server_command_list.man afs_command_list.man
 man/man1/para_server.1: para_server $(server_command_lists_man) | $(man_dir)
 	@[ -z "$(Q)" ] || echo 'MAN $<'
@@ -146,16 +142,6 @@ man/man1/%.1: % | $(man_dir)
 	@[ -z "$(Q)" ] || echo 'MAN $<'
 	$(Q) $(HELP2MAN) -h --detailed-help -N ./$< > $@
 
-man/html/%.html: man/man1/%.1
-	@[ -z "$(Q)" ] || echo 'MAN2HTML $<'
-	$(Q) mkdir -p man/html
-	$(Q) man2html $< > $@
-
-web/%.man.in.html: man/man1/%.1
-	@[ -z "$(Q)" ] || echo 'MAN2HTML $<'
-	$(Q) mkdir -p man/html
-	$(Q) man2html $< | sed -e '/^<\/BODY>/,$$d' -e '1,/<\/HEAD><BODY>/d' > $@
-
 $(object_dir):
 	mkdir -p $@
 $(man_dir):
@@ -204,6 +190,10 @@ $(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)/mp3_afh.o: mp3_afh.c | $(object_dir)
+	@[ -z "$(Q)" ] || echo 'CC $<'
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @id3tag_cppflags@ $<
+
 $(object_dir)/gui%.o: gui%.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
 	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @curses_cppflags@ $<
@@ -296,7 +286,7 @@ clean:
 clean2: clean
 	@[ -z "$(Q)" ] || echo 'CLEAN2'
 	$(Q) rm -rf man $(object_dir) $(cmdline_dir)
-	$(Q) rm -f *_command_list.* *_completion.h $(ggo_generated)
+	$(Q) rm -f *_command_list.* *_completion.h $(ggo_dir)/*.ggo
 distclean: clean2 test-clean
 	@[ -z "$(Q)" ] || echo 'DISTCLEAN'
 	$(Q) rm -f Makefile autoscan.log config.status config.log