X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=3e62d05fa04692c075a1027145927d0987484716;hp=9af3ac47e9b10ac31342ea51627c71f63b630522;hb=761d9bd95a6601c0b3be6591a6b6672b755e1fbe;hpb=75590418248e30acbc316e58b2398d54b2f09569

diff --git a/Makefile.in b/Makefile.in
index 9af3ac47..3e62d05f 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
@@ -21,6 +19,15 @@ MKDIR_P := mkdir -p
 
 speex_cppflags := @speex_cppflags@
 opus_cppflags := @opus_cppflags@
+arch_cppflags := @arch_cppflags@
+osl_cppflags := @osl_cppflags@
+id3tag_cppflags := @id3tag_cppflags@
+openssl_cppflags := @openssl_cppflags@
+ogg_cppflags := @ogg_cppflags@
+mad_cppflags := @mad_cppflags@
+faad_cppflags := @faad_cppflags@
+curses_cppflags := @curses_cppflags@
+ao_cppflags := @ao_cppflags@
 
 id3tag_ldflags := @id3tag_ldflags@
 ogg_ldflags := @ogg_ldflags@
@@ -92,10 +99,10 @@ CPPFLAGS += -Wmissing-noreturn
 CPPFLAGS += -Wbad-function-cast
 CPPFLAGS += -fno-strict-aliasing
 CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F)
-CPPFLAGS += @arch_cppflags@
+CPPFLAGS += $(arch_cppflags)
 CPPFLAGS += -I/usr/local/include
 CPPFLAGS += -I$(cmdline_dir)
-CPPFLAGS += @osl_cppflags@
+CPPFLAGS += $(osl_cppflags)
 
 LDFLAGS += @clock_gettime_ldflags@
 
@@ -177,34 +184,34 @@ error2.h: $(hostbin_dir)/error2
 	@echo "$(object_executable_matrix)" | $< > $@
 $(object_dir)/crypt.o: crypt.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @openssl_cppflags@ $<
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) $(openssl_cppflags) $<
 $(object_dir)/spx_common.o: spx_common.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) $(speex_cppflags) @ogg_cppflags@ $<
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) $(speex_cppflags) $(ogg_cppflags) $<
 
 $(object_dir)/spxdec_filter.o: spxdec_filter.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) $(speex_cppflags) @ogg_cppflags@ $<
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) $(speex_cppflags) $(ogg_cppflags) $<
 
 $(object_dir)/spx_afh.o: spx_afh.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) $(speex_cppflags) @ogg_cppflags@ $<
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) $(speex_cppflags) $(ogg_cppflags) $<
 
 $(object_dir)/oggdec_filter.o: oggdec_filter.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ogg_cppflags@ $<
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) $(ogg_cppflags) $<
 
 $(object_dir)/ogg_afh.o: ogg_afh.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ogg_cppflags@ $<
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) $(ogg_cppflags) $<
 
 $(object_dir)/ogg_afh_common.o: ogg_afh_common.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ogg_cppflags@ $<
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) $(ogg_cppflags) $<
 
 $(object_dir)/mp3dec_filter.o: mp3dec_filter.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @mad_cppflags@ $<
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) $(mad_cppflags) $<
 
 $(object_dir)/compress_filter.o: compress_filter.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
@@ -212,26 +219,27 @@ $(object_dir)/compress_filter.o: compress_filter.c | $(object_dir)
 
 $(object_dir)/aacdec_filter.o: aacdec_filter.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) $(faad_cppflags) $<
 
 $(object_dir)/aac_common.o: aac_common.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) $(faad_cppflags) $<
 
 $(object_dir)/aac_afh.o: aac_afh.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) $(faad_cppflags) $<
 
 $(object_dir)/opus%.o: CPPFLAGS += $(opus_cppflags)
-$(object_dir)/mp3_afh.o: CPPFLAGS += @id3tag_cppflags@
+$(object_dir)/mp3_afh.o: CPPFLAGS += $(id3tag_cppflags)
+
 $(object_dir)/mp3_afh.o: mp3_afh.c | $(object_dir)
 
 $(object_dir)/gui%.o: gui%.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @curses_cppflags@ $<
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) $(curses_cppflags) $<
 $(object_dir)/ao_write.o: ao_write.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ao_cppflags@ $<
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) $(ao_cppflags) $<
 
 $(object_dir)/%.cmdline.o: $(cmdline_dir)/%.cmdline.c $(cmdline_dir)/%.cmdline.h | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
@@ -280,7 +288,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 +300,8 @@ para_filter \
 para_play \
 : LDFLAGS += \
 	$(mad_ldflags) \
-	$(samplerate_ldflags)
+	$(samplerate_ldflags) \
+	-lm
 
 para_write \
 para_play \
@@ -335,7 +343,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,7 +351,7 @@ 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 $@'
@@ -351,11 +359,11 @@ para_audioc: $(audioc_objs)
 
 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 $@'