X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=8f14e5aafdd9a54196b299f383d2659a7b13996c;hp=e847a09526a42ba7a72beda8a61d7a15ff6fba1a;hb=38657223b245405602bc50906a9687ce98f53857;hpb=d952d67d0f302ae7415fde958e71d7ca12f2e40c

diff --git a/Makefile.in b/Makefile.in
index e847a095..8f14e5aa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,10 +3,8 @@ exec_prefix := @exec_prefix@
 
 BINDIR := @bindir@
 VARDIR := /var/paraslash
-PKGDATADIR := @datarootdir@/@PACKAGE_NAME@
 MANDIR := @datarootdir@/man/man1
 PACKAGE_VERSION := @PACKAGE_VERSION@
-PACKAGE_STRING := @PACKAGE_STRING@
 INSTALL := @install@
 STRIP := $(CROSS_COMPILE)strip
 HOSTCC ?= cc
@@ -280,7 +278,6 @@ para_write para_play para_audiod: LDFLAGS += $(ao_ldflags) $(core_audio_ldflags)
 para_client para_audioc para_play : LDFLAGS += $(readline_ldflags)
 para_server: LDFLAGS += $(osl_ldflags)
 para_gui: LDFLAGS += $(curses_ldflags)
-para_filter para_play: LDFLAGS += -lm
 para_server \
 para_client \
 para_audiod \
@@ -293,7 +290,8 @@ para_filter \
 para_play \
 : LDFLAGS += \
 	$(mad_ldflags) \
-	$(samplerate_ldflags)
+	$(samplerate_ldflags) \
+	-lm
 
 para_write \
 para_play \
@@ -335,7 +333,7 @@ para_filter: $(filter_objs)
 
 para_client: $(client_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) -o $@ $(client_objs) @client_ldflags@ $(LDFLAGS)
+	$(Q) $(CC) -o $@ $(client_objs) $(LDFLAGS)
 
 para_gui: $(gui_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
@@ -343,19 +341,19 @@ para_gui: $(gui_objs)
 
 para_audiod: $(audiod_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) -o $@ $(audiod_objs) @audiod_ldflags@ $(LDFLAGS)
+	$(Q) $(CC) -o $@ $(audiod_objs) $(LDFLAGS)
 
 para_audioc: $(audioc_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) -o $@ $(audioc_objs) @audioc_ldflags@ $(LDFLAGS)
+	$(Q) $(CC) -o $@ $(audioc_objs) $(LDFLAGS)
 
 para_fade: $(fade_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) -o $@ $(fade_objs) @fade_ldflags@ $(LDFLAGS)
+	$(Q) $(CC) -o $@ $(fade_objs) $(LDFLAGS)
 
 para_server: $(server_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) -o $@ $(server_objs) @server_ldflags@ $(LDFLAGS)
+	$(Q) $(CC) -o $@ $(server_objs) $(LDFLAGS)
 
 para_write: $(write_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'