X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=Makefile.in;h=16fa95059b48912575fa60fd0e54a0974a7ab0e7;hb=50c94d6ab44593ff4ea1559472fa99aaa7627e06;hp=c572100b0663f21cc4a5cef3309a4b64a62d3f63;hpb=a05a33be9ed15982aabfa13726317a1fcb13cc19;p=paraslash.git

diff --git a/Makefile.in b/Makefile.in
index c572100b..16fa9505 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -28,6 +28,8 @@ DEBUG_CPPFLAGS += -Wredundant-decls
 # many warnings about trivial stuff
 # CPPFLAGS += -Wconversion
 
+LDFLAGS += -Wl,--gc-sections
+
 CPPFLAGS += -Os
 CPPFLAGS += -Wall
 CPPFLAGS += -Wuninitialized
@@ -46,13 +48,14 @@ CPPFLAGS += -Wmissing-format-attribute
 CPPFLAGS += -Wunused-macros
 CPPFLAGS += -Wshadow
 CPPFLAGS += -Wbad-function-cast
+CPPFLAGS += -fdata-sections -ffunction-sections
 CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F)
 CPPFLAGS += @SSL_CPPFLAGS@
 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 := $(filter-out para_slider para_krell.so, $(BINARIES))
 man_pages := $(patsubst %, man/man1/%.1, $(man_binaries))
 man_pages_html := $(patsubst %, man/html/%.html, $(man_binaries))
 FONTS := $(wildcard fonts/*.png)
@@ -60,7 +63,7 @@ PICS := $(wildcard pics/paraslash/*.jpg)
 gengetopts := $(wildcard *.ggo)
 gengetopts_c := $(gengetopts:.ggo=.cmdline.c)
 gengetopts_h := $(gengetopts:.ggo=.cmdline.h)
-grutatxt := NEWS README.mysql CREDITS INSTALL README FEATURES
+grutatxt := NEWS CREDITS INSTALL README FEATURES
 grutatxt_html := $(grutatxt:=.html)
 html_in := $(wildcard web/*.in.html)
 gen_html := $(subst web/,web/sync/,$(html_in))
@@ -96,7 +99,6 @@ html_man: $(man_pages_html)
 
 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
@@ -160,9 +162,7 @@ grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
 %_command_list.man: %.cmd
 	./command_util.sh man < $< > $@
 
-server_command_lists = server_command_list.man random_selector_command_list.man \
-	playlist_selector_command_list.man mysql_selector_command_list.man \
-	afs_command_list.man
+server_command_lists = server_command_list.man afs_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`"; \
@@ -211,9 +211,6 @@ slider.o: slider.c
 krell.o: krell.c
 	$(CC) -Wall -O -g -fPIC @GTK_CFLAGS@ -c -o $@ krell.c
 
-mysql_selector.o: mysql_selector.c
-	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @mysql_cppflags@ $<
-
 %.cmdline.o: %.cmdline.c
 	$(CC) -c $(CPPFLAGS) $<
 
@@ -221,43 +218,40 @@ mysql_selector.o: mysql_selector.c
 	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) $<
 
 para_recv: @recv_objs@
-	$(CC) @recv_objs@ -o $@ @recv_ldflags@
+	$(CC) $(LDFLAGS) @recv_objs@ -o $@ @recv_ldflags@
 
 para_filter: @filter_objs@
-	$(CC) @filter_objs@ -o $@ @filter_ldflags@
+	$(CC) $(LDFLAGS) @filter_objs@ -o $@ @filter_ldflags@
 
 para_slider: $(slider_objs)
-	$(CC) $(slider_objs) -o $@ @GTK_LIBS@ @GLIB_LIBS@ -lzmw
+	$(CC) $(LDFLAGS) $(slider_objs) -o $@ @GTK_LIBS@ @GLIB_LIBS@ -lzmw
 
 para_client: @client_objs@
-	$(CC) -o $@ @client_objs@ @client_ldflags@
+	$(CC) $(LDFLAGS) -o $@ @client_objs@ @client_ldflags@
 
 para_gui: @gui_objs@
-	$(CC) -o $@ @gui_objs@ -lncurses
+	$(CC) $(LDFLAGS) -o $@ @gui_objs@ -lncurses
 
 para_audiod: @audiod_objs@
-	$(CC) -o $@ @audiod_objs@ @audiod_ldflags@
+	$(CC) $(LDFLAGS) -o $@ @audiod_objs@ @audiod_ldflags@
 
 para_audioc: @audioc_objs@
-	$(CC) -o $@ @audioc_objs@ @audioc_ldflags@
-
-para_dbadm: $(dbadm_objs)
-	$(CC) -o $@ $(dbadm_objs) -lncurses -lmenu
+	$(CC) $(LDFLAGS) -o $@ @audioc_objs@ @audioc_ldflags@
 
 para_fade: $(fade_objs)
-	$(CC) -o $@ $(fade_objs)
+	$(CC) $(LDFLAGS) -o $@ $(fade_objs)
 
 para_server: @server_objs@
-	$(CC) -o $@ @server_objs@  @server_ldflags@
+	$(CC) $(LDFLAGS) -o $@ @server_objs@  @server_ldflags@
 
 para_fsck: @fsck_objs@
-	$(CC) -o $@ @fsck_objs@ @fsck_ldflags@
+	$(CC) $(LDFLAGS) -o $@ @fsck_objs@ @fsck_ldflags@
 
 para_sdl_gui: $(sdl_gui_objs)
-	$(CC) -o $@ $(sdl_gui_objs) -lSDL_image
+	$(CC) $(LDFLAGS) -o $@ $(sdl_gui_objs) -lSDL_image
 
 para_write: @write_objs@
-	$(CC) -o $@ @write_objs@ @write_ldflags@
+	$(CC) $(LDFLAGS) -o $@ @write_objs@ @write_ldflags@
 
 para_krell.so: $(krell_objs)
 	$(CC) -Wall -fPIC @GTK_CFLAGS@ krell.o -o $@ @GTK_LIBS@ -shared