X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=6b76b075fa2df2b7ec6c55678a49ecae73857c76;hp=fe5bdb61837ae3d5aa3906ee18b6100e4f82e736;hb=2bb9fcbfa99cf30a6f46ba33fd95c0a456a225cc;hpb=8978f426314b107c55a652e0151397fdab2f003e

diff --git a/Makefile.in b/Makefile.in
index fe5bdb61..6b76b075 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,8 +4,6 @@ exec_prefix = @exec_prefix@
 BINDIR = @bindir@
 VARDIR = /var/paraslash
 PKGDATADIR = @datarootdir@/@PACKAGE_NAME@
-FONTDIR = $(PKGDATADIR)/fonts
-PICDIR = $(PKGDATADIR)/pics
 MANDIR = @datarootdir@/man/man1
 
 install_sh = @install_sh@
@@ -13,7 +11,7 @@ install_sh = @install_sh@
 build_date = $(shell date)
 system = $(shell uname -rs)
 cc_version = $(shell $(CC) --version | head -n 1)
-codename = isotropic threshold
+codename = solar saturation
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
@@ -37,8 +35,6 @@ CPPFLAGS += -Wstrict-prototypes
 CPPFLAGS += -Wchar-subscripts
 CPPFLAGS += -Wformat-security
 CPPFLAGS += -DBINDIR='"$(BINDIR)"'
-CPPFLAGS += -DFONTDIR='"$(PKGDATADIR)/fonts"'
-CPPFLAGS += -DPICDIR='"$(PKGDATADIR)/pics"'
 CPPFLAGS += -DBUILD_DATE='"$(build_date)"'
 CPPFLAGS += -DSYSTEM='"$(system)"'
 CPPFLAGS += -DCODENAME='"$(codename)"'
@@ -55,54 +51,25 @@ CPPFLAGS += @ncurses_cppflags@
 
 BINARIES = para_server para_client para_audioc para_recv \
 	para_filter para_write para_fsck @extra_binaries@
-man_binaries := $(filter-out para_dbadm para_slider para_krell.so, $(BINARIES))
+man_binaries := $(BINARIES)
 man_pages := $(patsubst %, man/man1/%.1, $(man_binaries))
-man_pages_html := $(patsubst %, man/html/%.html, $(man_binaries))
-FONTS := $(wildcard fonts/*.png)
-PICS := $(wildcard pics/paraslash/*.jpg)
+man_pages_in := $(patsubst %, web/%.man.in.html, $(man_binaries))
 gengetopts := $(wildcard *.ggo)
 gengetopts_c := $(gengetopts:.ggo=.cmdline.c)
 gengetopts_h := $(gengetopts:.ggo=.cmdline.h)
-grutatxt := NEWS CREDITS INSTALL README FEATURES
-grutatxt_html := $(grutatxt:=.html)
-html_in := $(wildcard web/*.in.html)
-gen_html := $(subst web/,web/sync/,$(html_in))
-gen_html := $(gen_html:.in.html=.html)
-gruta_in := $(grutatxt:=.in.html)
-gruta_in := $(patsubst %,web/%,$(gruta_in))
-gruta_html := $(grutatxt:=.html)
-gruta_html := $(patsubst %,web/sync/%,$(gruta_html))
-shots := gui-2005-11-12.png para_audiod-startup.txt para_krell-2005-02.png \
-	para_server-startup.txt para_slider-2004-12.png sdl_gui.jpg \
-	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/@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2 PUBLIC_KEY \
-	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 \
-	.changelog_cvs
+tarball_delete = web versions pics .changelog_before_cvs .changelog_cvs .gitignore
 tarball_delete := $(patsubst %,$(tarball_pfx)/%,$(tarball_delete))
 tarball_add := $(gengetopts_c) $(gengetopts_h) $(autocrap)
+tarball := @PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2
 
-.PHONY: clean distclean maintainer-clean install html www tags doxygen gruta \
-	man html_man
+.PHONY: clean distclean maintainer-clean install man tarball
 all: $(BINARIES)
-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)
+tarball: $(tarball)
 
-sdl_gui_objs = sdl_gui.cmdline.o SFont.o sdl_gui.o gui_common.o exec.o \
-	close_on_fork.o string.o stat.o fd.o
-dbadm_objs = dbadm.o exec.o close_on_fork.o string.o
 fade_objs = fade.cmdline.o fade.o exec.o close_on_fork.o string.o fd.o
-krell_objs = krell.o string.o
-slider_objs = slider.o string.o
 fsck_objs = osl.o rbtree.o fsck.o string.o sha1.o fsck.cmdline.o
 
 *.o: para.h config.h gcc-compat.h
@@ -147,7 +114,7 @@ grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
 		audioc.ggo) O="--unamed-opts=command";; \
 		fsck.ggo) O="--unamed-opts=table";; \
 	esac; \
-	echo "$O"; if test $< != fsck.ggo; then O="$$O --conf-parser "; fi; \
+	if test $< != fsck.ggo; then O="$$O --conf-parser "; fi; \
 	gengetopt $$O \
 		--no-handle-version \
 		--file-name=$(*F).cmdline \
@@ -181,6 +148,8 @@ man/html/%.html: man/man1/%.1
 	mkdir -p man/html
 	man2html $< > $@
 
+web/%.man.in.html: man/man1/%.1
+	man2html $< | sed -e '/^<\/BODY>/,$$d' -e '1,/<\/HEAD><BODY>/d' > $@
 
 
 ortp_recv.o: ortp_recv.c
@@ -206,12 +175,6 @@ aac_common.o: aac_common.c
 aac_afh.o: aac_afh.c
 	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
 
-slider.o: slider.c
-	$(CC) -c -Wall -o $@ -g @GLIB_CFLAGS@  @GTK_CFLAGS@ $<
-
-krell.o: krell.c
-	$(CC) -Wall -O -g -fPIC @GTK_CFLAGS@ -c -o $@ krell.c
-
 %.cmdline.o: %.cmdline.c
 	$(CC) -c $(CPPFLAGS) $<
 
@@ -224,9 +187,6 @@ para_recv: @recv_objs@
 para_filter: @filter_objs@
 	$(CC) $(LDFLAGS) @filter_objs@ -o $@ @filter_ldflags@
 
-para_slider: $(slider_objs)
-	$(CC) $(LDFLAGS) $(slider_objs) -o $@ @GTK_LIBS@ @GLIB_LIBS@ -lzmw
-
 para_client: @client_objs@
 	$(CC) $(LDFLAGS) -o $@ @client_objs@ @client_ldflags@
 
@@ -239,9 +199,6 @@ para_audiod: @audiod_objs@
 para_audioc: @audioc_objs@
 	$(CC) $(LDFLAGS) -o $@ @audioc_objs@ @audioc_ldflags@
 
-para_dbadm: $(dbadm_objs)
-	$(CC) $(LDFLAGS) -o $@ $(dbadm_objs) -lncurses -lmenu
-
 para_fade: $(fade_objs)
 	$(CC) $(LDFLAGS) -o $@ $(fade_objs)
 
@@ -251,15 +208,9 @@ para_server: @server_objs@
 para_fsck: @fsck_objs@
 	$(CC) $(LDFLAGS) -o $@ @fsck_objs@ @fsck_ldflags@
 
-para_sdl_gui: $(sdl_gui_objs)
-	$(CC) $(LDFLAGS) -o $@ $(sdl_gui_objs) -lSDL_image
-
 para_write: @write_objs@
 	$(CC) $(LDFLAGS) -o $@ @write_objs@ @write_ldflags@
 
-para_krell.so: $(krell_objs)
-	$(CC) -Wall -fPIC @GTK_CFLAGS@ krell.o -o $@ @GTK_LIBS@ -shared
-
 clean:
 	rm -f *.o $(BINARIES)
 distclean: clean
@@ -269,16 +220,14 @@ distclean: clean
 
 maintainer-clean: distclean
 	rm -f $(gengetopts_c) $(gengetopts_h) *.tar.bz2 \
-		$(grutatxt_html) config.h configure \
+		config.h configure \
 		config.h.in skencil/*.pdf skencil/*.ps
-	rm -f *_command_list.* *.man man/man1/* man/html/*
-
+	rm -f *_command_list.* *.man man/man1/*
+	rm -rf web_sync
 
 install: all man
-	mkdir -p $(BINDIR) $(FONTDIR) $(PICDIR) $(MANDIR)
+	mkdir -p $(BINDIR) $(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
 
@@ -295,37 +244,8 @@ install: all man
 	bzip2 -9 $(tarball_pfx).tar
 	rm -f $(tarball_pfx).tar
 	ls -l $(tarball_pfx).tar.bz2
-
-web/%.in.html: %
-	grutatxt -nb  < $< > $@
-tags:
-	rm -rf web/sync/HTML && gtags && htags -nF && mv HTML web/sync
-web/header2.html: web/header.html
-	sed -e 's|href="|href="\.\.\/\.\./|g' \
-		-e 's|SRC="|SRC="\.\.\/\.\./|g' $< > $@
-doxygen: web/header2.html
-	mkdir -p web/sync/doxygen
-	doxygen
-web/sync/man: html_man
-	mkdir -p $@
-	cp -a $(man_pages_html) $@
-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
-	cp $< $@
-web/sync/%.ico: pics/web/%.ico web/sync
-	cp $< $@
-web/sync/para.css: web/para.css web/sync
-	cp $< $@
-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 $< $@
-web/sync/%: %
-	cp -a $< $@
-web/sync/%: pics/screenshots/%
-	cp $< $@
-skencil/%.ps: skencil/%.sk
+%.ps: %.sk
 	sk2ps $< > $@
 %.pdf: %.ps
 	ps2pdf - - < $< > $@
+