projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove COPYING from the files to be converted by grutatxt
[paraslash.git]
/
Makefile.in
diff --git
a/Makefile.in
b/Makefile.in
index 0952caeaf61e3d6f80da24bf827eb72578a166fc..a0a7fc43623061a88f04bce1d91b424314fbd1fc 100644
(file)
--- a/
Makefile.in
+++ b/
Makefile.in
@@
-1,6
+1,3
@@
-COPYRIGHT = Copyright (c) 1997-2007 by Andre Noll
-DISCLAIMER = This is free software with ABSOLUTELY NO WARRANTY. See COPYING for details.
-
prefix = @prefix@
exec_prefix = @exec_prefix@
prefix = @prefix@
exec_prefix = @exec_prefix@
@@
-16,15
+13,20
@@
install_sh = @install_sh@
build_date = $(shell date)
system = $(shell uname -rs)
cc_version = $(shell $(CC) --version | head -n 1)
build_date = $(shell date)
system = $(shell uname -rs)
cc_version = $(shell $(CC) --version | head -n 1)
-codename = i
nductive resonance
+codename = i
sotropic threshold
DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
DEBUG_CPPFLAGS += -Wredundant-decls
# produces false positives
# DEBUG_CPPFLAGS += -Wunreachable-code
DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
DEBUG_CPPFLAGS += -Wredundant-decls
# produces false positives
# DEBUG_CPPFLAGS += -Wunreachable-code
-#CPPFLAGS += -Wwrite-strings
-# invalid option for gcc-3.3.5
-# CPPFLAGS += -Wextra
+# DEBUG_CPPFLAGS += -Wwrite-strings
+
+# invalid option for gcc-3.3.3
+# DEBUG_CPPFLAGS += -Wextra
+# DEBUG_CPPFLAGS += -Wold-style-definition
+
+# many warnings about trivial stuff
+# CPPFLAGS += -Wconversion
CPPFLAGS += -Os
CPPFLAGS += -Wall
CPPFLAGS += -Os
CPPFLAGS += -Wall
@@
-43,6
+45,7
@@
CPPFLAGS += -Werror-implicit-function-declaration
CPPFLAGS += -Wmissing-format-attribute
CPPFLAGS += -Wunused-macros
CPPFLAGS += -Wshadow
CPPFLAGS += -Wmissing-format-attribute
CPPFLAGS += -Wunused-macros
CPPFLAGS += -Wshadow
+CPPFLAGS += -Wbad-function-cast
BINARIES = para_server para_client para_gui para_audioc para_recv \
para_filter para_write @extra_binaries@
BINARIES = para_server para_client para_gui para_audioc para_recv \
para_filter para_write @extra_binaries@
@@
-54,9
+57,7
@@
PICS := $(wildcard pics/paraslash/*.jpg)
gengetopts := $(wildcard *.ggo)
gengetopts_c := $(gengetopts:.ggo=.cmdline.c)
gengetopts_h := $(gengetopts:.ggo=.cmdline.h)
gengetopts := $(wildcard *.ggo)
gengetopts_c := $(gengetopts:.ggo=.cmdline.c)
gengetopts_h := $(gengetopts:.ggo=.cmdline.h)
-all_c_files := $(wildcard *.c)
-c_sources := $(filter-out $(gengetopts_c), $(all_c_files))
-grutatxt := COPYING NEWS README.mysql CREDITS INSTALL README FEATURES GPL
+grutatxt := NEWS README.mysql CREDITS INSTALL README FEATURES
grutatxt_html := $(grutatxt:=.html)
html_in := $(wildcard web/*.in.html)
gen_html := $(subst web/,web/sync/,$(html_in))
grutatxt_html := $(grutatxt:=.html)
html_in := $(wildcard web/*.in.html)
gen_html := $(subst web/,web/sync/,$(html_in))
@@
-70,9
+71,10
@@
shots := gui-2005-11-12.png para_audiod-startup.txt para_krell-2005-02.png \
para_krell-2005-02.png
shots := $(patsubst %,web/sync/%,$(shots))
web_pics := web/sync/paraslash.png web/sync/paraslash.ico
para_krell-2005-02.png
shots := $(patsubst %,web/sync/%,$(shots))
web_pics := web/sync/paraslash.png web/sync/paraslash.ico
-web_misc := overview.pdf versions/
paraslash-git
.tar.bz2 PUBLIC_KEY \
+web_misc := overview.pdf versions/
@PACKAGE_TARNAME@-@PACKAGE_VERSION@
.tar.bz2 PUBLIC_KEY \
key.anonymous para.css
web_misc := $(patsubst %,web/sync/%,$(web_misc))
key.anonymous para.css
web_misc := $(patsubst %,web/sync/%,$(web_misc))
+web_man := web/sync/man
autocrap := config.h.in configure
tarball_pfx := @PACKAGE_TARNAME@-@PACKAGE_VERSION@
tarball_delete = web versions pics/screenshots pics/web .changelog_before_cvs \
autocrap := config.h.in configure
tarball_pfx := @PACKAGE_TARNAME@-@PACKAGE_VERSION@
tarball_delete = web versions pics/screenshots pics/web .changelog_before_cvs \
@@
-83,7
+85,8
@@
tarball_add := $(gengetopts_c) $(gengetopts_h) $(autocrap)
.PHONY: clean distclean maintainer-clean install html www tags doxygen gruta \
man html_man
all: $(BINARIES)
.PHONY: clean distclean maintainer-clean install html www tags doxygen gruta \
man html_man
all: $(BINARIES)
-www: $(gen_html) $(gruta_html) $(web_pics) $(web_misc) $(shots) tags doxygen
+www: $(gen_html) $(gruta_html) $(web_pics) $(web_misc) $(shots) $(web_man) \
+ tags doxygen
gruta: $(gen_html) $(gruta_html)
man: $(man_pages)
html_man: $(man_pages_html)
gruta: $(gen_html) $(gruta_html)
man: $(man_pages)
html_man: $(man_pages_html)
@@
-99,7
+102,6
@@
slider_objs = slider.o string.o
include Makefile.deps
include Makefile.deps
-V := (@PACKAGE_STRING@, $(codename))\n$(COPYRIGHT)\n$(DISCLAIMER)
module_ggo_opts := --set-version="(@PACKAGE_STRING@, $(codename))"
grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
module_ggo_opts := --set-version="(@PACKAGE_STRING@, $(codename))"
grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
@@
-138,12
+140,13
@@
grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
audioc.ggo) O="--unamed-opts=command";; \
esac; \
gengetopt $$O \
audioc.ggo) O="--unamed-opts=command";; \
esac; \
gengetopt $$O \
+ --no-handle-version \
--conf-parser \
--file-name=$(*F).cmdline \
--func-name $(*F)_cmdline_parser \
--arg-struct-name=$(*F)_args_info \
--set-package="para_$(subst .cmdline,,$(*F))" \
--conf-parser \
--file-name=$(*F).cmdline \
--func-name $(*F)_cmdline_parser \
--arg-struct-name=$(*F)_args_info \
--set-package="para_$(subst .cmdline,,$(*F))" \
- --set-version="
$V
" < $<
+ --set-version="
@PACKAGE_VERSION@
" < $<
%_command_list.c %_command_list.h: %.cmd
./command_util.sh c < $< >$@
%_command_list.c %_command_list.h: %.cmd
./command_util.sh c < $< >$@
@@
-155,16
+158,20
@@
grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
server_command_lists = server_command_list.man random_selector_command_list.man \
playlist_selector_command_list.man mysql_selector_command_list.man
man/man1/para_server.1: para_server $(server_command_lists)
server_command_lists = server_command_list.man random_selector_command_list.man \
playlist_selector_command_list.man mysql_selector_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`"; \
help2man $$opts ./para_server > $@
man/man1/para_audiod.1: para_audiod audiod_command_list.man
opts="-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
+ mkdir -p man/man1
help2man -N -i audiod_command_list.man ./para_audiod > $@
man/man1/%.1: %
help2man -N -i audiod_command_list.man ./para_audiod > $@
man/man1/%.1: %
- help2man -N $< > $@
+ mkdir -p man/man1
+ help2man -N ./$< > $@
man/html/%.html: man/man1/%.1
man/html/%.html: man/man1/%.1
+ mkdir -p man/html
man2html $< > $@
man2html $< > $@
@@
-192,9
+199,6
@@
aac_common.o: aac_common.c
aac_afh.o: aac_afh.c
$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
aac_afh.o: aac_afh.c
$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
-para_recv: @recv_objs@
- $(CC) @recv_objs@ -o $@ @recv_ldflags@
-
slider.o: slider.c
$(CC) -c -Wall -o $@ -g @GLIB_CFLAGS@ @GTK_CFLAGS@ $<
slider.o: slider.c
$(CC) -c -Wall -o $@ -g @GLIB_CFLAGS@ @GTK_CFLAGS@ $<
@@
-202,13
+206,16
@@
krell.o: krell.c
$(CC) -Wall -O -g -fPIC @GTK_CFLAGS@ -c -o $@ krell.c
mysql_selector.o: mysql_selector.c
$(CC) -Wall -O -g -fPIC @GTK_CFLAGS@ -c -o $@ krell.c
mysql_selector.o: mysql_selector.c
- $(CC)
-Wall -O -g @mysql_cppflags@ -c -o $
@ $<
+ $(CC)
-c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @mysql_cppflags
@ $<
%.cmdline.o: %.cmdline.c
$(CC) -c $(CPPFLAGS) $<
%.o: %.c
$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) $<
%.cmdline.o: %.cmdline.c
$(CC) -c $(CPPFLAGS) $<
%.o: %.c
$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) $<
+para_recv: @recv_objs@
+ $(CC) @recv_objs@ -o $@ @recv_ldflags@
+
para_filter: @filter_objs@
$(CC) @filter_objs@ -o $@ @filter_ldflags@
para_filter: @filter_objs@
$(CC) @filter_objs@ -o $@ @filter_ldflags@
@@
-259,12
+266,13
@@
maintainer-clean: distclean
rm -f *_command_list.* *.man man/man1/* man/html/*
rm -f *_command_list.* *.man man/man1/* man/html/*
-install: all
- mkdir -p $(BINDIR) $(FONTDIR) $(PICDIR) $(MANDIR)
$(VARDIR)
+install: all
man
+ mkdir -p $(BINDIR) $(FONTDIR) $(PICDIR) $(MANDIR)
$(install_sh) -s -m 755 $(BINARIES) $(BINDIR)
$(install_sh) -m 644 $(FONTS) $(FONTDIR)
$(install_sh) -m 644 $(PICS) $(PICDIR)
$(install_sh) -m 644 $(man_pages) $(MANDIR)
$(install_sh) -s -m 755 $(BINARIES) $(BINDIR)
$(install_sh) -m 644 $(FONTS) $(FONTDIR)
$(install_sh) -m 644 $(PICS) $(PICDIR)
$(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)
rm -rf $(tarball_pfx).tar.bz2 $(tarball_pfx)
@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2: $(tarball_add) $(man_pages)
rm -rf $(tarball_pfx).tar.bz2 $(tarball_pfx)
@@
-293,8
+301,6
@@
doxygen: web/header2.html
web/sync/man: html_man
mkdir -p $@
cp -a $(man_pages_html) $@
web/sync/man: html_man
mkdir -p $@
cp -a $(man_pages_html) $@
-web/sync/doxygen:
- mkdir -p $@
web/sync/%.html: web/%.in.html web/header.html web/footer.html web/sync
cat web/header.html $< web/footer.html > $@
web/sync/%.png: pics/web/%.png web/sync
web/sync/%.html: web/%.in.html web/header.html web/footer.html web/sync
cat web/header.html $< web/footer.html > $@
web/sync/%.png: pics/web/%.png web/sync
@@
-303,7
+309,7
@@
web/sync/%.ico: pics/web/%.ico web/sync
cp $< $@
web/sync/para.css: web/para.css web/sync
cp $< $@
cp $< $@
web/sync/para.css: web/para.css web/sync
cp $< $@
-web/sync/versions/
paraslash-git.tar.bz2: paraslash-git
.tar.bz2 web/sync
+web/sync/versions/
@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2: @PACKAGE_TARNAME@-@PACKAGE_VERSION@
.tar.bz2 web/sync
cp -a versions web/sync && cp $< $@
web/sync/overview.pdf: skencil/overview.pdf web/sync
cp $< $@
cp -a versions web/sync && cp $< $@
web/sync/overview.pdf: skencil/overview.pdf web/sync
cp $< $@