]> git.tuebingen.mpg.de Git - paraslash.git/commitdiff
projects / paraslash.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 39802f2)
Merge branch 'maint'
authorAndre Noll <maan@systemlinux.org>
Mon, 13 Aug 2012 08:04:40 +0000 (10:04 +0200)
committerAndre Noll <maan@systemlinux.org>
Mon, 13 Aug 2012 08:04:40 +0000 (10:04 +0200)
.gitignore patch | blob | history
Makefile.in patch | blob | history
command_util.sh patch | blob | history
configure.ac patch | blob | history

diff --git a/.gitignore b/.gitignore
index 141424f058ffadc11a675bb511d4e712c794cb84..b5b5befa1693fd8678fa6ba10a1bb37495019467 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@ objects
 foo*
 bar*
 para_*
-*.cmdline.[ch]
 GPATH
 GRTAGS
 GSYMS
@@ -14,15 +13,11 @@ config.h.in
 config.log
 config.status
 Makefile
-Makefile.deps
 TODO
-NONE
-aclocal.m4
 *_command_list.h
 *_command_list.man
 paraslash-git.tar.bz2
 skencil/overview.pdf
-web/sync
 *.swp
 error2.h
 web_sync
diff --git a/Makefile.in b/Makefile.in
index 1d3d2e01089527e7fbb53aaff2c99007e1d1138e..511c0486ff5fc7a1b30b545fdee45641a8b0cca2 100644 (file)
--- 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@
@@ -22,6 +21,12 @@ 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
@@ -68,15 +73,7 @@ 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
@@ -148,16 +145,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):
diff --git a/command_util.sh b/command_util.sh
index b37c5b03ea5516c2bad778fd82e35a9fa6da2131..e33e0769d9cbc2230bf02b70813d5435f2447430 100755 (executable)
--- a/command_util.sh
+++ b/command_util.sh
@@ -36,7 +36,6 @@ read_one_command()
        template=0
        template_name=""
        template_prototype=""
-       mkdir -p man/man1
        while read key value; do
                case "$key" in
                ---)
diff --git a/configure.ac b/configure.ac
index 8acbf9e9494d2eec170ee03f183d0b266740c4e2..bf26d78b5e2c9af963c39d4db6fc9d7d6f8b2093 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -87,8 +87,6 @@ AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \
        strncasecmp strrchr strspn alarm mkdir inet_ntoa socket], [],
        [AC_MSG_ERROR([function not found, cannot live without it])])
 
-cmdline_dir="cmdline"
-AC_SUBST(cmdline_dir)
 AC_DEFUN([add_cmdline],[$(for i in $@; do printf "${i}.cmdline "; done)])
 
 
paraslash - network audio streaming tools