From patchwork Mon May 28 18:18:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 9126 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp2230096jad; Mon, 28 May 2018 11:26:26 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqTE03+eGBRX4Bgwk+Xyx1uaHLToYmY+Xc229f5yIkTvPtHgPzQoWl4HygNFxR8yQiCUli/ X-Received: by 2002:adf:aeea:: with SMTP id y97-v6mr12222522wrc.32.1527531986328; Mon, 28 May 2018 11:26:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527531986; cv=none; d=google.com; s=arc-20160816; b=ODfCNKGVswTOsw1CSWYx/x+f/+IK8umy1duTXnjYITqRRWOJHY0eUR1MlrpNsqjBiK kPAgFF8wE8R+DTR18TqKAqCUauPn7U0D7h7FfAEfX4aNZpIHaacHIUK1PbWJOsMA03Su /+oqiFLRHEIe6zaKH1PNhLQD8HEHfylqWuRk+Q6UPteWc/+9A+ULYKPKanSa/z18WoRm lwPjIlSsDj0ePXxSDBzU+/Kg8CEcTuBl/jHhuLdct4zRQJTOTp/iqfV/bv7MK0VLteue JaBVhzUtYkuNwPcDLFWz2gkiDJUc9d55aQI5QnMphqXFFfGGl+cU7NjL7BpxM37Op912 0qJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=A8ObuvyzRdvQ6I2XDJDxOCN9uoWy0U/g7It0PTa7dag=; b=l9Z2Ljc4a0syhZmS7eHqDC6oW2kpXxfz/1qm06SVGi49AdsEN1uF5oDzoYQHNIHaOb I1WGYVVwDJ6oiMXG1977q55PPjoJJ8OVAOGuoba1udzA/CqhCpiRidpn7DG6TYtwX0XI t+fdFETfHvYnXYeU5bYVtlaxv7nl1awzgpuQiSB4QdMaolkNxBCsbSO3gDW5tyGpgUrE UZEjt1/kp7K/IUtotjZwnBgkapPSGSZO9314XMeg0GXynPp3hh3JXUIW5UmbRAqbFPJs cUMeHwJqgYlM+WP+4Ge2c/94MVA0QsTdII+zzzCbjQYMY45aXhYo3fjf4zs+55qUq5Ma lD7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=Cd278/IR; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 60-v6si4707201wri.64.2018.05.28.11.26.26; Mon, 28 May 2018 11:26:26 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=Cd278/IR; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4DFA7689CF6; Mon, 28 May 2018 21:25:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f48.google.com (mail-wm0-f48.google.com [74.125.82.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7674468078E for ; Mon, 28 May 2018 21:25:35 +0300 (EEST) Received: by mail-wm0-f48.google.com with SMTP id m129-v6so34107684wmb.3 for ; Mon, 28 May 2018 11:26:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8Ok0LUdWYOp3qZwunTW34vzMub2DR0i6GaM8H0vV6mc=; b=Cd278/IROgMowHW47dHh/hA/2M1TJPm1wRzHDcZ0QzDGxpCKqDmhyL9nmBJ3crfDNJ OvE+skyDsOP3h4OHX/lIkCvWRORqziqsuTGvSEsqo2LDqBxN1VQdYK1NYdSbr/W/rAOo tFHdqRQHoZX/sPM+hPAr2+rB8NAYsgmdXao2lqjCXbDXXkx8OJAipXOnU5EmZaJJqjv+ YNe27jMXRZymQ1/sb+bigMlctWwP5UvFfClf9yhryqdc8qv36krcCawh06pMiT2tUSOa 6frwBAYuR3wwYgOB0+8Fv4ba52f8AFWPfU4nI954eWc4eh8NQKDdcx5sZ5wHoLHc+x6k c8+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8Ok0LUdWYOp3qZwunTW34vzMub2DR0i6GaM8H0vV6mc=; b=obVOcQK5vW6TD6/vs5ajxTj1gHYPT3JoiEHjplnrn35VdjQ6ZCOuaeiAD4ffbRyUWc ooSlXw/M66s4gVTnK7K7wNZd5Mo7fI/VZ2/b9R6DaBhSKM37XKOffq2R6UZa4XiJ2yTQ 5K3/RYdADd/gml+NJS+vhuuOJ3ZB46KhzSpB3IpKRWcl8LF7EYKr3WVM1l6Uj+bF/RnF S1KyQBifEyroaAljhf+HQTiUuupHOThfomXCCZrEwDtcwj6nspHJrqHM7GjYBqwwqctw X2rL2K72yD/Px+zEiXWE4ZU6x3jASNMdQqWTaD0VWLtFfoLqu3Gbm3fWkw6867M4YIXD HE3A== X-Gm-Message-State: ALKqPwcr/3gOxbyQE2nbLh+yYRTIcxKN5aofjOFKTQ2NdTG0drwMK2rz +6EeoaGsSqWe2FXBLW6Dprfbuw== X-Received: by 2002:a1c:1047:: with SMTP id 68-v6mr9253892wmq.132.1527531574000; Mon, 28 May 2018 11:19:34 -0700 (PDT) Received: from localhost.localdomain ([46.5.2.0]) by smtp.gmail.com with ESMTPSA id p5-v6sm14649465wre.83.2018.05.28.11.19.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 May 2018 11:19:33 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 May 2018 20:18:58 +0200 Message-Id: <20180528181859.12182-8-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180528181859.12182-1-klaxa1337@googlemail.com> References: <20180520185404.29836-1-klaxa1337@googlemail.com> <20180528181859.12182-1-klaxa1337@googlemail.com> Subject: [FFmpeg-devel] [PATCH 7/8] Makefile: Update Makefile X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Stephan Holljes MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Stephan Holljes --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fbecdeb..83bc4e0 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,11 @@ all: ffserver LAV_FLAGS = $(shell pkg-config --libs --cflags libavformat libavcodec libavutil) +LUA_FLAGS = $(shell pkg-config --libs --cflags lua5.3) CFLAGS=-fsanitize=address -fsanitize=undefined # LAV_FLAGS = -L/usr/local/lib -lavcodec -lavformat -lavutil -ffserver: segment.o publisher.o lavfhttpd.o ffserver.c - cc -g -Wall $(CFLAGS) $(LAV_FLAGS) -lpthread -o ffserver segment.o publisher.o lavfhttpd.o ffserver.c +ffserver: segment.o publisher.o lavfhttpd.o configreader.o ffserver.c + cc -g -Wall $(CFLAGS) $(LAV_FLAGS) $(LUA_FLAGS) -lpthread -o ffserver segment.o publisher.o lavfhttpd.o configreader.o ffserver.c segment.o: segment.c segment.h cc -g -Wall $(CFLAGS) $(LAV_FLAGS) -lpthread -c segment.c @@ -15,5 +16,7 @@ publisher.o: publisher.c publisher.h lavfhttpd.o: lavfhttpd.c httpd.h cc -g -Wall $(CFLAGS) $(LAV_FLAGS) -lpthread -c lavfhttpd.c +configreader.o: configreader.c configreader.h httpd.h + cc -g -Wall $(CFLAGS) $(LAV_FLAGS) $(LUA_FLAGS) -c configreader.c clean: rm -f *.o ffserver