From: Andre Noll <maan@systemlinux.org>
Date: Wed, 31 Jan 2007 10:44:50 +0000 (+0100)
Subject: Merge ../paraslash_meins/paraslash
X-Git-Tag: v0.2.15~28^2~3
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=2e8b7f42a30ebe41c862cc603c8f746b1e202479;hp=-c;p=paraslash.git

Merge ../paraslash_meins/paraslash
---

2e8b7f42a30ebe41c862cc603c8f746b1e202479
diff --combined Makefile.in
index 39e926e7,e1e6c9a9..b468cc84
--- a/Makefile.in
+++ b/Makefile.in
@@@ -22,9 -22,9 +22,9 @@@ DEBUG_CPPFLAGS += -Wno-sign-compare -g 
  DEBUG_CPPFLAGS += -Wredundant-decls
  # produces false positives
  # DEBUG_CPPFLAGS += -Wunreachable-code
- #CPPFLAGS += -Wwrite-strings
+ # DEBUG_CPPFLAGS += -Wwrite-strings
  # invalid option for gcc-3.3.5
- # CPPFLAGS += -Wextra
+ # DEBUG_CPPFLAGS += -Wextra
  
  CPPFLAGS += -Os
  CPPFLAGS += -Wall
@@@ -158,20 -158,16 +158,20 @@@ grab_client.cmdline.h grab_client.cmdli
  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
 +	mkdir -p man/man1
  	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
 +	mkdir -p man/html
  	man2html $< > $@
  
  
@@@ -199,9 -195,6 +199,6 @@@ aac_common.o: aac_common.
  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@ $<
  
@@@ -209,13 -202,16 +206,16 @@@ krell.o: krell.
  	$(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 $(DEBUG_CPPFLAGS) -Wall -O -g @mysql_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@