From: Andre Date: Wed, 19 Apr 2006 21:59:08 +0000 (+0200) Subject: Makefile.in: Remove special treatment of ortp_send/ortp_recv X-Git-Tag: v0.2.12~54 X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=89cde2c587229f04d779e3a387c4a801261d87f0;p=paraslash.git Makefile.in: Remove special treatment of ortp_send/ortp_recv they no longer depend on glib, so use the generic rule for building object files. This made gcc spit out some trivial warnings about unused variables which are also fixed in this patch. --- diff --git a/Makefile.in b/Makefile.in index a6d55d41..efef94b0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -146,11 +146,6 @@ grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo esac; \ gengetopt $$O --conf-parser --file-name=$(*F).cmdline --set-package="para_$(subst .cmdline,,$(*F))" --set-version="$V" < $< -ortp_send.o: ortp_send.c - $(CC) -c -Wall -o $@ -g @GLIB_CFLAGS@ $< -ortp_recv.o: ortp_recv.c - $(CC) -c -Wall -o $@ -g @GLIB_CFLAGS@ $< - para_recv: @recv_objs@ $(CC) @recv_objs@ -o $@ @recv_ldflags@ diff --git a/ortp_send.c b/ortp_send.c index 19b54d39..07e3cccf 100644 --- a/ortp_send.c +++ b/ortp_send.c @@ -192,14 +192,14 @@ static void ortp_send(struct audio_format *af, long unsigned current_chunk, free(sendbuf); } -static int ortp_com_on(struct sender_command_data *scd) +static int ortp_com_on(__a_unused struct sender_command_data *scd) { self->status = SENDER_ON; return 1; } -static int ortp_com_off(struct sender_command_data *scd) +static int ortp_com_off(__a_unused struct sender_command_data *scd) { ortp_shutdown_targets(); self->status = SENDER_OFF; @@ -290,8 +290,9 @@ success: } } -static void ortp_pre_select(struct audio_format *af, int *max_fileno, - fd_set *rfds, fd_set *wfds) +static void ortp_pre_select(__a_unused struct audio_format *af, + __a_unused int *max_fileno, __a_unused fd_set *rfds, + __a_unused fd_set *wfds) { return; }